Commit 10aafed3 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6453)
parent 60aa6c1a

Configurations/10-main.conf

+22 −35
Original line number Diff line number Diff line
@@ -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"),

    },

Configurations/shared-info.pl

+0 −4
Original line number Diff line number Diff line
@@ -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',

    },

);