From 628ef8e06dfb02f1148587dcd3060c2f0413455c Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 11 Oct 2022 21:32:25 +0300
Subject: Release version 1.1.1+18

Add support for arm64 architecture for Linux.

Fix link order so that libraries are linked after all object files.

Exclude wasm class from builds.
---
 .../downstream/crypto/bn_conf/arm64-linux.h        | 28 ++++++++++++++++++++++
 .../downstream/crypto/dso_conf/arm64-linux.h       | 17 +++++++++++++
 libcrypto/libcrypto/downstream/crypto/platform.h   |  8 +++----
 3 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 libcrypto/libcrypto/downstream/crypto/bn_conf/arm64-linux.h
 create mode 100644 libcrypto/libcrypto/downstream/crypto/dso_conf/arm64-linux.h

(limited to 'libcrypto/libcrypto/downstream/crypto')

diff --git a/libcrypto/libcrypto/downstream/crypto/bn_conf/arm64-linux.h b/libcrypto/libcrypto/downstream/crypto/bn_conf/arm64-linux.h
new file mode 100644
index 0000000..0bacac0
--- /dev/null
+++ b/libcrypto/libcrypto/downstream/crypto/bn_conf/arm64-linux.h
@@ -0,0 +1,28 @@
+/* WARNING: do not edit! */
+/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
+/*
+ * Copyright 2016 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_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
+
+/*
+ * The contents of this file are not used in the UEFI build, as
+ * both 32-bit and 64-bit builds are supported from a single run
+ * of the Configure script.
+ */
+
+/* Should we define BN_DIV2W here? */
+
+/* Only one for the following should be defined */
+#define SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT
+#undef THIRTY_TWO_BIT
+
+#endif
diff --git a/libcrypto/libcrypto/downstream/crypto/dso_conf/arm64-linux.h b/libcrypto/libcrypto/downstream/crypto/dso_conf/arm64-linux.h
new file mode 100644
index 0000000..2c3b479
--- /dev/null
+++ b/libcrypto/libcrypto/downstream/crypto/dso_conf/arm64-linux.h
@@ -0,0 +1,17 @@
+/* WARNING: do not edit! */
+/* Generated by Makefile from ../include/crypto/dso_conf.h.in */
+/*
+ * Copyright 2016-2019 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_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
+# define DSO_DLFCN
+# define HAVE_DLFCN_H
+# define DSO_EXTENSION ".so"
+#endif
diff --git a/libcrypto/libcrypto/downstream/crypto/platform.h b/libcrypto/libcrypto/downstream/crypto/platform.h
index c5f0984..8dd6690 100644
--- a/libcrypto/libcrypto/downstream/crypto/platform.h
+++ b/libcrypto/libcrypto/downstream/crypto/platform.h
@@ -32,15 +32,15 @@
 #    else
 #      error x86_64 architecture is not supported for this OS
 #    endif
-#  elif defined(__arm64__)                                /* POSIX arm64 */
+#  elif defined(__arm64__) || defined(__aarch64__)        /* POSIX arm64 */
 #    if defined(__APPLE__)
 #      include "arm64-macos.h"
+#    elif defined(__linux__)
+#      include "arm64-linux.h"
 /*
- * arm64 architecture is not currently supported for Linux and FreeBSD.
+ * arm64 architecture is not currently supported for FreeBSD.
  */
 /*
-#    elif defined(__linux__)
-#      include "arm64-linux.h"
 #    elif defined(__FreeBSD__)
 #      include "arm64-freebsd.h"
 */
-- 
cgit v1.1