From 10aafed3ec8719442d0d3516a6a12a45d2a70a2f Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 11 Jun 2018 12:43:50 +0200 Subject: [PATCH] Configurations/10-main.conf: AIX configs unification. Add aix-common template that covers even aix-shared from shared-info.pl, add -bsymbolic to shared_ldflags. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/6453) --- Configurations/10-main.conf | 57 ++++++++++++++--------------------- Configurations/shared-info.pl | 4 --- 2 files changed, 22 insertions(+), 39 deletions(-) diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index b3fc4884e3..1d2ee64250 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1117,85 +1117,72 @@ my %targets = ( # variable, then you should know that in OpenSSL case it's considered # only in ./config. Once configured, build procedure remains "deaf" to # current value of $OBJECT_MODE. + "aix-common" => { + inherit_from => [ "BASE_unix" ], + template => 1, + sys_id => "AIX", + lib_cppflags => "-DB_ENDIAN", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "self", + shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", + bin_lflags => shared("-Wl,-bsvr4"), + shared_ldflag => "-Wl,-G,-bsymbolic,-bexpall,-bnolibpath,-bM:SRE", + }, "aix-gcc" => { - inherit_from => [ "BASE_unix", asm("ppc32_asm") ], + inherit_from => [ "aix-common", asm("ppc32_asm") ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => add(threads("-pthread")), - lib_cppflags => "-DB_ENDIAN", - ex_libs => add(threads("-pthread")), - sys_id => "AIX", + ex_libs => threads("-pthread"), bn_ops => "BN_LLONG RC4_CHAR", - thread_scheme => "pthreads", perlasm_scheme => "aix32", - dso_scheme => "dlfcn", - shared_target => "aix-shared", - shared_ldflag => "-shared -static-libgcc -Wl,-G", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", + shared_ldflag => add("-shared -static-libgcc"), AR => add("-X32"), RANLIB => add("-X32"), }, "aix64-gcc" => { - inherit_from => [ "BASE_unix", asm("ppc64_asm") ], + inherit_from => [ "aix-common", asm("ppc64_asm") ], CC => "gcc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => combine("-maix64", threads("-pthread")), - lib_cppflags => "-DB_ENDIAN", - ex_libs => add(threads("-pthread")), - sys_id => "AIX", + ex_libs => threads("-pthread"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", - thread_scheme => "pthreads", perlasm_scheme => "aix64", - dso_scheme => "dlfcn", - shared_target => "aix-shared", - shared_ldflag => "-shared -static-libgcc -Wl,-G", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", + shared_ldflag => add("-shared -static-libgcc"), AR => add("-X64"), RANLIB => add("-X64"), }, "aix-cc" => { - inherit_from => [ "BASE_unix", asm("ppc32_asm") ], + inherit_from => [ "aix-common", asm("ppc32_asm") ], CC => "cc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => combine("-q32 -qmaxmem=16384 -qro -qroconst", threads("-qthreaded")), cppflags => threads("-D_THREAD_SAFE"), - lib_cppflags => "-DB_ENDIAN", - sys_id => "AIX", - bn_ops => "BN_LLONG RC4_CHAR", - thread_scheme => "pthreads", ex_libs => threads("-lpthreads"), + bn_ops => "BN_LLONG RC4_CHAR", perlasm_scheme => "aix32", - dso_scheme => "dlfcn", - shared_target => "aix-shared", shared_cflag => "-qpic", - shared_ldflag => "-G", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", AR => add("-X32"), RANLIB => add("-X32"), }, "aix64-cc" => { - inherit_from => [ "BASE_unix", asm("ppc64_asm") ], + inherit_from => [ "aix-common", asm("ppc64_asm") ], CC => "cc", CFLAGS => picker(debug => "-O0 -g", release => "-O"), cflags => combine("-q64 -qmaxmem=16384 -qro -qroconst", threads("-qthreaded")), cppflags => threads("-D_THREAD_SAFE"), - lib_cppflags => "-DB_ENDIAN", - sys_id => "AIX", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", - thread_scheme => "pthreads", ex_libs => threads("-lpthreads"), + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", perlasm_scheme => "aix64", dso_scheme => "dlfcn", - shared_target => "aix-shared", shared_cflag => "-qpic", - shared_ldflag => "-G", - shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", AR => add("-X64"), RANLIB => add("-X64"), }, diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl index eb919b1f4a..1a4910077f 100644 --- a/Configurations/shared-info.pl +++ b/Configurations/shared-info.pl @@ -91,8 +91,4 @@ my %shared_info; 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', - }, ); -- 2.34.1