From f49eb158fa5618dbd1130e47281e0bae13798ec6 Mon Sep 17 00:00:00 2001 From: doko Date: Mon, 15 Oct 2012 21:12:23 +0000 Subject: [PATCH] gcc/ 2012-10-15 Matthias Klose * config.gcc: Match arm*-*-linux-* for ARM Linux/GNU. * doc/install.texi: Use arm-*-*linux-* instead of arm-*-*linux-gnueabi. gcc/testsuite/ 2012-10-15 Matthias Klose * lib/target-supports.exp (check_profiling_available): Match arm*-*-linux-* for ARM Linux/GNU. * g++.dg/torture/predcom-1.C: Match arm*-*-linux-* for ARM Linux/GNU. * gfortran.dg/enum_10.f90: Likewise. * gfortran.dg/enum_9.f90: Likewise. * gcc.target/arm/synchronize.c: Likewise. * g++.old-deja/g++.jason/enum6.C: Likewise. * g++.old-deja/g++.other/enum4.C: Likewise. * g++.old-deja/g++.law/enum9.C: Likewise. gcc/ada/ 2012-10-15 Matthias Klose * gcc-interface/Makefile.in: Match arm*-*-linux-*eabi* for ARM Linux/GNU. libgcc/ 2012-10-15 Matthias Klose * config.host: Match arm*-*-linux-* for ARM Linux/GNU. libstdc++-v3/ 2012-10-15 Matthias Klose * configure.host: Match arm*-*-linux-* for ARM Linux/GNU. * testsuite/20_util/make_signed/requirements/typedefs-2.cc: Likewise. * testsuite/20_util/make_unsigned/requirements/typedefs-2.cc: Likewise. libjava/ 2012-10-15 Matthias Klose * configure.ac: Match arm*-*-linux-* for ARM Linux/GNU. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192475 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/Makefile.in | 2 +- gcc/config.gcc | 2 +- gcc/doc/install.texi | 2 +- gcc/testsuite/ChangeLog | 12 ++++++++++++ gcc/testsuite/g++.dg/torture/predcom-1.C | 2 +- gcc/testsuite/g++.old-deja/g++.jason/enum6.C | 4 ++-- gcc/testsuite/g++.old-deja/g++.law/enum9.C | 4 ++-- gcc/testsuite/g++.old-deja/g++.other/enum4.C | 4 ++-- gcc/testsuite/gcc.target/arm/synchronize.c | 2 +- gcc/testsuite/gfortran.dg/enum_10.f90 | 2 +- gcc/testsuite/gfortran.dg/enum_9.f90 | 2 +- gcc/testsuite/lib/target-supports.exp | 6 +++--- libgcc/ChangeLog | 4 ++++ libgcc/config.host | 2 +- libjava/ChangeLog | 5 +++++ libjava/configure | 2 +- libjava/configure.ac | 2 +- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/configure.host | 2 +- .../testsuite/20_util/make_signed/requirements/typedefs-2.cc | 2 +- .../20_util/make_unsigned/requirements/typedefs-2.cc | 2 +- 23 files changed, 59 insertions(+), 22 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f646294..948857d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-10-15 Matthias Klose + + * config.gcc: Match arm*-*-linux-* for ARM Linux/GNU. + * doc/install.texi: Use arm-*-*linux-* instead of arm-*-*linux-gnueabi. + 2012-10-13 Uros Bizjak * config/i386/sse.md (UNSPEC_MOVU): Remove. diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1a9ff91..6aa07b0 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2012-10-15 Matthias Klose + + * gcc-interface/Makefile.in: Match arm*-*-linux-*eabi* for + ARM Linux/GNU. + 2012-10-05 Robert Dewar * sem_ch7.adb: Minor reformatting. diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 18446e0..3b2b2a7 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1850,7 +1850,7 @@ ifeq ($(strip $(filter-out powerpc% e500% linux%,$(arch) $(osys))),) LIBRARY_VERSION := $(LIB_VERSION) endif -ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),) +ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),) LIBGNAT_TARGET_PAIRS = \ a-intnam.ads + + * lib/target-supports.exp (check_profiling_available): Match + arm*-*-linux-* for ARM Linux/GNU. + * g++.dg/torture/predcom-1.C: Match arm*-*-linux-* for ARM Linux/GNU. + * gfortran.dg/enum_10.f90: Likewise. + * gfortran.dg/enum_9.f90: Likewise. + * gcc.target/arm/synchronize.c: Likewise. + * g++.old-deja/g++.jason/enum6.C: Likewise. + * g++.old-deja/g++.other/enum4.C: Likewise. + * g++.old-deja/g++.law/enum9.C: Likewise. + 2012-10-15 Richard Sandiford * g++.dg/tls/thread_local-cse.C: Move dg-do line. diff --git a/gcc/testsuite/g++.dg/torture/predcom-1.C b/gcc/testsuite/g++.dg/torture/predcom-1.C index c668cac..9e9a4b3 100644 --- a/gcc/testsuite/g++.dg/torture/predcom-1.C +++ b/gcc/testsuite/g++.dg/torture/predcom-1.C @@ -1,5 +1,5 @@ /* Test for ICE in predictive commoning with empty loop header block - on arm-none-linux-gnueabi. */ + on arm-none-linux-*. */ struct Foo { diff --git a/gcc/testsuite/g++.old-deja/g++.jason/enum6.C b/gcc/testsuite/g++.old-deja/g++.jason/enum6.C index 7be0cd8..97bc2ba 100644 --- a/gcc/testsuite/g++.old-deja/g++.jason/enum6.C +++ b/gcc/testsuite/g++.old-deja/g++.jason/enum6.C @@ -7,10 +7,10 @@ // enum-size attributes should only be emitted if there are values of // enum type that can escape the compilation unit, gcc cannot currently // detect this; if this facility is added then this linker option should -// not be needed. arm-*-linux*eabi should be a good approximation to +// not be needed. arm-*-linux* should be a good approximation to // those platforms where the EABI supplement defines enum values to be // 32 bits wide. -// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } +// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux* } } #include diff --git a/gcc/testsuite/g++.old-deja/g++.law/enum9.C b/gcc/testsuite/g++.old-deja/g++.law/enum9.C index 5a74b2f..e4045b5 100644 --- a/gcc/testsuite/g++.old-deja/g++.law/enum9.C +++ b/gcc/testsuite/g++.old-deja/g++.law/enum9.C @@ -7,10 +7,10 @@ // enum-size attributes should only be emitted if there are values of // enum type that can escape the compilation unit, gcc cannot currently // detect this; if this facility is added then this linker option should -// not be needed. arm-*-linux*eabi should be a good approximation to +// not be needed. arm-*-linux* should be a good approximation to // those platforms where the EABI supplement defines enum values to be // 32 bits wide. -// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } +// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux* } } // GROUPS passed enums extern "C" int printf (const char *, ...); diff --git a/gcc/testsuite/g++.old-deja/g++.other/enum4.C b/gcc/testsuite/g++.old-deja/g++.other/enum4.C index 429e812..3c8bb0c 100644 --- a/gcc/testsuite/g++.old-deja/g++.other/enum4.C +++ b/gcc/testsuite/g++.old-deja/g++.other/enum4.C @@ -9,10 +9,10 @@ // enum-size attributes should only be emitted if there are values of // enum type that can escape the compilation unit, gcc cannot currently // detect this; if this facility is added then this linker option should -// not be needed. arm-*-linux*eabi should be a good approximation to +// not be needed. arm-*-linux* should be a good approximation to // those platforms where the EABI supplement defines enum values to be // 32 bits wide. -// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } +// { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux* } } enum E { a = -312 diff --git a/gcc/testsuite/gcc.target/arm/synchronize.c b/gcc/testsuite/gcc.target/arm/synchronize.c index 8626d8e..7ef10e2 100644 --- a/gcc/testsuite/gcc.target/arm/synchronize.c +++ b/gcc/testsuite/gcc.target/arm/synchronize.c @@ -1,4 +1,4 @@ -/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-*eabi } } } */ +/* { dg-final { scan-assembler "__sync_synchronize|dmb|mcr" { target arm*-*-linux-* } } } */ void *foo (void) { diff --git a/gcc/testsuite/gfortran.dg/enum_10.f90 b/gcc/testsuite/gfortran.dg/enum_10.f90 index b387fe3..80e7fca 100644 --- a/gcc/testsuite/gfortran.dg/enum_10.f90 +++ b/gcc/testsuite/gfortran.dg/enum_10.f90 @@ -1,7 +1,7 @@ ! { dg-do run } ! { dg-additional-sources enum_10.c } ! { dg-options "-fshort-enums -w" } -! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } +! { dg-options "-fshort-enums -w -Wl,--no-enum-size-warning" { target arm*-*-linux* } } ! Make sure short enums are indeed interoperable with the ! corresponding C type. diff --git a/gcc/testsuite/gfortran.dg/enum_9.f90 b/gcc/testsuite/gfortran.dg/enum_9.f90 index 8a5c60a..d3187c7 100644 --- a/gcc/testsuite/gfortran.dg/enum_9.f90 +++ b/gcc/testsuite/gfortran.dg/enum_9.f90 @@ -1,6 +1,6 @@ ! { dg-do run } ! { dg-options "-fshort-enums" } -! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } +! { dg-options "-fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux* } } ! Program to test enumerations when option -fshort-enums is given program main diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index f8e416c7..e932cc9 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -3924,7 +3924,7 @@ proc check_effective_target_sync_long_long_runtime { } { } } "" }] - } elseif { [istarget arm*-*-linux-gnueabi] } { + } elseif { [istarget arm*-*-linux-*] } { return [check_runtime sync_longlong_runtime { #include int main () @@ -3968,7 +3968,7 @@ proc check_effective_target_sync_int_long { } { || [istarget i?86-*-*] || [istarget x86_64-*-*] || [istarget alpha*-*-*] - || [istarget arm*-*-linux-gnueabi] + || [istarget arm*-*-linux-*] || [istarget bfin*-*linux*] || [istarget hppa*-*linux*] || [istarget s390*-*-*] @@ -3999,7 +3999,7 @@ proc check_effective_target_sync_char_short { } { || [istarget i?86-*-*] || [istarget x86_64-*-*] || [istarget alpha*-*-*] - || [istarget arm*-*-linux-gnueabi] + || [istarget arm*-*-linux-*] || [istarget hppa*-*linux*] || [istarget s390*-*-*] || [istarget powerpc*-*-*] diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 2958266..e28e53f 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,7 @@ +2012-10-15 Matthias Klose + + * config.host: Match arm*-*-linux-* for ARM Linux/GNU. + 2012-10-15 Pavel Chupin * configure: Regenerate. diff --git a/libgcc/config.host b/libgcc/config.host index 763f6c3..c03e2cf 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -316,7 +316,7 @@ arm*-*-netbsdelf*) arm*-*-linux*) # ARM GNU/Linux with ELF tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix" case ${host} in - arm*-*-linux-*eabi) + arm*-*-linux-*) tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc" tm_file="$tm_file arm/bpabi-lib.h" unwind_header=config/arm/unwind-arm.h diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 69b13d7..1a586d1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2012-10-15 Matthias Klose + + * configure.ac: Match arm*-*-linux-* for ARM Linux/GNU. + * configure: Regenerate. + 2012-09-14 Dehao Chen * testsuite/libjava.lang/sourcelocation.java: New cases. diff --git a/libjava/configure b/libjava/configure index 7d6db50..53ab754 100755 --- a/libjava/configure +++ b/libjava/configure @@ -20551,7 +20551,7 @@ case "${host}" in # on Darwin -single_module speeds up loading of the dynamic libraries. extra_ldflags_libjava=-Wl,-single_module ;; -arm*linux*eabi) +arm*-*-linux-*) # Some of the ARM unwinder code is actually in libstdc++. We # could in principle replicate it in libgcj, but it's better to # have a dependency on libstdc++. diff --git a/libjava/configure.ac b/libjava/configure.ac index 62c5000..5fa75c6 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -931,7 +931,7 @@ case "${host}" in # on Darwin -single_module speeds up loading of the dynamic libraries. extra_ldflags_libjava=-Wl,-single_module ;; -arm*linux*eabi) +arm*-*-linux-*) # Some of the ARM unwinder code is actually in libstdc++. We # could in principle replicate it in libgcj, but it's better to # have a dependency on libstdc++. diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5b42e2c..01537a7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-10-15 Matthias Klose + + * configure.host: Match arm*-*-linux-* for ARM Linux/GNU. + * testsuite/20_util/make_signed/requirements/typedefs-2.cc: Likewise. + * testsuite/20_util/make_unsigned/requirements/typedefs-2.cc: Likewise. + 2012-10-15 Pavel Chupin * Makefile.in: Regenerate. diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host index ed9e721..cdd0fb2 100644 --- a/libstdc++-v3/configure.host +++ b/libstdc++-v3/configure.host @@ -348,7 +348,7 @@ case "${host}" in fi esac case "${host}" in - arm*-*-linux-*eabi) + arm*-*-linux-*) port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver" ;; esac diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc index adf3af4..39117de 100644 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc @@ -1,5 +1,5 @@ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" } -// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } +// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-* } } // 2007-05-03 Benjamin Kosnik // diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc index a1465d3..11e1353 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc @@ -1,5 +1,5 @@ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" } -// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } } +// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-* } } // 2007-05-03 Benjamin Kosnik // -- 2.7.4