Commit 893fe73a authored by Richard Levitte's avatar Richard Levitte
Browse files

Remove all -march= from configs 



These flags are limitting needlessly, are often patched by packagers,
and should be specified on the configuration command line by anyone
who desires for it to be specific rather than forced by us.

This work was already done with mingw when those configs were worked
on, now it gets applied to the remaining configs.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 4f16039e

Configurations/10-main.conf

+6 −10
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           => add_before(" ", "-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM"),

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

        debug_cflags     => "-O0 -g",

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

        thread_cflag     => "-pthread",
@@ -606,7 +606,7 @@ 
    "linux-elf" => {

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

        cc               => "gcc",

        cflags           => "-march=i486 -DL_ENDIAN -Wall",

        cflags           => "-DL_ENDIAN -Wall",

        debug_cflags     => "-O0 -g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG",

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

        debug_ex_libs    => "-lefence",
@@ -615,7 +615,7 @@ 
    "linux-aout" => {

        inherit_from     => [ asm("x86_asm") ],

        cc               => "gcc",

        cflags           => "-DL_ENDIAN -march=i486 -Wall",

        cflags           => "-DL_ENDIAN -Wall",

        debug_cflags     => "-O0 -g",

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

        thread_cflag     => "(unknown)",
@@ -795,10 +795,6 @@ 
    "android-armeabi" => {

        inherit_from     => [ "android", asm("armv4_asm") ],

    },

    "android-armv7" => {

        inherit_from     => [ "android-armeabi" ],

        cflags           => add_before(" ", "-march=armv7-a"),

    },

    "android-mips" => {

        inherit_from     => [ "android", asm("mips32_asm") ],

        perlasm_scheme   => "o32",
@@ -884,7 +880,7 @@ 
    "bsdi-elf-gcc" => {

        inherit_from     => [ asm("x86_elf_asm") ],

        cc               => "gcc",

        cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall",

        cflags           => "-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -Wall",

        thread_cflag     => "(unknown)",

        ex_libs          => "-ldl",

        bn_ops           => "BN_LLONG",
@@ -974,7 +970,7 @@ 
    "unixware-7-gcc" => {

        inherit_from     => [ asm("x86_elf_asm") ],

        cc               => "gcc",

        cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall",

        cflags           => "-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -Wall",

        thread_cflag     => "-D_REENTRANT",

        ex_libs          => "-lsocket -lnsl",

        bn_ops           => "BN_LLONG",
@@ -1431,7 +1427,7 @@ 
    "hurd-x86" => {

        inherit_from     => [ asm("x86_elf_asm") ],

        cc               => "gcc",

        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall",

        cflags           => "-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",

        thread_cflag     => "-pthread",

        ex_libs          => "-ldl",

        bn_ops           => "BN_LLONG",

Configurations/90-team.conf

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
    "debug-linux-elf-noefence" => {

        inherit_from     => [ "x86_elf_asm" ],

        cc               => "gcc",

        cflags           => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -march=i486 -Wall",

        cflags           => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -Wall",

        thread_cflag     => "-D_REENTRANT",

        ex_libs          => "-ldl",

        bn_ops           => "BN_LLONG",

config

+3 −1
Original line number Diff line number Diff line
@@ -812,7 +812,9 @@ case "$GUESSOS" in 
  x86pc-*-qnx6) OUT="QNX6-i386" ;;

  *-*-qnx6) OUT="QNX6" ;;

  x86-*-android|i?86-*-android) OUT="android-x86" ;;

  armv[7-9]*-*-android) OUT="android-armv7" ;;

  armv[7-9]*-*-android)

      OUT="android-armeabi"; options="$options -march=armv7-a" ;;

  arm*-*-android) OUT="android-armeabi" ;;

  *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;

esac