Merge 327d10bac3 into 69bd5e4fff

Add linux-arm64ilp32-clang target
While clang 15 config target by '--target', not cannot support '-mabi=ilp32', so add the linux-arm64ilp32-clang target. Signed-off-by: Huiyue Xu <xuhuiyue@huawei.com> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22666)
2024-05-07 11:58:39 +02:00 · 2024-05-07 11:48:58 +02:00 · 2024-05-07 09:29:51 +02:00 · 2024-05-03 17:34:52 +02:00
4 changed files with 12 additions and 8 deletions
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -66,7 +66,7 @@ jobs:
      run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
    - name: install
      # Run on 64 bit only as 32 bit is slow enough already
-      if: $${{ matrix.platform.arch == 'win64' }}
+      if: ${{ matrix.platform.arch == 'win64' }}
      run: |
        mkdir _dest
        nmake install DESTDIR=_dest
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@ -777,7 +777,14 @@ my %targets = (
        asm_arch         => 'aarch64',
        perlasm_scheme   => "linux64",
    },
-
+    "linux-arm64ilp32-clang" => {  # clang config abi by --target
+        inherit_from     => [ "linux-generic32" ],
+        CC               => "clang",
+        CXX              => "clang++",
+        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",
+        asm_arch         => 'aarch64',
+        perlasm_scheme   => "linux64",
+    },
    "linux-mips32" => {
        # Configure script adds minimally required -march for assembly
        # support, if no -march was specified at command line.
--- a/crypto/init.c
+++ b/crypto/init.c
@ -131,8 +131,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete)
 {
    OSSL_TRACE(INIT, "ossl_init_load_crypto_nodelete()\n");

-#if !defined(OPENSSL_USE_NODELETE) \
-    && !defined(OPENSSL_NO_PINSHARED)
+#if !defined(OPENSSL_USE_NODELETE)
 # if defined(DSO_WIN32) && !defined(_WIN32_WCE)
    {
        HMODULE handle = NULL;
@ -669,8 +668,7 @@ int OPENSSL_atexit(void (*handler)(void))
 {
    OPENSSL_INIT_STOP *newhand;

-#if !defined(OPENSSL_USE_NODELETE)\
-    && !defined(OPENSSL_NO_PINSHARED)
+#if !defined(OPENSSL_USE_NODELETE)
    {
 # if defined(DSO_WIN32) && !defined(_WIN32_WCE)
        HMODULE handle = NULL;
--- a/test/shlibloadtest.c
+++ b/test/shlibloadtest.c
@ -218,8 +218,7 @@ static int test_lib(void)
        ssllib = SD_INIT;
    }

-# if defined(OPENSSL_NO_PINSHARED) \
-    && defined(__GLIBC__) \
+# if defined(__GLIBC__) \
    && defined(__GLIBC_PREREQ) \
    && defined(OPENSSL_SYS_LINUX)
 #  if __GLIBC_PREREQ(2, 3)
Author	SHA1	Message	Date
Sashan	590b732cdf	Merge `327d10bac3` into `69bd5e4fff`	2024-05-07 11:58:39 +02:00
Huiyue Xu	69bd5e4fff	Add linux-arm64ilp32-clang target While clang 15 config target by '--target', not cannot support '-mabi=ilp32', so add the linux-arm64ilp32-clang target. Signed-off-by: Huiyue Xu <xuhuiyue@huawei.com> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22666)	2024-05-07 11:48:58 +02:00
Florian Greinacher	0fff6a2cf4	Fix invalid expression syntax The expression had an extra '$' character which made it always evaluate to true. See https://github.com/boostsecurityio/poutine/blob/main/docs/content/en/rules/if_always_true.md. CLA: trivial Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> (Merged from https://github.com/openssl/openssl/pull/24325)	2024-05-07 09:29:51 +02:00
sashan	327d10bac3	Can we let OPENSSL_NO_PINSHARED compile time guard go? while looking at code in `OPENSSL_atexit()` I've noticed the `OPENSSL_NO_PINSHARED` guard could be removed. Because I could not find any control knob in build configuration which provides definition of `OPENSS_NO_PINSHARED` macro. I did use grep `find ./ -type f \|xargs grep OPENSSL_NO_PINSHARED`	2024-05-03 17:34:52 +02:00