From 1dfdef2268cba068831892f800eab4366bf3f186 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Fri, 20 Feb 2015 22:48:48 +1100 Subject: [PATCH] * testsuite/config-guess.sh: Read an additional column from the data file giving a value for 'uname -p'. In most cases, this can be the string 'ignored'. * testsuite/config-guess.data: Add uname -p value for each entry. --- ChangeLog | 7 ++ testsuite/config-guess.data | 132 ++++++++++++++++++------------------ testsuite/config-guess.sh | 10 +-- 3 files changed, 79 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f69c0a..7ae4361 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-02-20 Ben Elliston + + * testsuite/config-guess.sh: Read an additional column from the + data file giving a value for 'uname -p'. In most cases, this can + be the string 'ignored'. + * testsuite/config-guess.data: Add uname -p value for each entry. + 2015-01-01 Ben Elliston * config.guess: Update copyright years. diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data index 5713748..c6fb89c 100644 --- a/testsuite/config-guess.data +++ b/testsuite/config-guess.data @@ -1,66 +1,66 @@ -2064 ignored z/VM ignored s390-ibm-zvmoe -3 2.3.3 XENIX SysV i386-pc-xenix -8664 1.0 Windows_NT ignored x86_64-pc-mks -aarch64_be ignored Linux ignored aarch64_be-unknown-linux-gnu -aarch64 ignored Linux ignored aarch64-unknown-linux-gnu -amd64 1.5.12(0.116/4/2) CYGWIN_NT-5.2 ignored x86_64-unknown-cygwin -arceb ignored Linux ignored arceb-unknown-linux-gnu -arc ignored Linux ignored arc-unknown-linux-gnu -arm ignored riscos ignored arm-unknown-riscos -arm ignored RISCOS ignored arm-unknown-riscos -armv4l ignored riscos ignored arm-unknown-riscos -authenticamd 6.0 Interix ignored x86_64-unknown-interix6.0 -avr32 2.6.15 Linux ignored avr32-unknown-linux-gnu -BePC 1.0 Haiku ignored i586-pc-haiku -crayx1 2.5.20 UNICOS/mp ignored craynv-cray-unicosmp2.5.X -cris 2.6.6 Linux ignored cris-axis-linux-gnu -crisv32 2.6.6 Linux ignored crisv32-axis-linux-gnu -EM64T 5.2 Interix ignored x86_64-unknown-interix5.2 -frv 2.4.24 Linux ignored frv-unknown-linux-gnu -genuineintel 6.0 Interix ignored x86_64-unknown-interix6.0 -hexagon 1.0 Linux ignored hexagon-unknown-linux-gnu -i386 1.0 MINGW ignored i386-pc-mingw32 -i386 12.1 AROS ignored i386-pc-aros -i386 4.2 LynxOS ignored i386-unknown-lynxos4.2 -i386 ignored VOS ignored i386-stratus-vos -i586 1.0 SolidBSD ignored i586-unknown-solidbsd1.0 -i586 5.0.0 skyos ignored i586-pc-skyos5.0.0 -i586 ignored rdos ignored i586-pc-rdos -i686 1.0.17(0.48/3/2) MSYS_NT-6.0 ignored i686-pc-msys -i686 5.11-686 GNU/kOpenSolaris ignored i686-unknown-kopensolaris5.11-gnu -i686 5.4-1-686 GNU/kFreeBSD ignored i686-unknown-kfreebsd5.4-gnu -i786-pc ignored windows32 ignored i786-pc-mingw32 -i86pc 5.0 AuroraUX ignored i386-pc-auroraux5.0 -i86xen 5.0 AuroraUX ignored i386-pc-auroraux5.0 -IA64 6.0 Interix ignored ia64-unknown-interix6.0 -macppc 1.0 MirBSD ignored powerpc-unknown-mirbsd1.0 -NEO-1 1.0 NONSTOP_KERNEL ignored neo-tandem-nsk1.0 -NSE-1 1.0 NONSTOP_KERNEL ignored nse-tandem-nsk1.0 -NSE-N 1.0 NONSTOP_KERNEL ignored nse-tandem-nsk1.0 -NSE-NN 1.0 NONSTOP_KERNEL ignored nse-tandem-nsk1.0 -openrisc ignored Linux ignored or1k-unknown-linux-gnu -or1k ignored Linux ignored or1k-unknown-linux-gnu -or1knd ignored Linux ignored or1knd-unknown-linux-gnu -or32 ignored Linux ignored or32-unknown-linux-gnu -padre 2.6.15 Linux ignored sparc-unknown-linux-gnu -pc 1.0 ignored ignored i586-pc-msdosdjgpp -PowerPC 4.2 LynxOS ignored powerpc-unknown-lynxos4.2 -ppc 2.6.9-22 Linux ignored powerpc-unknown-linux-gnu -ppc64 2.6.9-22 Linux ignored powerpc64-unknown-linux-gnu -s390x 5.6 SunOS ignored s390x-ibm-solaris2.6 -SX-7 1.0 SUPER-UX ignored sx7-nec-superux1.0 -SX-8 1.0 SUPER-UX ignored sx8-nec-superux1.0 -SX-8R 1.0 SUPER-UX ignored sx8r-nec-superux1.0 -tile 2.6.36 Linux ignored tile-unknown-linux-gnu -tilegx 2.6.36 Linux ignored tilegx-unknown-linux-gnu -vax 2.6.15 Linux ignored vax-dec-linux-gnu -x86 5.2 Interix ignored i586-pc-interix5.2 -x86 6.0 Interix ignored i586-pc-interix6.0 -x86_64 1.0 Haiku ignored x86_64-unknown-haiku -x86_64 1.0 MINGW64 ignored x86_64-pc-mingw64 -x86_64 1.0 MINGW ignored x86_64-pc-mingw32 -x86_64 1.5.18(0.132/4/2) CYGWIN_NT-5.2 ignored x86_64-unknown-cygwin -x86_64 2.0.0(0.271/5/3) MSYS_NT-6.1 ignored x86_64-pc-msys -x86_64 2.6.32 Linux ignored x86_64-unknown-linux-gnu -x86_64 2.6.32 VMkernel ignored x86_64-unknown-esx -xtensa 2.6.15 Linux ignored xtensa-unknown-linux-gnu +2064 ignored z/VM ignored ignored s390-ibm-zvmoe +3 2.3.3 XENIX SysV ignored i386-pc-xenix +8664 1.0 Windows_NT ignored ignored x86_64-pc-mks +aarch64_be ignored Linux ignored ignored aarch64_be-unknown-linux-gnu +aarch64 ignored Linux ignored ignored aarch64-unknown-linux-gnu +amd64 1.5.12(0.116/4/2) CYGWIN_NT-5.2 ignored ignored x86_64-unknown-cygwin +arceb ignored Linux ignored ignored arceb-unknown-linux-gnu +arc ignored Linux ignored ignored arc-unknown-linux-gnu +arm ignored riscos ignored ignored arm-unknown-riscos +arm ignored RISCOS ignored ignored arm-unknown-riscos +armv4l ignored riscos ignored ignored arm-unknown-riscos +authenticamd 6.0 Interix ignored ignored x86_64-unknown-interix6.0 +avr32 2.6.15 Linux ignored ignored avr32-unknown-linux-gnu +BePC 1.0 Haiku ignored ignored i586-pc-haiku +crayx1 2.5.20 UNICOS/mp ignored ignored craynv-cray-unicosmp2.5.X +cris 2.6.6 Linux ignored ignored cris-axis-linux-gnu +crisv32 2.6.6 Linux ignored ignored crisv32-axis-linux-gnu +EM64T 5.2 Interix ignored ignored x86_64-unknown-interix5.2 +frv 2.4.24 Linux ignored ignored frv-unknown-linux-gnu +genuineintel 6.0 Interix ignored ignored x86_64-unknown-interix6.0 +hexagon 1.0 Linux ignored ignored hexagon-unknown-linux-gnu +i386 1.0 MINGW ignored ignored i386-pc-mingw32 +i386 12.1 AROS ignored ignored i386-pc-aros +i386 4.2 LynxOS ignored ignored i386-unknown-lynxos4.2 +i386 ignored VOS ignored ignored i386-stratus-vos +i586 1.0 SolidBSD ignored ignored i586-unknown-solidbsd1.0 +i586 5.0.0 skyos ignored ignored i586-pc-skyos5.0.0 +i586 ignored rdos ignored ignored i586-pc-rdos +i686 1.0.17(0.48/3/2) MSYS_NT-6.0 ignored ignored i686-pc-msys +i686 5.11-686 GNU/kOpenSolaris ignored ignored i686-unknown-kopensolaris5.11-gnu +i686 5.4-1-686 GNU/kFreeBSD ignored ignored i686-unknown-kfreebsd5.4-gnu +i786-pc ignored windows32 ignored ignored i786-pc-mingw32 +i86pc 5.0 AuroraUX ignored ignored i386-pc-auroraux5.0 +i86xen 5.0 AuroraUX ignored ignored i386-pc-auroraux5.0 +IA64 6.0 Interix ignored ignored ia64-unknown-interix6.0 +macppc 1.0 MirBSD ignored ignored powerpc-unknown-mirbsd1.0 +NEO-1 1.0 NONSTOP_KERNEL ignored ignored neo-tandem-nsk1.0 +NSE-1 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 +NSE-N 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 +NSE-NN 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 +openrisc ignored Linux ignored ignored or1k-unknown-linux-gnu +or1k ignored Linux ignored ignored or1k-unknown-linux-gnu +or1knd ignored Linux ignored ignored or1knd-unknown-linux-gnu +or32 ignored Linux ignored ignored or32-unknown-linux-gnu +padre 2.6.15 Linux ignored ignored sparc-unknown-linux-gnu +pc 1.0 ignored ignored ignored i586-pc-msdosdjgpp +PowerPC 4.2 LynxOS ignored ignored powerpc-unknown-lynxos4.2 +ppc 2.6.9-22 Linux ignored ignored powerpc-unknown-linux-gnu +ppc64 2.6.9-22 Linux ignored ignored powerpc64-unknown-linux-gnu +s390x 5.6 SunOS ignored ignored s390x-ibm-solaris2.6 +SX-7 1.0 SUPER-UX ignored ignored sx7-nec-superux1.0 +SX-8 1.0 SUPER-UX ignored ignored sx8-nec-superux1.0 +SX-8R 1.0 SUPER-UX ignored ignored sx8r-nec-superux1.0 +tile 2.6.36 Linux ignored ignored tile-unknown-linux-gnu +tilegx 2.6.36 Linux ignored ignored tilegx-unknown-linux-gnu +vax 2.6.15 Linux ignored ignored vax-dec-linux-gnu +x86 5.2 Interix ignored ignored i586-pc-interix5.2 +x86 6.0 Interix ignored ignored i586-pc-interix6.0 +x86_64 1.0 Haiku ignored ignored x86_64-unknown-haiku +x86_64 1.0 MINGW64 ignored ignored x86_64-pc-mingw64 +x86_64 1.0 MINGW ignored ignored x86_64-pc-mingw32 +x86_64 1.5.18(0.132/4/2) CYGWIN_NT-5.2 ignored ignored x86_64-unknown-cygwin +x86_64 2.0.0(0.271/5/3) MSYS_NT-6.1 ignored ignored x86_64-pc-msys +x86_64 2.6.32 Linux ignored ignored x86_64-unknown-linux-gnu +x86_64 2.6.32 VMkernel ignored ignored x86_64-unknown-esx +xtensa 2.6.15 Linux ignored ignored xtensa-unknown-linux-gnu diff --git a/testsuite/config-guess.sh b/testsuite/config-guess.sh index 58b5461..fe48e0a 100644 --- a/testsuite/config-guess.sh +++ b/testsuite/config-guess.sh @@ -1,6 +1,7 @@ #!/bin/sh # -# Copyright 2004, 2005, 2009, 2012 Free Software Foundation, Inc. +# Copyright 2004, 2005, 2009, 2012, 2015 Free Software Foundation, +# Inc. # Contributed by Ben Elliston . # # This test reads 5-tuples from config-guess.data: the components of @@ -12,19 +13,20 @@ PATH=`pwd`:$PATH run_config_guess () { rc=0 - while read machine release system version triplet ; do + while read machine release system version processor triplet ; do sed \ -e "s,@MACHINE@,$machine," \ -e "s,@RELEASE@,$release," \ -e "s,@SYSTEM@,$system," \ - -e "s,@VERSION@,$version," > uname << EOF + -e "s,@VERSION@,$version," \ + -e "s,@PROCESSOR@,$processor," > uname << EOF #!/bin/sh [ \$# -ne 1 ] && exec sh \$0 -s [ \$1 = -m ] && echo "@MACHINE@" && exit 0 [ \$1 = -r ] && echo "@RELEASE@" && exit 0 [ \$1 = -s ] && echo "@SYSTEM@" && exit 0 [ \$1 = -v ] && echo "@VERSION@" && exit 0 -[ \$1 = -p ] && echo "Pentium III(TM)-ISA/PCI" +[ \$1 = -p ] && echo "@PROCESSOR@" && exit 0 EOF chmod +x uname output=`sh ../config.guess 2>/dev/null`