Fix alignment errors in hashtable fuzzer

[openssl.git] / Configurations / shared-info.pl

diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index d3e6941eb6213aad2c48a8cb7963a8ca66ce3a83..caf6f901261f74d217984366a98df9d8128cc9c6 100644 (file)
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -1,8 +1,8 @@
 #! /usr/bin/env perl
 # -*- mode: perl; -*-
 #! /usr/bin/env perl
 # -*- mode: perl; -*-

-# Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.

 #
 #

-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (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
 # 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


@@ -13,12 +13,12 @@
 
 sub detect_gnu_ld {
     my @lines =
 
 sub detect_gnu_ld {
     my @lines =

-        `$config{cross_compile_prefix}$config{cc} -Wl,-V /dev/null 2>&1`;
+        `$config{CROSS_COMPILE}$config{CC} -Wl,-V /dev/null 2>&1`;

     return grep /^GNU ld/, @lines;
 }
 sub detect_gnu_cc {
     my @lines =
     return grep /^GNU ld/, @lines;
 }
 sub detect_gnu_cc {
     my @lines =

-        `$config{cross_compile_prefix}$config{cc} -v 2>&1`;
+        `$config{CROSS_COMPILE}$config{CC} -v 2>&1`;

     return grep /gcc/, @lines;
 }
 
     return grep /gcc/, @lines;
 }
 


@@ -32,19 +32,24 @@ my %shared_info;
         return {
             %{$shared_info{'gnu-shared'}},
             shared_defflag    => '-Wl,--version-script=',
         return {
             %{$shared_info{'gnu-shared'}},
             shared_defflag    => '-Wl,--version-script=',

+            dso_ldflags       =>
+                (grep /(?:^|\s)-fsanitize/,
+                 @{$config{CFLAGS}}, @{$config{cflags}})
+                ? ''
+                : '-Wl,-z,defs',

         };
     },
     'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; },
         };
     },
     'bsd-gcc-shared' => sub { return $shared_info{'linux-shared'}; },

-    'bsd-shared' => sub {
-        return $shared_info{'gnu-shared'} if detect_gnu_ld();
+    'bsd-gcc-nodef-shared' => sub { 

         return {
         return {

-            shared_ldflag     => '-shared -nostdlib',
+            %{$shared_info{'gnu-shared'}},
+            shared_defflags     => '-Wl,--version-script=',

         };
     },
     'darwin-shared' => {
         };
     },
     'darwin-shared' => {

-        dso_lflags            => '-bundle',
+        module_ldflags        => '-bundle',

         shared_ldflag         => '-dynamiclib -current_version $(SHLIB_VERSION_NUMBER) -compatibility_version $(SHLIB_VERSION_NUMBER)',
         shared_ldflag         => '-dynamiclib -current_version $(SHLIB_VERSION_NUMBER) -compatibility_version $(SHLIB_VERSION_NUMBER)',

-        shared_sonameflag     => '-install_name $(INSTALLTOP)/$(LIBDIR)/',
+        shared_sonameflag     => '-install_name $(libdir)/',

     },
     'cygwin-shared' => {
         shared_ldflag         => '-shared -Wl,--enable-auto-image-base',
     },
     'cygwin-shared' => {
         shared_ldflag         => '-shared -Wl,--enable-auto-image-base',


@@ -53,22 +58,19 @@ my %shared_info;
     'mingw-shared' => sub {
         return {
             %{$shared_info{'cygwin-shared'}},
     'mingw-shared' => sub {
         return {
             %{$shared_info{'cygwin-shared'}},

-            # def_flag made to empty string so  it still generates
+            # def_flag made to empty string so it still generates

             # something
             shared_defflag    => '',
             # something
             shared_defflag    => '',

+            shared_argfileflag => '@',

         };
     },
     'alpha-osf1-shared' => sub {
         return $shared_info{'gnu-shared'} if detect_gnu_ld();
         return {
         };
     },
     'alpha-osf1-shared' => sub {
         return $shared_info{'gnu-shared'} if detect_gnu_ld();
         return {

-            dso_lflags        => '-shared -Wl,-Bsymbolic',
+            module_ldflags    => '-shared -Wl,-Bsymbolic',

             shared_ldflag     => '-shared -Wl,-Bsymbolic -set_version $(SHLIB_VERSION_NUMBER)',
         };
     },
             shared_ldflag     => '-shared -Wl,-Bsymbolic -set_version $(SHLIB_VERSION_NUMBER)',
         };
     },

-    'solaris-shared' => {
-        shared_ldflag     => '-Wl,-Bsymbolic',
-        shared_defflag    => '-Wl,-M,',
-    },

     'svr3-shared' => sub {
         return $shared_info{'gnu-shared'} if detect_gnu_ld();
         return {
     'svr3-shared' => sub {
         return $shared_info{'gnu-shared'} if detect_gnu_ld();
         return {


@@ -83,20 +85,16 @@ my %shared_info;
             shared_sonameflag => '-h ',
         };
     },
             shared_sonameflag => '-h ',
         };
     },

-    'irix-shared' => sub {
-        return $shared_info{'gnu-shared'} if detect_gnu_ld();
+    'solaris-gcc-shared' => sub {
+        return $shared_info{'linux-shared'} if detect_gnu_ld();

         return {
         return {

-            shared_ldflag     => '-shared -Wl,-Bsymbolic',
-            shared_sonameflag => '-Wl,-soname=',
+            # Note: we should also have -shared here, but because some
+            # config targets define it with an added -static-libgcc
+            # following it, we don't want to change the order.  This
+            # forces all solaris gcc config targets to define shared_ldflag
+            shared_ldflag     => '-Wl,-Bsymbolic',
+            shared_defflag    => "-Wl,-M,",
+            shared_sonameflag => "-Wl,-h,",

         };
     },
         };
     },

-    'hpux-shared' => {
-        bin_lflags        => '-Wl,+s,+cdp,../:,+cdp,./:',
-        shared_ldflag     => '-Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+cdp,../:,+cdp,./:',
-        shared_sonameflag => '-Wl,+h,',
-    },
-    'aix-shared' => {
-        bin_lflags            => '-Wl,-bsvr4',
-        shared_ldflag         => '-Wl,-bexpall,-bnolibpath,-bM:SRE',
-    },

 );
 );