Commit 1b712f3f authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configurations/10-main.conf: IRIX configs unification. 



Add irix-common template that covers even irix-shared from shared-info.pl.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6536)
parent 9be083ad

Configurations/10-main.conf

+19 −34
Original line number Diff line number Diff line
@@ -356,75 +356,60 @@ my %targets = ( 


#### IRIX 6.x configs

# Only N32 and N64 ABIs are supported.

    "irix-common" => {

        inherit_from     => [ "BASE_unix" ],

        template         => 1,

        cppflags         => threads("-D_SGI_MP_SOURCE"),

        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",

        ex_libs          => add(threads("-lpthread")),

        thread_scheme    => "pthreads",

        dso_scheme       => "dlfcn",

        shared_target    => "self",

        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",

        shared_ldflag    => "-shared -Wl,-Bsymbolic",

        shared_sonameflag=> "-Wl,-soname,",

    },

    "irix-mips3-gcc" => {

        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],

        inherit_from     => [ "irix-common", asm("mips64_asm") ],

        CC               => "gcc",

        CFLAGS           => picker(debug   => "-g -O0",

                                   release => "-O3"),

        LDFLAGS          => "-static-libgcc",

        cflags           => "-mabi=n32",

        cppflags         => combine("-DB_ENDIAN -DBN_DIV3W",

                                    threads("-D_SGI_MP_SOURCE")),

        cppflags         => threads("-D_SGI_MP_SOURCE"),

        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",

        ex_libs          => add(threads("-lpthread")),

        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",

        thread_scheme    => "pthreads",

        perlasm_scheme   => "n32",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",

        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "32",

    },

    "irix-mips3-cc" => {

        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],

        inherit_from     => [ "irix-common", asm("mips64_asm") ],

        CC               => "cc",

        CFLAGS           => picker(debug   => "-g -O0",

                                   release => "-O2"),

        cflags           => "-n32 -mips3 -use_readonly_const -G0 -rdata_shared",

        cppflags         => threads("-D_SGI_MP_SOURCE"),

        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",

        ex_libs          => add(threads("-lpthread")),

        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT",

        thread_scheme    => "pthreads",

        perlasm_scheme   => "n32",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",

        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "32",

    },

    # N64 ABI builds.

    "irix64-mips4-gcc" => {

        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],

        inherit_from     => [ "irix-common", asm("mips64_asm") ],

        CC               => "gcc",

        CFLAGS           => picker(debug   => "-g -O0",

                                   release => "-O3"),

        LDFLAGS          => "-static-libgcc",

        cflags           => "-mabi=64 -mips4",

        cppflags         => threads("-D_SGI_MP_SOURCE"),

        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",

        ex_libs          => add(threads("-lpthread")),

        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",

        thread_scheme    => "pthreads",

        perlasm_scheme   => "64",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",

        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "64",

    },

    "irix64-mips4-cc" => {

        inherit_from     => [ "BASE_unix", asm("mips64_asm") ],

        inherit_from     => [ "irix-common", asm("mips64_asm") ],

        CC               => "cc",

        CFLAGS           => picker(debug   => "-g -O0",

                                   release => "-O2"),

        cflags           => "-64 -mips4 -use_readonly_const -G0 -rdata_shared",

        cppflags         => threads("-D_SGI_MP_SOURCE"),

        lib_cppflags     => "-DB_ENDIAN -DBN_DIV3W",

        ex_libs          => threads("-lpthread"),

        bn_ops           => "RC4_CHAR SIXTY_FOUR_BIT_LONG",

        thread_scheme    => "pthreads",

        perlasm_scheme   => "64",

        dso_scheme       => "dlfcn",

        shared_target    => "irix-shared",

        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",

        multilib         => "64",

    },

Configurations/shared-info.pl

+0 −7
Original line number Diff line number Diff line
@@ -79,11 +79,4 @@ my %shared_info; 
            shared_sonameflag => '-h ',

        };

    },

    'irix-shared' => sub {

        return $shared_info{'gnu-shared'} if detect_gnu_ld();

        return {

            shared_ldflag     => '-shared -Wl,-Bsymbolic',

            shared_sonameflag => '-Wl,-soname=',

        };

    },

);