work/gcc-4.6.1-gnueabihf.patch

   1 http://gcc.gnu.org/ml/gcc/2011-02/msg00390.html
   2
   3 Triplet for ARM Linux HardFP ABI, again
   4
   5     * From: Guillem Jover <guillem at debian dot org>
   6     * To: gcc at gcc dot gnu dot org
   7     * Date: Mon, 21 Feb 2011 11:12:09 +0100
   8     * Subject: Triplet for ARM Linux HardFP ABI, again
   9
  10
  11 diff --git a/configure b/configure
  12 index 501c6ff..43ff04f 100755
  13 --- a/configure
  14 +++ b/configure
  15 diff --git a/configure b/configure
  16 index 501c6ff..43ff04f 100755
  17 --- a/configure
  18 +++ b/configure
  19 @@ -3236,7 +3236,7 @@ case "${target}" in
  20      noconfigdirs="$noconfigdirs target-libffi target-qthreads"
  21      libgloss_dir=arm
  22      ;;
  23 -  arm*-*-linux-gnueabi)
  24 +  arm*-*-linux-*eabi*)
  25      noconfigdirs="$noconfigdirs target-qthreads"
  26      case ${with_newlib} in
  27        no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
  28 diff --git a/configure.ac b/configure.ac
  29 index 9121d65..e1a42e0 100644
  30 --- a/configure.ac
  31 +++ b/configure.ac
  32 @@ -682,7 +682,7 @@ case "${target}" in
  33      noconfigdirs="$noconfigdirs target-libffi target-qthreads"
  34      libgloss_dir=arm
  35      ;;
  36 -  arm*-*-linux-gnueabi)
  37 +  arm*-*-linux-*eabi*)
  38      noconfigdirs="$noconfigdirs target-qthreads"
  39      case ${with_newlib} in
  40        no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
  41 diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
  42 index b64ba55..cbe6b70 100644
  43 --- a/gcc/ada/gcc-interface/Makefile.in
  44 +++ b/gcc/ada/gcc-interface/Makefile.in
  45 @@ -1841,7 +1841,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),)
  46    LIBRARY_VERSION := $(LIB_VERSION)
  47  endif
  48
  49 -ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
  50 +ifeq ($(strip $(filter-out arm% linux%,$(arch) $(osys))),)
  51    LIBGNAT_TARGET_PAIRS = \
  52    a-intnam.ads<a-intnam-linux.ads \
  53    s-inmaop.adb<s-inmaop-posix.adb \
  54 diff --git a/gcc/config.gcc b/gcc/config.gcc
  55 index 54b822e..1a47343 100644
  56 --- a/gcc/config.gcc
  57 +++ b/gcc/config.gcc
  58 @@ -820,13 +820,13 @@ arm*-*-linux*)                    # ARM GNU/Linux with ELF
  59         esac
  60         tmake_file="${tmake_file} t-linux arm/t-arm"
  61         case ${target} in
  62 -       arm*-*-linux-*eabi)
  63 +       arm*-*-linux-*eabi*)
  64             tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
  65             tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
  66             tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
  67             # Define multilib configuration for arm-linux-androideabi.
  68             case ${target} in
  69 -           *-androideabi)
  70 +           *-androideabi*)
  71                 tmake_file="$tmake_file arm/t-linux-androideabi"
  72                 ;;
  73             esac
  74 @@ -848,7 +848,7 @@ arm*-*-uclinux*)            # ARM ucLinux
  75         tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
  76         tmake_file="arm/t-arm arm/t-arm-elf"
  77         case ${target} in
  78 -       arm*-*-uclinux*eabi)
  79 +       arm*-*-uclinux*eabi*)
  80             tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
  81             tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
  82             tmake_file="$tmake_file arm/t-bpabi"
  83 diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
  84 index 02cb7ac..885c0e0 100644
  85 --- a/gcc/testsuite/lib/target-supports.exp
  86 +++ b/gcc/testsuite/lib/target-supports.exp
  87 @@ -3219,7 +3219,7 @@ proc check_effective_target_sync_int_long { } {
  88              || [istarget i?86-*-*]
  89              || [istarget x86_64-*-*]
  90              || [istarget alpha*-*-*]
  91 -            || [istarget arm*-*-linux-gnueabi]
  92 +            || [istarget arm*-*-linux-*eabi*]
  93              || [istarget bfin*-*linux*]
  94              || [istarget hppa*-*linux*]
  95              || [istarget s390*-*-*]
  96 @@ -3250,7 +3250,7 @@ proc check_effective_target_sync_char_short { } {
  97              || [istarget i?86-*-*]
  98              || [istarget x86_64-*-*]
  99              || [istarget alpha*-*-*]
 100 -            || [istarget arm*-*-linux-gnueabi]
 101 +            || [istarget arm*-*-linux-*eabi*]
 102              || [istarget hppa*-*linux*]
 103              || [istarget s390*-*-*]
 104              || [istarget powerpc*-*-*]
 105 diff --git a/libjava/configure b/libjava/configure
 106 index f79e53b..47e3f23 100755
 107 --- a/libjava/configure
 108 +++ b/libjava/configure
 109 @@ -20527,7 +20527,7 @@ case "${host}" in
 110      # on Darwin -single_module speeds up loading of the dynamic libraries.
 111      extra_ldflags_libjava=-Wl,-single_module
 112      ;;
 113 -arm*linux*eabi)
 114 +arm*-*-linux-*eabi*)
 115      # Some of the ARM unwinder code is actually in libstdc++.  We
 116      # could in principle replicate it in libgcj, but it's better to
 117      # have a dependency on libstdc++.
 118 diff --git a/libjava/configure.ac b/libjava/configure.ac
 119 index 8187eec..b59abb3 100644
 120 --- a/libjava/configure.ac
 121 +++ b/libjava/configure.ac
 122 @@ -919,7 +919,7 @@ case "${host}" in
 123      # on Darwin -single_module speeds up loading of the dynamic libraries.
 124      extra_ldflags_libjava=-Wl,-single_module
 125      ;;
 126 -arm*linux*eabi)
 127 +arm*-*-linux-*eabi*)
 128      # Some of the ARM unwinder code is actually in libstdc++.  We
 129      # could in principle replicate it in libgcj, but it's better to
 130      # have a dependency on libstdc++.
 131 diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
 132 index e29404c..a2e58a9 100644
 133 --- a/libstdc++-v3/configure.host
 134 +++ b/libstdc++-v3/configure.host
 135 @@ -322,7 +322,7 @@ case "${host}" in
 136          fi
 137      esac
 138      case "${host}" in
 139 -      arm*-*-linux-*eabi)
 140 +      arm*-*-linux-*eabi*)
 141         port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
 142         ;;
 143      esac
 144 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
 145 index cb40b7b..6147d66 100644
 146 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
 147 +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
 148 @@ -1,5 +1,5 @@
 149  // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
 150 -// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
 151 +// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
 152
 153  // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
 154  //
 155 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
 156 index d71c012..1086a18 100644
 157 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
 158 +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
 159 @@ -1,5 +1,5 @@
 160  // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
 161 -// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
 162 +// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
 163
 164  // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
 165  //
 166