Commit ddf47a10 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make use of add() and add_before() in Configurations/ 



A few more sub-joins could be replaced with calls to add() and add_before()

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent f8206c8e

Configurations/00-base-templates.conf

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
    mips64_asm => {

	inherit_from	=> [ "mips32_asm" ],

	template	=> 1,

	sha1_obj        => sub { join(" ", @_, "sha512-mips.o") }

	sha1_obj        => add("sha512-mips.o")

    },

    s390x_asm => {

	template	=> 1,

Configurations/10-main.conf

+9 −9
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
        # with "Illegal mnemonic" error message.

        inherit_from     => [ "solaris-common", asm("x86_elf_asm") ],

        cc               => "gcc",

        cflags           => sub { join(" ","-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM",@_) },

        cflags           => add_before("-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM"),

        debug_cflags     => "-O0 -g",

        release_cflags   => "-O3 -fomit-frame-pointer",

        thread_cflag     => "-pthread",
@@ -72,7 +72,7 @@ 
        #					<appro@fy.chalmers.se>

        inherit_from     => [ "solaris-common", asm("x86_64_asm") ],

        cc               => "gcc",

        cflags           => sub { join(" ","-m64 -Wall -DL_ENDIAN",@_) },

        cflags           => add_before("-m64 -Wall -DL_ENDIAN"),

        debug_cflags     => "-O0 -g",

        release_cflags   => "-O3",

        thread_cflag     => "-pthread",
@@ -87,11 +87,11 @@ 
    "solaris-x86-cc" => {

        inherit_from     => [ "solaris-common" ],

        cc               => "cc",

        cflags           => sub { join(" ","-xarch=generic -xstrconst -Xa -DL_ENDIAN",@_) },

        cflags           => add_before("-xarch=generic -xstrconst -Xa -DL_ENDIAN"),

        debug_cflags     => "-g",

        release_cflags   => "-xO5 -xregs=frameptr -xdepend -xbuiltin",

        thread_cflag     => "-D_REENTRANT",

        lflags           => sub { join(" ",@_,"-mt -lpthread") },

        lflags           => add("-mt -lpthread"),

        bn_ops           => "BN_LLONG RC4_CHAR",

        shared_cflag     => "-KPIC",

        shared_ldflag    => "-G -dy -z text",
@@ -99,11 +99,11 @@ 
    "solaris64-x86_64-cc" => {

        inherit_from     => [ "solaris-common", asm("x86_64_asm") ],

        cc               => "cc",

        cflags           => sub { join(" ","-xarch=generic64 -xstrconst -Xa -DL_ENDIAN",@_) },

        cflags           => add_before("-xarch=generic64 -xstrconst -Xa -DL_ENDIAN"),

        debug_cflags     => "-g",

        release_cflags   => "-xO5 -xdepend -xbuiltin",

        thread_cflag     => "-D_REENTRANT",

        lflags           => sub { join(" ",@_,"-mt -lpthread") },

        lflags           => add("-mt -lpthread"),

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",

        shared_cflag     => "-KPIC",
@@ -115,7 +115,7 @@ 
    "solaris-sparcv7-gcc" => {

        inherit_from     => [ "solaris-common" ],

        cc               => "gcc",

        cflags           => sub { join(" ","-Wall -DB_ENDIAN -DBN_DIV2W",@_) },

        cflags           => add_before("-Wall -DB_ENDIAN -DBN_DIV2W"),

        debug_cflags     => "-O0 -g",

        release_cflags   => "-O3",

        thread_cflag     => "-pthread",
@@ -149,11 +149,11 @@ 
    "solaris-sparcv7-cc" => {

        inherit_from     => [ "solaris-common" ],

        cc               => "cc",

        cflags           => sub { join(" ","-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W",@_) },

        cflags           => add_before("-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W"),

        debug_cflags     => "-g -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG",

        release_cflags   => "-xO5 -xdepend",

        thread_cflag     => "-D_REENTRANT",

        lflags           => sub { join(" ",@_,"-mt -lpthread") },

        lflags           => add("-mt -lpthread"),

        bn_ops           => "BN_LLONG RC4_CHAR",

        shared_cflag     => "-KPIC",

        shared_ldflag    => "-G -dy -z text",