From 2c3ee16272231986e1ff50db9c0ed68343a51fb2 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Thu, 27 Sep 2007 07:43:58 +0000 Subject: [PATCH] Move -march=armv4t to ./config. --- Configure | 3 ++- TABLE | 2 +- config | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Configure b/Configure index 055591298b..79ffcef631 100755 --- a/Configure +++ b/Configure @@ -324,7 +324,8 @@ my %table=( # throw in -D[BL]_ENDIAN, whichever appropriate... "linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:ppccpuid_linux32.o:linux_ppc32.o linux_ppc32-mont.o:::::sha1-ppc_linux32.o sha256-ppc_linux32.o:::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"linux-armv4", "gcc:-march=armv4 -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +# It's appropriate to complement it with -march, which is done in ./config... +"linux-armv4", "gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### IA-32 targets... "linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/TABLE b/TABLE index a5c74b9745..3d6125d11b 100644 --- a/TABLE +++ b/TABLE @@ -2960,7 +2960,7 @@ $arflags = *** linux-armv4 $cc = gcc -$cflags = -march=armv4 -DTERMIO -O3 -Wall +$cflags = -DTERMIO -O3 -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = diff --git a/config b/config index e8128262d4..bb76191d58 100755 --- a/config +++ b/config @@ -611,8 +611,10 @@ case "$GUESSOS" in options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH" OUT="linux-generic32" ;; - arm[1-3]*-*-linux2) OUT="linux-generic32" ;; - arm*-*-linux2) OUT="linux-armv4" ;; + armv[1-3]*-*-linux2) OUT="linux-generic32" ;; + # -march=armv4t is expected to generate code binary compatible with + # vanilla armv4 but interoperable with armv4t. + arm*-*-linux2) OUT="linux-armv4"; options="$options -march=armv4t" ;; sh*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;; sh*-*-linux2) OUT="linux-generic32"; options="$options -DL_ENDIAN" ;; m68k*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;