aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsanumesh <sanumesh@in.ibm.com>2024-06-11 09:47:07 -0500
committerTomas Mraz <tomas@openssl.org>2024-06-28 15:20:51 +0200
commit518dfe8de6f99c29f790b142750adcf2ea657cdf (patch)
tree10fe6df20ec38a623ce3fda707e261a20a48428e
parent9b9f98fcf2a32b052a532170d8995572c6e47f74 (diff)
downloadopenssl-518dfe8de6f99c29f790b142750adcf2ea657cdf.zip
openssl-518dfe8de6f99c29f790b142750adcf2ea657cdf.tar.gz
openssl-518dfe8de6f99c29f790b142750adcf2ea657cdf.tar.bz2
Add aix-clang and aix64-clang configuration
Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/24609) (cherry picked from commit 7afa7731e924d5ac10fc992d8cd777f407d33af9)
-rw-r--r--Configurations/10-main.conf36
-rwxr-xr-xConfigure2
2 files changed, 37 insertions, 1 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index b1719be..9e5fe1a 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1414,6 +1414,25 @@ my %targets = (
AR => add("-X32"),
RANLIB => add("-X32"),
},
+ # To enable openxl compiler for aix
+ # If 17.1 openxl runtime is available, -latomic can be used
+ # instead of -DBROKEN_CLANG_ATOMICS
+ "aix-clang" => {
+ inherit_from => [ "aix-common" ],
+ CC => "ibm-clang",
+ CFLAGS => picker(debug => "-O0 -g",
+ release => "-O"),
+ cflags => combine("-Wno-implicit-function-declaration -mcmodel=large -DBROKEN_CLANG_ATOMICS",
+ threads("-pthread")),
+ ex_libs => add(threads("-pthread")),
+ bn_ops => "BN_LLONG RC4_CHAR",
+ asm_arch => 'ppc32',
+ perlasm_scheme => "aix32",
+ shared_cflag => "-fpic",
+ shared_ldflag => add("-shared"),
+ AR => add("-X32"),
+ RANLIB => add("-X32"),
+ },
"aix64-cc" => {
inherit_from => [ "aix-common" ],
CC => "cc",
@@ -1432,6 +1451,23 @@ my %targets = (
AR => add("-X64"),
RANLIB => add("-X64"),
},
+ "aix64-clang" => {
+ inherit_from => [ "aix-common" ],
+ CC => "ibm-clang",
+ CFLAGS => picker(debug => "-O0 -g",
+ release => "-O"),
+ cflags => combine("-maix64 -Wno-implicit-function-declaration -mcmodel=large",
+ threads("-pthread")),
+ ex_libs => add(threads("-pthread")),
+ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+ asm_arch => 'ppc64',
+ perlasm_scheme => "aix64",
+ shared_cflag => "-fpic",
+ shared_ldflag => add("-shared"),
+ shared_extension => "64.so.\$(SHLIB_VERSION_NUMBER)",
+ AR => add("-X64"),
+ RANLIB => add("-X64"),
+ },
# SIEMENS BS2000/OSD: an EBCDIC-based mainframe
"BS2000-OSD" => {
diff --git a/Configure b/Configure
index 86190d0..58f3e31 100755
--- a/Configure
+++ b/Configure
@@ -1646,7 +1646,7 @@ if (!$disabled{makedepend}) {
disable('unavailable', 'makedepend') unless $config{makedep_scheme};
}
-if (!$disabled{asm} && !$predefined_C{__MACH__} && $^O ne 'VMS') {
+if (!$disabled{asm} && !$predefined_C{__MACH__} && $^O ne 'VMS' && !$predefined_C{_AIX}) {
# probe for -Wa,--noexecstack option...
if ($predefined_C{__clang__}) {
# clang has builtin assembler, which doesn't recognize --help,