gcc: remove unused patches and move patches in proper dir

gcc: update upstream-status for patches

python: update upstream-status for patches

libtool: update upstream-status of patches

m4: update upstream status for patches

eglibc: remove unused patches

eglibc: update upstream status of patches

glibc: update upstream-status of patches & remove unused patches

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>

19 files changed, 55 insertions, 446 deletions

diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/15342.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/15342.patch
deleted file mode 100644
index d0f3e72d4..000000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/15342.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gcc/gcc/regrename.c~	2004-01-14 17:55:20.000000000 +0000
-+++ gcc/gcc/regrename.c	2005-02-28 07:24:25.893015200 +0000
-@@ -671,7 +671,8 @@
- 
-     case SET:
-       scan_rtx (insn, &SET_SRC (x), class, action, OP_IN, 0);
--      scan_rtx (insn, &SET_DEST (x), class, action, OP_OUT, 0);
-+      scan_rtx (insn, &SET_DEST (x), class, action,
-+		GET_CODE (PATTERN (insn)) == COND_EXEC ? OP_INOUT : OP_OUT, 0);
-       return;
- 
-     case STRICT_LOW_PART:
-@@ -696,7 +697,8 @@
-       abort ();
- 
-     case CLOBBER:
--      scan_rtx (insn, &SET_DEST (x), class, action, OP_OUT, 1);
-+      scan_rtx (insn, &SET_DEST (x), class, action,
-+		GET_CODE (PATTERN (insn)) == COND_EXEC ? OP_INOUT : OP_OUT, 0);
-       return;
- 
-     case EXPR_LIST:
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
index c4897c033..57d4a0077 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 # Dimitry Andric <dimitry@andric.com>, 2004-05-01
 #
 # * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
