Commit 72d7f221 authored by Richard Levitte's avatar Richard Levitte
Browse files

Configurations/10-main.conf: Duplicate cflags to cxxflags 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5534)
parent b6954f3b

Configurations/10-main.conf

+19 −2
Original line number Diff line number Diff line
@@ -683,6 +683,7 @@ my %targets = ( 
    "linux-ppc64" => {

        inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],

        cflags           => add("-m64"),

        cxxflags         => add("-m64"),

        cppflags         => add("-DB_ENDIAN"),

        perlasm_scheme   => "linux64",

        multilib         => "64",
@@ -690,6 +691,7 @@ my %targets = ( 
    "linux-ppc64le" => {

        inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],

        cflags           => add("-m64"),

        cxxflags         => add("-m64"),

        cppflags         => add("-DL_ENDIAN"),

        perlasm_scheme   => "linux64le",

    },
@@ -736,6 +738,7 @@ my %targets = ( 
    "linux-arm64ilp32" => {  # https://wiki.linaro.org/Platform/arm64-ilp32

        inherit_from     => [ "linux-generic32", asm("aarch64_asm") ],

        cflags           => add("-mabi=ilp32"),

        cxxflags         => add("-mabi=ilp32"),

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",

        perlasm_scheme   => "linux64",

    },
@@ -745,6 +748,7 @@ my %targets = ( 
        # support, if no -march was specified at command line.

        inherit_from     => [ "linux-generic32", asm("mips32_asm") ],

        cflags           => add("-mabi=32"),

        cxxflags         => add("-mabi=32"),

        cppflags         => add("-DBN_DIV3W"),

        perlasm_scheme   => "o32",

    },
@@ -753,6 +757,7 @@ my %targets = ( 
    "linux-mips64" => {

        inherit_from     => [ "linux-generic32", asm("mips64_asm") ],

        cflags           => add("-mabi=n32"),

        cxxflags         => add("-mabi=n32"),

        cppflags         => add("-DBN_DIV3W"),

        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",

        perlasm_scheme   => "n32",
@@ -761,6 +766,7 @@ my %targets = ( 
    "linux64-mips64" => {

        inherit_from     => [ "linux-generic64", asm("mips64_asm") ],

        cflags           => add("-mabi=64"),

        cxxflags         => add("-mabi=64"),

        cppflags         => add("-DBN_DIV3W"),

        perlasm_scheme   => "64",

        multilib         => "64",
@@ -792,6 +798,7 @@ my %targets = ( 
        inherit_from     => [ "linux-generic32", asm("x86_asm") ],

        CFLAGS           => add(picker(release => "-fomit-frame-pointer")),

        cflags           => add("-m32"),

        cxxflags         => add("-m32"),

        cppflags         => add("-DL_ENDIAN"),

        bn_ops           => "BN_LLONG",

        perlasm_scheme   => "elf",
@@ -805,6 +812,7 @@ my %targets = ( 
    "linux-x86_64" => {

        inherit_from     => [ "linux-generic64", asm("x86_64_asm") ],

        cflags           => add("-m64"),

        cxxflags         => add("-m64"),

        cppflags         => add("-DL_ENDIAN"),

        bn_ops           => "SIXTY_FOUR_BIT_LONG",

        perlasm_scheme   => "elf",
@@ -819,6 +827,7 @@ my %targets = ( 
    "linux-x32" => {

        inherit_from     => [ "linux-generic32", asm("x86_64_asm") ],

        cflags           => add("-mx32"),

        cxxflags         => add("-mx32"),

        cppflags         => add("-DL_ENDIAN"),

        bn_ops           => "SIXTY_FOUR_BIT",

        perlasm_scheme   => "elf32",
@@ -833,6 +842,7 @@ my %targets = ( 
    "linux64-s390x" => {

        inherit_from     => [ "linux-generic64", asm("s390x_asm") ],

        cflags           => add("-m64"),

        cxxflags         => add("-m64"),

        cppflags         => add("-DB_ENDIAN"),

        perlasm_scheme   => "64",

        multilib         => "64",
@@ -856,6 +866,7 @@ my %targets = ( 
        #

        inherit_from     => [ "linux-generic32", asm("s390x_asm") ],

        cflags           => add("-m31 -Wa,-mzarch"),

        cxxflags         => add("-m31 -Wa,-mzarch"),

        cppflags         => add("-DB_ENDIAN"),

        bn_asm_src       => sub { my $r=join(" ",@_); $r=~s|asm/s390x\.S|bn_asm.c|; $r; },

        perlasm_scheme   => "31",
@@ -866,6 +877,7 @@ my %targets = ( 
    "linux-sparcv8" => {

        inherit_from     => [ "linux-generic32", asm("sparcv8_asm") ],

        cflags           => add("-mcpu=v8"),

        cxxflags         => add("-mcpu=v8"),

        lib_cppflags     => add("-DB_ENDIAN -DBN_DIV2W"),

    },

    "linux-sparcv9" => {
@@ -873,12 +885,14 @@ my %targets = ( 
        # but -Wa,-Av8plus should do the trick no matter what.

        inherit_from     => [ "linux-generic32", asm("sparcv9_asm") ],

        cflags           => add("-m32 -mcpu=ultrasparc -Wa,-Av8plus"),

        cxxflags         => add("-m32 -mcpu=ultrasparc -Wa,-Av8plus"),

        lib_cppflags     => add("-DB_ENDIAN -DBN_DIV2W"),

    },

    "linux64-sparcv9" => {

        # GCC 3.1 is a requirement

        inherit_from     => [ "linux-generic64", asm("sparcv9_asm") ],

        cflags           => add("-m64 -mcpu=ultrasparc"),

        cxxflags         => add("-m64 -mcpu=ultrasparc"),

        lib_cppflags     => add("-DB_ENDIAN"),

        bn_ops           => "BN_LLONG RC4_CHAR",

        multilib         => "64",
@@ -895,6 +909,7 @@ my %targets = ( 
        CC               => "cl6x",

        CFLAGS           => "-o2 -ox -ms",

        cflags           => "--linux -ea=.s -eo=.o -mv6400+ -pden",

        cxxflags         => "--linux -ea=.s -eo=.o -mv6400+ -pden",

        cppflags         => combine("-DOPENSSL_SMALL_FOOTPRINT",

                                    threads("-D_REENTRANT")),

        bn_ops           => "BN_LLONG",
@@ -942,7 +957,8 @@ my %targets = ( 
        # systems are perfectly capable of executing binaries targeting

        # Froyo. Keep in mind that in the nutshell Android builds are

        # about JNI, i.e. shared libraries, not applications.

        cflags           => add(picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack")),

        cflags           => add("-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack"),

        cxxflags         => add("-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack"),

        bin_cflags       => "-pie",

    },

    "android-x86" => {
@@ -982,7 +998,8 @@ my %targets = ( 


    "android64" => {

        inherit_from     => [ "linux-generic64" ],

        cflags           => add(picker(default => "-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack")),

        cflags           => add("-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack"),

        cxxflags         => add("-mandroid -fPIC --sysroot=\$(CROSS_SYSROOT) -Wa,--noexecstack"),

        bin_cflags       => "-pie",

    },

    "android64-aarch64" => {