Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflicts

This commit is contained in:
christos 2023-04-18 14:24:25 +00:00
parent 4724848cf0
commit df9c8da8fe
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h vendored
View File

@ -1,5 +1,14 @@
#ifndef __ARM_ARCH_H__
# define __ARM_ARCH_H__
/*
* Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#ifndef OSSL_CRYPTO_ARM_ARCH_H
# define OSSL_CRYPTO_ARM_ARCH_H
# if !defined(__ARM_ARCH__)
# if defined(__CC_ARM)
@ -19,7 +28,7 @@
# endif
/*
* Why doesn't gcc define __ARM_ARCH__? Instead it defines
* bunch of below macros. See all_architectires[] table in
* bunch of below macros. See all_architectures[] table in
* gcc/config/arm/arm.c. On a side note it defines
* __ARMEL__/__ARMEB__ for little-/big-endian.
*/
@ -48,10 +57,6 @@
# endif
# endif
# ifdef OPENSSL_FIPSCANISTER
# include <openssl/fipssyms.h>
# endif
# if !defined(__ARM_MAX_ARCH__)
# define __ARM_MAX_ARCH__ __ARM_ARCH__
# endif
@ -64,7 +69,7 @@
# endif
# endif
# if !__ASSEMBLER__
# ifndef __ASSEMBLER__
extern unsigned int OPENSSL_armcap_P;
# endif
@ -74,5 +79,6 @@ extern unsigned int OPENSSL_armcap_P;
# define ARMV8_SHA1 (1<<3)
# define ARMV8_SHA256 (1<<4)
# define ARMV8_PMULL (1<<5)
# define ARMV8_SHA512 (1<<6)
#endif

6
crypto/external/bsd/openssl.old/mkpc vendored
View File

@ -1,8 +1,8 @@
#!/bin/sh
# $NetBSD: mkpc,v 1.2 2018/04/06 15:47:08 ryo Exp $
# $NetBSD: mkpc,v 1.3 2023/04/18 14:24:25 christos Exp $
getversion() {
(echo '#include "opensslv.h"'; echo OPENSSL_VERSION_TEXT) |
(echo '#include "openssl/opensslv.h"'; echo OPENSSL_VERSION_TEXT) |
eval "$CPP $CPPFLAGS" -I$1 | grep OpenSSL | cut -d ' ' -f 2
}
VERSION="$(getversion $1)"
@ -32,7 +32,7 @@ openssl.pc)
esac
cat << EOF > "$2"
# \$NetBSD: mkpc,v 1.2 2018/04/06 15:47:08 ryo Exp $
# \$NetBSD: mkpc,v 1.3 2023/04/18 14:24:25 christos Exp $
prefix=/usr
exec_prefix=/usr
libdir=/usr/lib