index 5e1edd920..9a0a69176 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 Index: gcc-4.0.2/gcc/config/arm/t-linux
 ===================================================================
 --- gcc-4.0.2.orig/gcc/config/arm/t-linux	2004-05-15 12:41:35.000000000 +0000
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/cache-amnesia.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/cache-amnesia.patch
deleted file mode 100644
index ef7cd111c..000000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/cache-amnesia.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gcc/configure b/gcc/configure
-index 44620ab..6e1830c 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -12272,7 +12272,7 @@ else
- 	esac
- 	saved_CFLAGS="${CFLAGS}"
- 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
--	${realsrcdir}/configure \
-+	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
- 		--enable-languages=${enable_languages-all} \
- 		--target=$target_alias --host=$build_alias --build=$build_alias
- 	CFLAGS="${saved_CFLAGS}"
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/fortran-static-linking.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/fortran-static-linking.patch
deleted file mode 100644
index 3dd6321dc..000000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/fortran-static-linking.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-f951 (fortran) links to MPFR and GMP of our staging area but when executing
-the command the libs can not be found. Use rpath like all the other apps in
-our staging bin/ directory.
-
-Patch the configure to avoid the regeneration...
-
-Index: gcc-4.2.2/configure
-===================================================================
---- gcc-4.2.2.orig/configure	2008-01-15 23:23:41.000000000 +0100
-+++ gcc-4.2.2/configure	2008-01-15 23:25:20.000000000 +0100
-@@ -2278,14 +2278,14 @@
- 
- 
- if test "x$with_mpfr" != x; then
--  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-static -L$with_mpfr/lib $gmplibs"
-   gmpinc="-I$with_mpfr/include"
- fi
- if test "x$with_mpfr_include" != x; then
-   gmpinc="-I$with_mpfr_include"
- fi
- if test "x$with_mpfr_lib" != x; then
--  gmplibs="-L$with_mpfr_lib $gmplibs"
-+  gmplibs="-static -L$with_mpfr_lib $gmplibs"
- fi
- 
- # Specify a location for gmp
-Index: gcc-4.2.2/configure.in
-===================================================================
---- gcc-4.2.2.orig/configure.in	2008-01-15 23:23:41.000000000 +0100
-+++ gcc-4.2.2/configure.in	2008-01-15 23:24:36.000000000 +0100
-@@ -1066,14 +1066,14 @@
- AC_ARG_WITH(mpfr_lib, [  --with-mpfr-lib=PATH    Specify the directory for the installed MPFR library])
- 
- if test "x$with_mpfr" != x; then
--  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-static -L$with_mpfr/lib $gmplibs"
-   gmpinc="-I$with_mpfr/include"
- fi
- if test "x$with_mpfr_include" != x; then
-   gmpinc="-I$with_mpfr_include"
- fi
- if test "x$with_mpfr_lib" != x; then
--  gmplibs="-L$with_mpfr_lib $gmplibs"
-+  gmplibs="-static -L$with_mpfr_lib $gmplibs"
- fi
- 
- # Specify a location for gmp
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.0-arm-lib1asm.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.0-arm-lib1asm.patch
deleted file mode 100644
index cf17da6a0..000000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.0-arm-lib1asm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# Fixes errors like the following when building glibc (or any other executable
-# or shared library) when using gcc 3.4.0 for ARM with softfloat:
-#
-# .../libc_pic.os(.text+0x15834): In function `__modf': undefined reference to `__subdf3'
-# .../libc_pic.os(.text+0x158b8): In function `__modf': undefined reference to `__subdf3'
-# .../libc_pic.os(.text+0x1590c): In function `scalbn': undefined reference to `__muldf3'
-# .../libc_pic.os(.text+0x15e94): In function `__ldexpf': undefined reference to `__eqsf2'
-# .../libc_pic.os(.text+0xcee4c): In function `monstartup': undefined reference to `__fixsfsi'
-
-diff -urNd gcc-3.4.0-orig/gcc/config/arm/t-linux gcc-3.4.0/gcc/config/arm/t-linux
---- gcc-3.4.0-orig/gcc/config/arm/t-linux	2003-09-20 23:09:07.000000000 +0200
-+++ gcc-3.4.0/gcc/config/arm/t-linux	2004-05-01 20:31:59.102846400 +0200
-@@ -4,7 +4,10 @@
- LIBGCC2_DEBUG_CFLAGS = -g0
- 
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-+	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+	_fixsfsi _fixunssfsi _floatdidf _floatdisf
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
index e6cc42bb6..7453acd34 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 --- gcc-2005q3/gcc/config/arm/linux-eabi.h~	2007-07-10 09:19:47.000000000 +0930
 +++ gcc-2005q3/gcc/config/arm/linux-eabi.h	2007-07-10 10:42:37.000000000 +0930
 @@ -48,7 +48,8 @@
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
index 74c1f2683..9c5317341 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
 --- gcc-3.4.4/gcc/Makefile.in.orig	2005-07-25 21:00:37 +0200
 +++ gcc-3.4.4/gcc/Makefile.in	2005-07-25 21:01:19 +0200
 @@ -304,7 +304,7 @@
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
index c84550330..d9aed34bf 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Inappropriate [embedded specific]
 --- tmp/configure.in.orig	2006-09-05 17:50:48.000000000 +0100
 +++ tmp/configure.in	2006-09-05 17:50:48.000000000 +0100
 @@ -157,7 +157,6 @@
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
index b984605af..bd3197dc6 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Inappropriate [embedded specific]
 ---
  configure    |    2 +-
  configure.in |    2 +-
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc34-arm-tune.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc34-arm-tune.patch
deleted file mode 100644
index cdb20bef9..000000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc34-arm-tune.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- gcc-3.4.0/gcc/config/arm/linux-elf.h.arm-tune	2004-01-31 01:18:11.000000000 -0500
-+++ gcc-3.4.0/gcc/config/arm/linux-elf.h	2004-04-24 18:19:10.000000000 -0400
-@@ -126,3 +126,6 @@
- 
- #define LINK_GCC_C_SEQUENCE_SPEC \
-   "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
-+
-+/* Tune for XScale.  */
-+#define TARGET_TUNE_DEFAULT TARGET_CPU_xscale
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
index 3d33bcb97..88b0611a2 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
 --- gcc-3.4.4/configure.in.orig	2005-08-09 19:57:51.504323183 -0700
 +++ gcc-3.4.4/configure.in	2005-08-09 20:00:12.073168623 -0700
 @@ -1907,7 +1907,7 @@
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
index fa21b2655..5738a470f 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 ARM is the only architecture that has a helper function that returns
 an unbiased result. This fix is trivial enough that we can show it
 doesn't effect any of the other arches. Can we consider this a
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch
new file mode 100644
index 000000000..c78e8313b
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch
@@ -0,0 +1,42 @@
+Upstream-Status: Pending
+
+The patch below fixes a crash building libgfortran on arm-linux-gnueabi.
+
+This target doesn't really have a 128-bit integer type, however it does use 
+TImode to represent the return value of certain special ABI defined library 
+functions. This results in type_for_size(TImode) being called.
+
+Because TImode deosn't correspond to any gfortran integer kind 
+gfc_type_for_size returns NULL and we segfault shortly after.
+
+The patch below fixes this by making gfc_type_for_size handle TImode in the 
+same way as the C frontend.
+
+Tested on x86_64-linux and arm-linux-gnueabi.
+Applied to trunk.
+
+Paul
+
+2007-05-15  Paul Brook  <paul@codesourcery.com>
+
+	gcc/fortran/
+	* trans-types.c (gfc_type_for_size): Handle signed TImode.
+
+Index: gcc-4.2.1/gcc/fortran/trans-types.c
+===================================================================
+--- gcc-4.2.1/gcc/fortran/trans-types.c	(revision 170435)
++++ gcc-4.2.1/gcc/fortran/trans-types.c	(working copy)
+@@ -1800,6 +1800,13 @@ gfc_type_for_size (unsigned bits, int un
+ 	  if (type && bits == TYPE_PRECISION (type))
+ 	    return type;
+ 	}
++
++      /* Handle TImode as a special case because it is used by some backends
++         (eg. ARM) even though it is not available for normal use.  */
++#if HOST_BITS_PER_WIDE_INT >= 64
++      if (bits == TYPE_PRECISION (intTI_type_node))
++	return intTI_type_node;
++#endif
+     }
+   else
+     {
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/no-libfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/no-libfloat.patch
deleted file mode 100644
index e5d12cfb4..000000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/no-libfloat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/gcc/config/arm/linux-elf.h.old	2005-04-20 00:46:28.923375320 +0100
-+++ gcc/gcc/config/arm/linux-elf.h	2005-04-20 00:46:34.181575952 +0100
-@@ -56,7 +56,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
-    the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/pic-without-sl.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/pic-without-sl.patch
deleted file mode 100644
index 9a49794da..000000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/pic-without-sl.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-Index: gcc/config/arm/arm-protos.h
-===================================================================
-RCS file: /cvsroot/gcc/gcc/gcc/config/arm/arm-protos.h,v
-retrieving revision 1.60.4.20
-diff -u -r1.60.4.20 arm-protos.h
---- gcc/config/arm/arm-protos.h	29 Mar 2005 03:00:11 -0000	1.60.4.20
-+++ gcc/config/arm/arm-protos.h	23 Apr 2005 04:41:06 -0000
-@@ -64,6 +64,7 @@
- extern enum reg_class vfp_secondary_reload_class (enum machine_mode, rtx);
- extern int tls_symbolic_operand (rtx, enum machine_mode);
- extern bool arm_tls_operand_p (rtx x);
-+extern bool arm_pc_pic_operand_p (rtx x);
- 
- /* Predicates.  */
- extern int s_register_operand (rtx, enum machine_mode);
-Index: gcc/config/arm/arm.c
-===================================================================
-RCS file: /cvsroot/gcc/gcc/gcc/config/arm/arm.c,v
-retrieving revision 1.303.2.79
-diff -u -r1.303.2.79 arm.c
---- gcc/config/arm/arm.c	12 Apr 2005 06:17:07 -0000	1.303.2.79
-+++ gcc/config/arm/arm.c	23 Apr 2005 04:41:09 -0000
-@@ -1003,7 +1003,7 @@
-   
-   /* If stack checking is disabled, we can use r10 as the PIC register,
-      which keeps r9 available.  */
--  if (flag_pic)
-+  if (0 && flag_pic)
-     arm_pic_register = TARGET_APCS_STACK ? 9 : 10;
-   
-   if (TARGET_APCS_FLOAT)
-@@ -3120,6 +3120,10 @@
- rtx
- legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg)
- {
-+  if (GET_CODE (orig) == UNSPEC
-+      && XINT (orig, 1) == UNSPEC_GOTSLOTPC)
-+    abort ();
-+
-   if (GET_CODE (orig) == SYMBOL_REF
-       || GET_CODE (orig) == LABEL_REF)
-     {
-@@ -3149,27 +3153,80 @@
-       else
- 	address = reg;
- 
--      if (TARGET_ARM)
--	emit_insn (gen_pic_load_addr_arm (address, orig));
--      else
--	emit_insn (gen_pic_load_addr_thumb (address, orig));
-+      if (arm_pic_register != INVALID_REGNUM)
-+	{
-+	  /* Using GP-based PIC addressing.  */
-+	  if (TARGET_ARM)
-+	    emit_insn (gen_pic_load_addr_arm (address, orig));
-+	  else
-+	    emit_insn (gen_pic_load_addr_thumb (address, orig));
-+
-+	  if ((GET_CODE (orig) == LABEL_REF
-+	       || (GET_CODE (orig) == SYMBOL_REF && 
-+		   SYMBOL_REF_LOCAL_P (orig)))
-+	      && NEED_GOT_RELOC)
-+	    pic_ref = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, address);
-+	  else
-+	    {
-+	      pic_ref = gen_rtx_MEM (Pmode,
-+				     gen_rtx_PLUS (Pmode, pic_offset_table_rtx,
-+						   address));
-+	      RTX_UNCHANGING_P (pic_ref) = 1;
-+	    }
- 
--      if ((GET_CODE (orig) == LABEL_REF
--	   || (GET_CODE (orig) == SYMBOL_REF && 
--	       SYMBOL_REF_LOCAL_P (orig)))
--	  && NEED_GOT_RELOC)
--	pic_ref = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, address);
-+	  current_function_uses_pic_offset_table = 1;
-+	}
-       else
- 	{
--	  pic_ref = gen_rtx_MEM (Pmode,
--				 gen_rtx_PLUS (Pmode, pic_offset_table_rtx,
--					       address));
--	  RTX_UNCHANGING_P (pic_ref) = 1;
-+	  /* Using PC-based PIC addressing.  */
-+	  rtx label, tmp;
-+	  int offset;
-+
-+	  label = gen_label_rtx ();
-+	  offset = TARGET_ARM ? 8 : 4;
-+
-+	  if (GET_CODE (orig) == LABEL_REF 
-+	      || (GET_CODE (orig) == SYMBOL_REF && SYMBOL_REF_LOCAL_P (orig)))
-+	    {
-+	      /* This symbol is defined locally.  We don't need a GOT entry.  */
-+	      tmp = gen_rtx_MINUS (Pmode, gen_rtx_UNSPEC (Pmode, gen_rtvec (1, orig), UNSPEC_PIC_SYM), gen_rtx_PLUS (Pmode, 
-+							      gen_rtx_LABEL_REF (Pmode, label),
-+							      GEN_INT (offset)));
-+
-+	      load_tls_operand (tmp, address);
-+
-+	      if (TARGET_ARM)
-+		emit_insn (gen_pic_add_dot_plus_eight (address, label));
-+	      else
-+		emit_insn (gen_pic_add_dot_plus_four (address, label));
-+	    }
-+	  else
-+	    {
-+	      rtx x = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, orig), UNSPEC_GOTSLOTPC);
-+	      rtx dummy_label;
-+
-+	      dummy_label = gen_label_rtx ();
-+	      LABEL_PRESERVE_P (dummy_label) = 1;
-+	      LABEL_NUSES (dummy_label) = 1;
-+	      
-+	      tmp = gen_rtx_MINUS (Pmode, x, gen_rtx_PLUS (Pmode, 
-+							   gen_rtx_LABEL_REF (Pmode, label),
-+							   GEN_INT (offset)));
-+
-+	      load_tls_operand (tmp, address);
-+
-+	      if (TARGET_ARM)
-+		emit_insn (gen_tls_load_dot_plus_eight (address, address, label, dummy_label));
-+	      else
-+		emit_insn (gen_tls_load_dot_plus_four (address, address, label, dummy_label));
-+	    }
-+
-+	  pic_ref = address;
- 	}
- 
-       insn = emit_move_insn (reg, pic_ref);
- #endif
--      current_function_uses_pic_offset_table = 1;
-+
-       /* Put a REG_EQUAL note on this insn, so that it can be optimized
- 	 by loop.  */
-       REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_EQUAL, orig,
-@@ -3179,11 +3236,17 @@
-   else if (GET_CODE (orig) == CONST)
-     {
-       rtx base, offset;
-+      bool minus = FALSE;
- 
-       if (GET_CODE (XEXP (orig, 0)) == PLUS
- 	  && XEXP (XEXP (orig, 0), 0) == pic_offset_table_rtx)
- 	return orig;
- 
-+      if (GET_CODE (XEXP (orig, 0)) == MINUS
-+	  && GET_CODE (XEXP (XEXP (orig, 0), 0)) == UNSPEC
-+	  && XINT (XEXP (XEXP (orig, 0), 0), 1) == UNSPEC_GOTSLOTPC)
-+	return orig;
-+
-       if (GET_CODE (XEXP (orig, 0)) == UNSPEC)
- 	return orig;
- 
-@@ -3201,6 +3264,13 @@
- 	  offset = legitimize_pic_address (XEXP (XEXP (orig, 0), 1), Pmode,
- 					   base == reg ? 0 : reg);
- 	}
-+      else if (GET_CODE (XEXP (orig, 0)) == MINUS)
-+	{
-+	  minus = TRUE;
-+	  base = legitimize_pic_address (XEXP (XEXP (orig, 0), 0), Pmode, reg);
-+	  offset = legitimize_pic_address (XEXP (XEXP (orig, 0), 1), Pmode,
-+					   base == reg ? 0 : reg);
-+	}
-       else
- 	abort ();
- 
-@@ -3228,7 +3298,7 @@
- 	  return reg;
- 	}
- 
--      return gen_rtx_PLUS (Pmode, base, offset);
-+      return minus ? gen_rtx_MINUS (Pmode, base, offset) : gen_rtx_PLUS (Pmode, base, offset);
-     }
- 
-   return orig;
-@@ -3267,7 +3337,7 @@
-   rtx l1, pic_tmp, pic_tmp2, pic_rtx;
-   rtx global_offset_table;
- 
--  if (current_function_uses_pic_offset_table == 0 || TARGET_SINGLE_PIC_BASE)
-+  if (current_function_uses_pic_offset_table == 0 || TARGET_SINGLE_PIC_BASE || arm_pic_register == INVALID_REGNUM)
-     return;
- 
-   if (!flag_pic)
-@@ -3341,8 +3411,11 @@
- static int
- pcrel_constant_p (rtx x)
- {
-+  if (GET_CODE (x) == CONST)
-+    return pcrel_constant_p (XEXP (x, 0));
-+
-   if (GET_CODE (x) == MINUS)
--    return symbol_mentioned_p (XEXP (x, 0)) && label_mentioned_p (XEXP (x, 1));
-+    return (((GET_CODE (XEXP (x, 0)) == UNSPEC && XINT (XEXP (x, 0), 1) == UNSPEC_PIC_SYM)) || symbol_mentioned_p (XEXP (x, 0))) && label_mentioned_p (XEXP (x, 1));
- 
-   if (GET_CODE (x) == UNSPEC
-       && XINT (x, 1) == UNSPEC_TLS
-@@ -3946,12 +4019,32 @@
-   return SYMBOL_REF_TLS_MODEL (op);
- }
- 
-+bool
-+arm_pc_pic_operand_p (rtx op)
-+{
-+  if (GET_CODE (op) == CONST
-+      && GET_CODE (XEXP (op, 0)) == MINUS
-+      && GET_CODE (XEXP (XEXP (op, 0), 0)) == UNSPEC
-+      && XINT (XEXP (XEXP (op, 0), 0), 1) == UNSPEC_GOTSLOTPC)
-+    return 1;
-+
-+  if (GET_CODE (op) == CONST
-+      && GET_CODE (XEXP (op, 0)) == MINUS
-+      && GET_CODE (XEXP (XEXP (op, 0), 0)) == UNSPEC
-+      && XINT (XEXP (XEXP (op, 0), 0), 1) == UNSPEC_PIC_SYM)
-+    return 1;
-+
-+  return 0;
-+}
-+
- /* Valid input to a move instruction.  */
- int
- move_input_operand (rtx op, enum machine_mode mode)
- {
-   if (tls_symbolic_operand (op, mode))
-     return 0;
-+  if (pcrel_constant_p (op))
-+    return 1;
-   return general_operand (op, mode);
- }
- 
-@@ -15634,11 +15727,34 @@
-   return TRUE;
- }
- 
-+static bool
-+arm_emit_got_decoration (FILE *fp, rtx x)
-+{
-+  rtx val;
-+
-+  val = XVECEXP (x, 0, 0);
-+
-+  fputs ("_gotslotpc_(", fp);
-+
-+  output_addr_const (fp, val);
-+
-+  fputc (')', fp);
-+
-+  return TRUE;
-+}
-+
- bool
- arm_output_addr_const_extra (FILE *fp, rtx x)
- {
-   if (GET_CODE (x) == UNSPEC && XINT (x, 1) == UNSPEC_TLS)
-     return arm_emit_tls_decoration (fp, x);
-+  else if (GET_CODE (x) == UNSPEC && XINT (x, 1) == UNSPEC_GOTSLOTPC)
-+    return arm_emit_got_decoration (fp, x);
-+  else if (GET_CODE (x) == UNSPEC && XINT (x, 1) == UNSPEC_PIC_SYM)
-+    {
-+      output_addr_const (fp, XVECEXP (x, 0, 0));
-+      return TRUE;
-+    }
-   else if (GET_CODE (x) == CONST_VECTOR)
-     return arm_emit_vector_const (fp, x);
-   
-Index: gcc/config/arm/arm.md
-===================================================================
-RCS file: /cvsroot/gcc/gcc/gcc/config/arm/arm.md,v
-retrieving revision 1.145.2.31
-diff -u -r1.145.2.31 arm.md
---- gcc/config/arm/arm.md	28 Mar 2005 19:04:37 -0000	1.145.2.31
-+++ gcc/config/arm/arm.md	23 Apr 2005 04:41:11 -0000
-@@ -88,6 +88,7 @@
-    (UNSPEC_WMADDS   18) ; Used by the intrinsic form of the iWMMXt WMADDS instruction.
-    (UNSPEC_WMADDU   19) ; Used by the intrinsic form of the iWMMXt WMADDU instruction.
-    (UNSPEC_TLS      20) ; A symbol that has been treated properly for TLS usage.
-+   (UNSPEC_GOTSLOTPC 21)
-   ]
- )
- 
-@@ -4179,7 +4180,8 @@
-         && (CONSTANT_P (operands[1])
- 	   || symbol_mentioned_p (operands[1])
- 	   || label_mentioned_p (operands[1]))
--	&& ! tls_mentioned_p (operands[1]))
-+	&& ! tls_mentioned_p (operands[1])
-+	&& ! arm_pc_pic_operand_p (operands[1]))
-       operands[1] = legitimize_pic_address (operands[1], SImode,
- 					    (no_new_pseudos ? operands[0] : 0));
-   } 
-@@ -4412,7 +4414,8 @@
- 			(mem:SI (unspec:SI [(plus:SI (match_dup 0)
- 			     			     (const (plus:SI (pc) (const_int 8))))]
- 		   		 UNSPEC_PIC_BASE)))	
--   	      (use (label_ref (match_operand 1 "" "")))])]
-+   	      (use (label_ref (match_operand 1 "" "")))
-+	      (use (label_ref (match_operand 1 "" "")))])]
-   ""
- )
- 
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/pr34130.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/pr34130.patch
deleted file mode 100644
index 415335f4b..000000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/pr34130.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gcc-4.1.2/gcc/fold-const.c
-===================================================================
---- gcc-4.1.2.orig/gcc/fold-const.c	2007-11-21 18:53:42.000000000 +0100
-+++ gcc-4.1.2/gcc/fold-const.c	2007-11-21 18:56:26.000000000 +0100
-@@ -5339,7 +5339,10 @@
-             }
-           break;
-         }
--      /* FALLTHROUGH */
-+   /* If the constant is negative, we cannot simplify this.  */
-+   if (tree_int_cst_sgn (c) == -1)
-+     break;
-+   /* FALLTHROUGH */
-     case NEGATE_EXPR:
-       if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
- 	return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
index 8b05cb73a..169558295 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: gcc-4.0.2/gcc/c-incpath.c
 ===================================================================
 --- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
index 921cab6e1..b06de5458 100644
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Inappropriate [embedded specific]
 upstream: n/a
 comment: Use the preprocessor we have just compiled instead the one of
 the system. There might be incompabilities between us and them.