From 893fe73a637cd349b4bd2f39d2d6019e1d7cac18 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 22 Feb 2016 21:02:42 +0100 Subject: 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: Andy Polyakov --- Configurations/10-main.conf | 16 ++++++---------- Configurations/90-team.conf | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'Configurations') diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index a3dfcfdc66..930bef4c2e 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -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", diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf index 253094541d..226fe6c78a 100644 --- a/Configurations/90-team.conf +++ b/Configurations/90-team.conf @@ -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", -- cgit v1.2.3