Upgrade to 4.10.2

2011-12-09 Joel Sherrill <joel.sherrilL@OARcorp.com>
* math/init.c, mathf/init.c: Use DEVFS since we do have devices.
2011-12-13 14:34:19 +00:00 · 2011-12-09 19:19:28 +00:00 · 2011-12-09 07:12:27 +00:00 · 2011-12-07 20:08:49 +00:00 · 2011-12-07 06:51:43 +00:00 · 2011-11-30 07:00:47 +00:00
139 changed files with 2797 additions and 4182 deletions
--- a/2
+++ b/2
@@ -4,4 +4,4 @@
 #  $Id$
 #

-RTEMS Version 4.10.1
+RTEMS Version 4.10.2
--- a/aclocal/version.m4
+++ b/aclocal/version.m4
@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.10.1]))
+m4_define([_RTEMS_VERSION],[4.10.2]))

 m4_define([RTEMS_API],[4.10])
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-09	Jennifer Averett <jennifer.averett@oarcorp.com>
+
+	PR 1934/bsps
+	* libchip/serial/ns16550.c: Change to unsigned variable.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/aclocal/version.m4
+++ b/c/src/aclocal/version.m4
@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.10.1]))
+m4_define([_RTEMS_VERSION],[4.10.2]))

 m4_define([RTEMS_API],[4.10])
--- a/c/src/lib/libbsp/arm/nds/ChangeLog
+++ b/c/src/lib/libbsp/arm/nds/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-15	Julien Delange <julien.delange@gmail.com>
+
+	* irq/irq.c: Removed printk() before the interrupt initialization
+	because it somehow destroys the interrupt context.
+	* make/custom/nds.cfg: Enable Thumb interwork.
+	* startup/bspstart.c: Set default exception handler.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/arm/nds/irq/irq.c
+++ b/c/src/lib/libbsp/arm/nds/irq/irq.c
@@ -34,8 +34,6 @@ isValidInterrupt (int irq)
 void
 BSP_rtems_irq_mngt_init (void)
 {
-  printk ("[+] irq manager started\n");
-
  irqInit ();

  REG_IME = IME_ENABLE;
--- a/c/src/lib/libbsp/arm/nds/make/custom/nds.cfg
+++ b/c/src/lib/libbsp/arm/nds/make/custom/nds.cfg
@@ -13,7 +13,7 @@ RTEMS_CPU_MODEL=arm9tdmi
 #  and (hopefully) optimize for it.
 #
 CPU_CFLAGS = -mstructure-size-boundary=8 -mcpu=$(RTEMS_CPU_MODEL) -mfpu=vfp -mfloat-abi=soft
-# CPU_CFLAGS += -mthumb-interwork ## -D __THUMB_INTERWORK__ -mthumb
+CPU_CFLAGS += -mthumb-interwork ## -D __THUMB_INTERWORK__ -mthumb

 # optimize flag: typically -O2
 #CFLAGS_OPTIMIZE_V = -O0 -ggdb
--- a/c/src/lib/libbsp/arm/nds/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/nds/startup/bspstart.c
@@ -15,6 +15,7 @@
 #include <bsp/bootcard.h>
 #include <nds.h>

+extern void defaultExceptionHandler ();
 extern void BSP_rtems_irq_mngt_init (void);
 /*
 * start the platform.
@@ -44,6 +45,8 @@ void bsp_start (void)

  /* configure clock period */
  Configuration.microseconds_per_tick = 10000;  /* us */
+
+  defaultExceptionHandler ();
 }

 /*
--- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
+++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-22	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1845/bsps
+	* make/custom/rtl22xx_t.cfg: Remove unused line with what is now
+	invalid syntax.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t.cfg
+++ b/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx_t.cfg
@@ -3,16 +3,13 @@
 #
 #  $Id$
 #
-set USE_THUMB_MODE=YES
-
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
 #

 include $(RTEMS_ROOT)/make/custom/rtl22xx.cfg

-CPU_CFLAGS +=  -mthumb \
-	-fno-schedule-insns2
+CPU_CFLAGS +=  -mthumb -fno-schedule-insns2

 #CFLAG: -mthumb-interwork can add veneer between ARM and Thumb code. 
 #CPU_CFLAGS += -mthumb-interwork -D __THUMB_INTERWORK__ -mthumb
--- a/c/src/lib/libbsp/sparc/leon2/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-21	Jorge Lopez <jorge.lopez.trescastro@esa.int>
+
+	PR 1766/bsps
+	* clock/ckinit.c: Add missing read of Timer_Counter_1.
+
 2011-04-25	Jennifer Averett <jennifer.averett@OARcorp.com>

 	PR 1783/bsps
--- a/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
+++ b/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c
@@ -64,6 +64,8 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void)
  uint32_t clicks;
  uint32_t usecs;

+  clicks = LEON_REG.Timer_Counter_1;
+
  if ( LEON_Is_interrupt_pending( LEON_INTERRUPT_TIMER1 ) ) {
    clicks = LEON_REG.Timer_Counter_1;
    usecs = (2*rtems_configuration_get_microseconds_per_tick() - clicks);
--- a/c/src/libchip/serial/ns16550.c
+++ b/c/src/libchip/serial/ns16550.c
@@ -696,7 +696,7 @@ NS16550_STATIC int ns16550_inbyte_nonblocking_polled(
 {
  uint32_t             pNS16550;
  unsigned char        ucLineStatus;
-  char                 cChar;
+  uint8_t              cChar;
  getRegister_f        getReg;

  pNS16550 = Console_Port_Tbl[minor].ulCtrlPort1;
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -62,12 +62,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -80,6 +74,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -168,7 +168,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -193,14 +192,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-
-%if %build_gcj
-# Building gcj requires bison and zlib
-BuildRequires:	bison
-%endif

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	@rpmprefix@@tool_target@-binutils
--- a/contrib/crossrpms/gdb/build.add
+++ b/contrib/crossrpms/gdb/build.add
@@ -17,16 +17,9 @@
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/@tool_target@-gdb \
    --with-sysroot=%{_prefix}/@tool_target@/sys-root \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
--- a/contrib/crossrpms/gdb/gdb.add
+++ b/contrib/crossrpms/gdb/gdb.add
@@ -12,14 +12,27 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim
+
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}

 %if "@tool_target@" == "powerpc-rtems@rtems_api@"
 %if "%{_build}" != "%{_host}"
 # psim doesn't support Cdn-X
-%define build_sim --disable-sim
+%global build_sim --disable-sim
 %else
-%define build_sim --enable-sim --enable-sim-trace
+%global build_sim --enable-sim --enable-sim-trace
 %endif
 %endif
 %if "@tool_target@" == "sparc-rtems@rtems_api@"
@@ -53,7 +66,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %endif
 %endif

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -61,40 +73,17 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 %if %build_infos
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-%endif
-
-%if %build_infos
-
 Requires:	@rpmprefix@gdb-common
-%endif

+%endif
@SOURCES@

 %description
--- a/contrib/crossrpms/gdb/install.add
+++ b/contrib/crossrpms/gdb/install.add
@@ -26,19 +26,23 @@
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib@tool_target@-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/@tool_target@-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/@tool_target@-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/@tool_target@-gdb/python
+%endif
+%endif
  cd ..

--- a/contrib/crossrpms/gdb/target-gdb.add
+++ b/contrib/crossrpms/gdb/target-gdb.add
@@ -15,6 +15,7 @@ GNU gdb targetting @tool_target@.
 %defattr(-,root,root)
 %sysdir %{_prefix}
 %sysdir %{_prefix}/share
+%{?with_python:%{_datadir}/@tool_target@-gdb}

 %sysdir %{_mandir}
 %sysdir %{_mandir}/man1
--- a/contrib/crossrpms/patches/gcc-core-4.4.6-rtems4.10-20110829.diff
+++ b/contrib/crossrpms/patches/gcc-core-4.4.6-rtems4.10-20110829.diff
@@ -1,15 +1,48 @@
-diff -Naur gcc-4.4.5.orig/ChangeLog.rtems gcc-4.4.5/ChangeLog.rtems
--- gcc-4.4.5.orig/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/ChangeLog.rtems	2011-03-01 05:57:30.782523058 +0100
-@@ -0,0 +1,4 @@
+diff -Naur gcc-4.4.6.orig/ChangeLog.rtems gcc-4.4.6/ChangeLog.rtems
+--- gcc-4.4.6.orig/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/ChangeLog.rtems	2011-08-29 07:16:18.126123562 +0200
+@@ -0,0 +1,9 @@
+2011-04-20	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* configure, configure.ac (PPL): Merge gcc-4.6.0's ppl detection 
+	  (Work-around build breakdown on fedora 15).
+
 +		Ralf Corsépius <ralf.corsepius@rtems.org>
 +
 +	* configure, configure.ac (skipdirs): Add target-libiberty.
 +
-diff -Naur gcc-4.4.5.orig/configure gcc-4.4.5/configure
--- gcc-4.4.5.orig/configure	2010-06-07 22:10:41.000000000 +0200
-+++ gcc-4.4.5/configure	2011-03-01 05:57:30.791523182 +0100
-@@ -2267,6 +2267,7 @@
+diff -Naur gcc-4.4.6.orig/configure gcc-4.4.6/configure
+--- gcc-4.4.6.orig/configure	2010-10-02 13:40:32.000000000 +0200
+++ gcc-4.4.6/configure	2011-08-29 07:16:18.130123715 +0200
+@@ -935,7 +935,8 @@
+   --enable-gold           use gold instead of ld
+   --enable-libada         build libada directory
+   --enable-libssp         build libssp directory
+-  --disable-ppl-version-check    disable check for PPL version
+  --disable-ppl-version-check
+                          disable check for PPL version
+   --disable-cloog-version-check  disable check for CLooG version
+   --enable-stage1-languages[=all]   choose additional languages to build during
+                           stage1.  Mostly useful for compiler development.
+@@ -971,11 +972,12 @@
+   --with-gmp-lib=PATH     specify directory for the installed GMP library
+   --with-host-libstdcxx=L Use linker arguments L to link with libstdc++
+                           when linking with PPL
+-  --with-ppl=PATH         Specify prefix directory for the installed PPL package
+-                          Equivalent to --with-ppl-include=PATH/include
+-                          plus --with-ppl-lib=PATH/lib
+-  --with-ppl-include=PATH Specify directory for installed PPL include files
+-  --with-ppl-lib=PATH     Specify the directory for the installed PPL library
+  --with-ppl=PATH         specify prefix directory for the installed PPL
+                          package. Equivalent to
+                          --with-ppl-include=PATH/include plus
+                          --with-ppl-lib=PATH/lib
+  --with-ppl-include=PATH specify directory for installed PPL include files
+  --with-ppl-lib=PATH     specify directory for the installed PPL library
+   --with-cloog=PATH       Specify prefix directory for the installed CLooG-PPL package
+                           Equivalent to --with-cloog-include=PATH/include
+                           plus --with-cloog-lib=PATH/lib
+@@ -2267,6 +2269,7 @@
     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
     ;;
   *-*-rtems*)
@@ -17,7 +50,216 @@ diff -Naur gcc-4.4.5.orig/configure gcc-4.4.5/configure
     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
     ;;
     # The tpf target doesn't support gdb yet.
-@@ -6259,7 +6260,7 @@
+@@ -4829,10 +4832,9 @@
+ esac
+ 
+ # Check for PPL
+-ppl_major_version=0
+-ppl_minor_version=10
+-ppllibs=" -lppl_c -lppl -lgmpxx $with_host_libstdcxx "
+ppllibs=
+ pplinc=
+pwllib=
+ 
+ 
+ # Check whether --with-ppl or --without-ppl was given.
+@@ -4841,55 +4843,143 @@
+ 
+ fi;
+ 
+-# Check whether --with-ppl_include or --without-ppl_include was given.
+# Check whether --with-ppl-include or --without-ppl-include was given.
+ if test "${with_ppl_include+set}" = set; then
+   withval="$with_ppl_include"
+ 
+ fi;
+ 
+-# Check whether --with-ppl_lib or --without-ppl_lib was given.
+# Check whether --with-ppl-lib or --without-ppl-lib was given.
+ if test "${with_ppl_lib+set}" = set; then
+   withval="$with_ppl_lib"
+ 
+ fi;
+ 
+# Check whether --enable-ppl-version-check or --disable-ppl-version-check was given.
+if test "${enable_ppl_version_check+set}" = set; then
+  enableval="$enable_ppl_version_check"
+
+fi;
+
+ case $with_ppl in
+-  no)
+-    ppllibs=
+  yes | no | "")
+     ;;
+   *)
+-    ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
+    ppllibs="-L$with_ppl/lib"
+     pplinc="-I$with_ppl/include $pplinc"
+-    LIBS="$ppllibs $LIBS"
+    if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then
+      with_ppl=yes
+    else
+      { { echo "$as_me:$LINENO: error: cannot find directories \"$with_ppl/lib\" or \"$with_ppl/include\"" >&5
+echo "$as_me: error: cannot find directories \"$with_ppl/lib\" or \"$with_ppl/include\"" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+     ;;
+ esac
+-if test "x$with_ppl_include" != x; then
+
+if test x"$with_ppl_include" != x; then
+   pplinc="-I$with_ppl_include $pplinc"
+  with_ppl=yes
+ fi
+
+ if test "x$with_ppl_lib" != x; then
+-  ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
+-  LIBS="$ppllibs $LIBS"
+  ppllibs="-L$with_ppl_lib"
+  with_ppl=yes
+ fi
+-if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+-  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx "
+-  pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include '
+-  LIBS="$ppllibs $LIBS"
+
+if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+  if test x"$enable_watchdog" = xyes; then
+    pwllib="-lpwl"
+  fi
+  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"
+  pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
+  enable_ppl_version_check=no
+  with_ppl=yes
+ fi
+ 
+-# Check whether --enable-ppl-version-check or --disable-ppl-version-check was given.
+-if test "${enable_ppl_version_check+set}" = set; then
+-  enableval="$enable_ppl_version_check"
+-  ENABLE_PPL_CHECK=$enableval
+if test "x$with_ppl" != xno; then
+  if test "x$pwllib" = x; then
+    saved_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $ppllibs"
+    echo "$as_me:$LINENO: checking for PWL_handle_timeout in -lpwl" >&5
+echo $ECHO_N "checking for PWL_handle_timeout in -lpwl... $ECHO_C" >&6
+if test "${ac_cv_lib_pwl_PWL_handle_timeout+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ENABLE_PPL_CHECK=yes
+-fi;
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpwl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+ 
+-if test "${ENABLE_PPL_CHECK}" = "yes"; then
+-  saved_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS $pplinc $gmpinc"
+-  echo "$as_me:$LINENO: checking for version $ppl_major_version.$ppl_minor_version of PPL" >&5
+-echo $ECHO_N "checking for version $ppl_major_version.$ppl_minor_version of PPL... $ECHO_C" >&6
+-  cat >conftest.$ac_ext <<_ACEOF
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char PWL_handle_timeout ();
+int
+main ()
+{
+PWL_handle_timeout ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_pwl_PWL_handle_timeout=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_pwl_PWL_handle_timeout=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_pwl_PWL_handle_timeout" >&5
+echo "${ECHO_T}$ac_cv_lib_pwl_PWL_handle_timeout" >&6
+if test $ac_cv_lib_pwl_PWL_handle_timeout = yes; then
+  pwllib="-lpwl"
+fi
+
+    LDFLAGS="$saved_LDFLAGS"
+  fi
+
+  ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
+
+  if test "$enable_ppl_version_check" != no; then
+    saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $pplinc $gmpinc"
+    echo "$as_me:$LINENO: checking for version 0.10 (revision 0 or later) of PPL" >&5
+echo $ECHO_N "checking for version 0.10 (revision 0 or later) of PPL... $ECHO_C" >&6
+    cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4900,9 +4990,9 @@
+ main ()
+ {
+ 
+-  #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version
+-  choke me
+-  #endif
+    #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
+    choke me
+    #endif
+ 
+   ;
+   return 0;
+@@ -4937,10 +5027,11 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; ppllibs= ; pplinc=
+echo "${ECHO_T}no" >&6; ppllibs= ; pplinc= ; with_ppl=no
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS="$saved_CFLAGS"
+    CFLAGS="$saved_CFLAGS"
+  fi
+ fi
+ 
+ # Flags needed for PPL
+@@ -6259,7 +6350,7 @@
        # to it.  This is right: we don't want to search that directory
        # for binaries, but we want the header files in there, so add
        # them explicitly.
@@ -26,9 +268,9 @@ diff -Naur gcc-4.4.5.orig/configure gcc-4.4.5/configure
 
        # Someone might think of using the pre-installed headers on
        # Canadian crosses, in case the installed compiler is not fully
-diff -Naur gcc-4.4.5.orig/configure.ac gcc-4.4.5/configure.ac
--- gcc-4.4.5.orig/configure.ac	2010-06-07 22:10:41.000000000 +0200
-+++ gcc-4.4.5/configure.ac	2011-03-01 05:57:30.792523196 +0100
+diff -Naur gcc-4.4.6.orig/configure.ac gcc-4.4.6/configure.ac
+--- gcc-4.4.6.orig/configure.ac	2010-10-02 13:40:32.000000000 +0200
+++ gcc-4.4.6/configure.ac	2011-08-29 07:16:18.131123743 +0200
@@ -502,6 +502,7 @@
     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
     ;;
@@ -37,7 +279,123 @@ diff -Naur gcc-4.4.5.orig/configure.ac gcc-4.4.5/configure.ac
     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
     ;;
     # The tpf target doesn't support gdb yet.
-@@ -2560,7 +2561,7 @@
+@@ -1328,55 +1329,81 @@
+ esac
+ 
+ # Check for PPL
+-ppl_major_version=0
+-ppl_minor_version=10
+-ppllibs=" -lppl_c -lppl -lgmpxx $with_host_libstdcxx "
+ppllibs=
+ pplinc=
+pwllib=
+ 
+-AC_ARG_WITH(ppl, [  --with-ppl=PATH         Specify prefix directory for the installed PPL package
+-                          Equivalent to --with-ppl-include=PATH/include
+-                          plus --with-ppl-lib=PATH/lib])
+-AC_ARG_WITH(ppl_include, [  --with-ppl-include=PATH Specify directory for installed PPL include files])
+-AC_ARG_WITH(ppl_lib, [  --with-ppl-lib=PATH     Specify the directory for the installed PPL library])
+AC_ARG_WITH(ppl,
+[AS_HELP_STRING([--with-ppl=PATH],
+		[specify prefix directory for the installed PPL package.
+		 Equivalent to --with-ppl-include=PATH/include
+		 plus --with-ppl-lib=PATH/lib])])
+AC_ARG_WITH(ppl-include,
+[AS_HELP_STRING([--with-ppl-include=PATH],
+		[specify directory for installed PPL include files])])
+AC_ARG_WITH(ppl-lib,
+[AS_HELP_STRING([--with-ppl-lib=PATH],
+		[specify directory for the installed PPL library])])
+ 
+-case $with_ppl in 
+-  no)
+-    ppllibs=
+AC_ARG_ENABLE(ppl-version-check,
+[AS_HELP_STRING([--disable-ppl-version-check],
+		[disable check for PPL version])])
+
+case $with_ppl in
+  yes | no | "")
+     ;;
+   *)
+-    ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
+    ppllibs="-L$with_ppl/lib"
+     pplinc="-I$with_ppl/include $pplinc"
+-    LIBS="$ppllibs $LIBS"
+    if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then
+      with_ppl=yes
+    else
+      AC_MSG_ERROR([cannot find directories "$with_ppl/lib" or "$with_ppl/include"])
+    fi
+     ;;
+ esac
+-if test "x$with_ppl_include" != x; then
+
+if test x"$with_ppl_include" != x; then
+   pplinc="-I$with_ppl_include $pplinc"
+  with_ppl=yes
+ fi
+
+ if test "x$with_ppl_lib" != x; then
+-  ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx $with_host_libstdcxx"
+-  LIBS="$ppllibs $LIBS"
+  ppllibs="-L$with_ppl_lib"
+  with_ppl=yes
+ fi
+-if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+-  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx "
+-  pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include '
+-  LIBS="$ppllibs $LIBS"
+
+if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+  if test x"$enable_watchdog" = xyes; then
+    pwllib="-lpwl"
+  fi
+  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"
+  pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
+  enable_ppl_version_check=no
+  with_ppl=yes
+ fi
+ 
+-AC_ARG_ENABLE(ppl-version-check,
+-[  --disable-ppl-version-check    disable check for PPL version],
+-ENABLE_PPL_CHECK=$enableval,
+-ENABLE_PPL_CHECK=yes)
+if test "x$with_ppl" != xno; then
+  if test "x$pwllib" = x; then
+    saved_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $ppllibs"
+    AC_CHECK_LIB(pwl,PWL_handle_timeout,[pwllib="-lpwl"])
+    LDFLAGS="$saved_LDFLAGS"
+  fi
+ 
+-if test "${ENABLE_PPL_CHECK}" = "yes"; then
+-  saved_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS $pplinc $gmpinc"
+-  AC_MSG_CHECKING([for version $ppl_major_version.$ppl_minor_version of PPL])
+-  AC_TRY_COMPILE([#include "ppl_c.h"],[
+-  #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version
+-  choke me
+-  #endif
+-  ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ])
+-  CFLAGS="$saved_CFLAGS"
+  ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"
+
+  if test "$enable_ppl_version_check" != no; then
+    saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $pplinc $gmpinc"
+    AC_MSG_CHECKING([for version 0.10 (revision 0 or later) of PPL])
+    AC_TRY_COMPILE([#include "ppl_c.h"],[
+    #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
+    choke me
+    #endif
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
+    CFLAGS="$saved_CFLAGS"
+  fi
+ fi
+ 
+ # Flags needed for PPL
+@@ -2560,7 +2587,7 @@
        # to it.  This is right: we don't want to search that directory
        # for binaries, but we want the header files in there, so add
        # them explicitly.
@@ -46,10 +404,16 @@ diff -Naur gcc-4.4.5.orig/configure.ac gcc-4.4.5/configure.ac
 
        # Someone might think of using the pre-installed headers on
        # Canadian crosses, in case the installed compiler is not fully
-diff -Naur gcc-4.4.5.orig/gcc/ChangeLog.rtems gcc-4.4.5/gcc/ChangeLog.rtems
--- gcc-4.4.5.orig/gcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/ChangeLog.rtems	2011-03-01 06:11:33.826203883 +0100
-@@ -0,0 +1,54 @@
+diff -Naur gcc-4.4.6.orig/gcc/ChangeLog.rtems gcc-4.4.6/gcc/ChangeLog.rtems
+--- gcc-4.4.6.orig/gcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/ChangeLog.rtems	2011-08-29 07:16:18.132123787 +0200
+@@ -0,0 +1,60 @@
+2011-08-29	Ralf Corsépius <ralf.corsepius@rtems.org> 
+	and Eric Norum <wenorum@lbl.gov>
+
+	Fix bootstrap breakdowns on OS X 10.7.1 (Lion):
+	* toplev.h, toplev.c: Switch-off "extern inline" if using clang.
+
 +2011-02-20	Ralf Corsépius <ralf.corsepius@rtems.org>
 +
 +	* config/rs6000/t-rtems: Remove -mcpu=601 multilib.
@@ -105,9 +469,9 @@ diff -Naur gcc-4.4.5.orig/gcc/ChangeLog.rtems gcc-4.4.5/gcc/ChangeLog.rtems
 +	* config/mips/elf.h: Remove NO_IMPLICIT_EXTERN_C.
 +	
 \ No newline at end of file
-diff -Naur gcc-4.4.5.orig/gcc/config/arm/rtems-elf.h gcc-4.4.5/gcc/config/arm/rtems-elf.h
--- gcc-4.4.5.orig/gcc/config/arm/rtems-elf.h	2009-03-25 13:54:16.000000000 +0100
-+++ gcc-4.4.5/gcc/config/arm/rtems-elf.h	2011-03-01 05:57:30.792523196 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/arm/rtems-elf.h gcc-4.4.6/gcc/config/arm/rtems-elf.h
+--- gcc-4.4.6.orig/gcc/config/arm/rtems-elf.h	2009-03-25 13:54:16.000000000 +0100
+++ gcc-4.4.6/gcc/config/arm/rtems-elf.h	2011-08-29 07:16:18.132123787 +0200
@@ -36,7 +36,7 @@
  */
 #undef SUBTARGET_EXTRA_ASM_SPEC
@@ -117,9 +481,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/arm/rtems-elf.h gcc-4.4.5/gcc/config/arm/rt
 
 /*
  *  The default includes --start-group and --end-group which conflicts
-diff -Naur gcc-4.4.5.orig/gcc/config/arm/t-rtems gcc-4.4.5/gcc/config/arm/t-rtems
--- gcc-4.4.5.orig/gcc/config/arm/t-rtems	2004-11-23 06:30:32.000000000 +0100
-+++ gcc-4.4.5/gcc/config/arm/t-rtems	2011-03-01 05:57:30.792523196 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/arm/t-rtems gcc-4.4.6/gcc/config/arm/t-rtems
+--- gcc-4.4.6.orig/gcc/config/arm/t-rtems	2004-11-23 06:30:32.000000000 +0100
+++ gcc-4.4.6/gcc/config/arm/t-rtems	2011-08-29 07:16:18.133123835 +0200
@@ -5,6 +5,41 @@
 MULTILIB_EXCEPTIONS  = 
 MULTILIB_MATCHES     = marm=mno-thumb
@@ -165,9 +529,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/arm/t-rtems gcc-4.4.5/gcc/config/arm/t-rtem
 +#/fpu        -> arm/hard/fpa
 +#/fpa        -> arm/soft/fpa
 +#.           -> arm/soft/fpa
-diff -Naur gcc-4.4.5.orig/gcc/config/avr/avr.h gcc-4.4.5/gcc/config/avr/avr.h
--- gcc-4.4.5.orig/gcc/config/avr/avr.h	2009-03-28 22:09:50.000000000 +0100
-+++ gcc-4.4.5/gcc/config/avr/avr.h	2011-03-01 05:57:30.793523210 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/avr/avr.h gcc-4.4.6/gcc/config/avr/avr.h
+--- gcc-4.4.6.orig/gcc/config/avr/avr.h	2009-03-28 22:09:50.000000000 +0100
+++ gcc-4.4.6/gcc/config/avr/avr.h	2011-08-29 07:16:18.133123835 +0200
@@ -811,12 +811,15 @@
                                mmcu=at90can64*|\
                                mmcu=at90usb64*:--pmem-wrap-around=64k}}}\
@@ -228,18 +592,18 @@ diff -Naur gcc-4.4.5.orig/gcc/config/avr/avr.h gcc-4.4.5/gcc/config/avr/avr.h
 %{mmcu=atmega324*|\
   mmcu=atmega325*|\
   mmcu=atmega328p|\
-diff -Naur gcc-4.4.5.orig/gcc/config/avr/t-rtems gcc-4.4.5/gcc/config/avr/t-rtems
--- gcc-4.4.5.orig/gcc/config/avr/t-rtems	2004-11-23 04:44:03.000000000 +0100
-+++ gcc-4.4.5/gcc/config/avr/t-rtems	2011-03-01 05:57:30.793523210 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/avr/t-rtems gcc-4.4.6/gcc/config/avr/t-rtems
+--- gcc-4.4.6.orig/gcc/config/avr/t-rtems	2004-11-23 04:44:03.000000000 +0100
+++ gcc-4.4.6/gcc/config/avr/t-rtems	2011-08-29 07:16:18.133123835 +0200
@@ -1,3 +1,4 @@
 # Multilibs for avr RTEMS targets.
 
 -# ATM, this is just a stub
 +# RTEMS uses _exit from newlib
 +LIB1ASMFUNCS := $(filter-out _exit,$(LIB1ASMFUNCS))
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/arithmetic.c gcc-4.4.5/gcc/config/lm32/arithmetic.c
--- gcc-4.4.5.orig/gcc/config/lm32/arithmetic.c	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/arithmetic.c	2011-03-01 05:57:30.847523953 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/arithmetic.c gcc-4.4.6/gcc/config/lm32/arithmetic.c
+--- gcc-4.4.6.orig/gcc/config/lm32/arithmetic.c	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/arithmetic.c	2011-08-29 07:16:18.133123835 +0200
@@ -0,0 +1,305 @@
 +/* Fixed-point arithmetic for Lattice Mico32.
 +   Contributed by Jon Beniston <jon@beniston.com> 
@@ -546,9 +910,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/arithmetic.c gcc-4.4.5/gcc/config/lm32
 +#endif
 +
 +#endif 
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/crti.S gcc-4.4.5/gcc/config/lm32/crti.S
--- gcc-4.4.5.orig/gcc/config/lm32/crti.S	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/crti.S	2011-03-01 05:57:30.847523953 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/crti.S gcc-4.4.6/gcc/config/lm32/crti.S
+--- gcc-4.4.6.orig/gcc/config/lm32/crti.S	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/crti.S	2011-08-29 07:16:18.133123835 +0200
@@ -0,0 +1,45 @@
 +# crti.S for Lattice Mico32 
 +# Contributed by Jon Beniston <jon@beniston.com>
@@ -595,9 +959,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/crti.S gcc-4.4.5/gcc/config/lm32/crti.
 +_fini:        
 +        addi    sp, sp, -4        
 +        sw      (sp+4), ra
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/crtn.S gcc-4.4.5/gcc/config/lm32/crtn.S
--- gcc-4.4.5.orig/gcc/config/lm32/crtn.S	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/crtn.S	2011-03-01 05:57:30.848523967 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/crtn.S gcc-4.4.6/gcc/config/lm32/crtn.S
+--- gcc-4.4.6.orig/gcc/config/lm32/crtn.S	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/crtn.S	2011-08-29 07:16:18.134123880 +0200
@@ -0,0 +1,42 @@
 +# crtn.S for Lattice Mico32
 +# Contributed by Jon Beniston <jon@beniston.com>
@@ -641,9 +1005,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/crtn.S gcc-4.4.5/gcc/config/lm32/crtn.
 +        addi    sp, sp, 4
 +        ret
 +        
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lib1funcs.S gcc-4.4.5/gcc/config/lm32/lib1funcs.S
--- gcc-4.4.5.orig/gcc/config/lm32/lib1funcs.S	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/lib1funcs.S	2011-03-01 05:57:30.848523967 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/lib1funcs.S gcc-4.4.6/gcc/config/lm32/lib1funcs.S
+--- gcc-4.4.6.orig/gcc/config/lm32/lib1funcs.S	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/lib1funcs.S	2011-08-29 07:16:18.134123880 +0200
@@ -0,0 +1,429 @@
 +# lib1funcs.S for Lattice Mico32 
 +# Contributed by Jon Beniston <jon@beniston.com>
@@ -1074,9 +1438,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lib1funcs.S gcc-4.4.5/gcc/config/lm32/
 +        .word   __ashrsi3_30
 +        .word   __ashrsi3_31
 +        
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32.c gcc-4.4.5/gcc/config/lm32/lm32.c
--- gcc-4.4.5.orig/gcc/config/lm32/lm32.c	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/lm32.c	2011-03-01 05:57:30.849523981 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/lm32.c gcc-4.4.6/gcc/config/lm32/lm32.c
+--- gcc-4.4.6.orig/gcc/config/lm32/lm32.c	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/lm32.c	2011-08-29 07:16:18.135123923 +0200
@@ -0,0 +1,869 @@
 +/* Subroutines used for code generation on the Lattice Mico32 architecture.
 +   Contributed by Jon Beniston <jon@beniston.com>
@@ -1947,9 +2311,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32.c gcc-4.4.5/gcc/config/lm32/lm32.
 +
 +  return 0;
 +}
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32.h gcc-4.4.5/gcc/config/lm32/lm32.h
--- gcc-4.4.5.orig/gcc/config/lm32/lm32.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/lm32.h	2011-03-01 05:57:30.850523995 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/lm32.h gcc-4.4.6/gcc/config/lm32/lm32.h
+--- gcc-4.4.6.orig/gcc/config/lm32/lm32.h	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/lm32.h	2011-08-29 07:16:18.135123923 +0200
@@ -0,0 +1,657 @@
 +/* Definitions of target machine for GNU compiler, Lattice Mico32 architecture.
 +   Contributed by Jon Beniston <jon@beniston.com>
@@ -2608,9 +2972,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32.h gcc-4.4.5/gcc/config/lm32/lm32.
 +#endif
 +
 +#define STORE_FLAG_VALUE 1
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32.md gcc-4.4.5/gcc/config/lm32/lm32.md
--- gcc-4.4.5.orig/gcc/config/lm32/lm32.md	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/lm32.md	2011-03-01 05:57:30.851524009 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/lm32.md gcc-4.4.6/gcc/config/lm32/lm32.md
+--- gcc-4.4.6.orig/gcc/config/lm32/lm32.md	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/lm32.md	2011-08-29 07:16:18.136123965 +0200
@@ -0,0 +1,1233 @@
 +;; Machine description of the Lattice Mico32 architecture for GNU C compiler.
 +;; Contributed by Jon Beniston <jon@beniston.com>
@@ -3845,9 +4209,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32.md gcc-4.4.5/gcc/config/lm32/lm32
 +  [(set_attr "length" "0")]
 +)
 +
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32.opt gcc-4.4.5/gcc/config/lm32/lm32.opt
--- gcc-4.4.5.orig/gcc/config/lm32/lm32.opt	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/lm32.opt	2011-03-01 05:57:30.851524009 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/lm32.opt gcc-4.4.6/gcc/config/lm32/lm32.opt
+--- gcc-4.4.6.orig/gcc/config/lm32/lm32.opt	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/lm32.opt	2011-08-29 07:16:18.136123965 +0200
@@ -0,0 +1,40 @@
 +; Options for the Lattice Mico32 port of the compiler.
 +; Contributed by Jon Beniston <jon@beniston.com>
@@ -3889,9 +4253,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32.opt gcc-4.4.5/gcc/config/lm32/lm3
 +muser-enabled
 +Target Report Mask(USER_ENABLED)
 +Enable user-defined instructions
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32-protos.h gcc-4.4.5/gcc/config/lm32/lm32-protos.h
--- gcc-4.4.5.orig/gcc/config/lm32/lm32-protos.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/lm32-protos.h	2011-03-01 05:57:30.851524009 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/lm32-protos.h gcc-4.4.6/gcc/config/lm32/lm32-protos.h
+--- gcc-4.4.6.orig/gcc/config/lm32/lm32-protos.h	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/lm32-protos.h	2011-08-29 07:16:18.134123880 +0200
@@ -0,0 +1,52 @@
 +/* Prototypes of target machine functions, Lattice Mico32 architecture.
 +   Contributed by Jon Beniston <jon@beniston.com>
@@ -3945,9 +4309,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/lm32-protos.h gcc-4.4.5/gcc/config/lm3
 +extern int lm32_expand_block_move (rtx *);
 +extern int nonpic_symbol_mentioned_p (rtx);
 +extern rtx lm32_legitimize_pic_address (rtx, enum machine_mode, rtx);
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/predicates.md gcc-4.4.5/gcc/config/lm32/predicates.md
--- gcc-4.4.5.orig/gcc/config/lm32/predicates.md	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/predicates.md	2011-03-01 05:57:30.851524009 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/predicates.md gcc-4.4.6/gcc/config/lm32/predicates.md
+--- gcc-4.4.6.orig/gcc/config/lm32/predicates.md	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/predicates.md	2011-08-29 07:16:18.136123965 +0200
@@ -0,0 +1,58 @@
 +;; Predicate definitions for Lattice Mico32.
 +;; Contributed by Jon Beniston <jon@beniston.com>
@@ -4007,9 +4371,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/predicates.md gcc-4.4.5/gcc/config/lm3
 +  (ior (match_code "label_ref")
 +       (match_code "symbol_ref")))
 +       
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/rtems.h gcc-4.4.5/gcc/config/lm32/rtems.h
--- gcc-4.4.5.orig/gcc/config/lm32/rtems.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/rtems.h	2011-03-01 05:57:30.851524009 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/rtems.h gcc-4.4.6/gcc/config/lm32/rtems.h
+--- gcc-4.4.6.orig/gcc/config/lm32/rtems.h	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/rtems.h	2011-08-29 07:16:18.136123965 +0200
@@ -0,0 +1,32 @@
 +/* Definitions for rtems targeting a lm32 using ELF.
 +   Copyright (C) 2009, Free Software Foundation, Inc.
@@ -4043,9 +4407,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/rtems.h gcc-4.4.5/gcc/config/lm32/rtem
 +
 +/* Use the default */
 +#undef LINK_GCC_C_SEQUENCE_SPEC
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/sfp-machine.h gcc-4.4.5/gcc/config/lm32/sfp-machine.h
--- gcc-4.4.5.orig/gcc/config/lm32/sfp-machine.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/sfp-machine.h	2011-03-01 05:57:30.851524009 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/sfp-machine.h gcc-4.4.6/gcc/config/lm32/sfp-machine.h
+--- gcc-4.4.6.orig/gcc/config/lm32/sfp-machine.h	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/sfp-machine.h	2011-08-29 07:16:18.136123965 +0200
@@ -0,0 +1,51 @@
 +#define _FP_W_TYPE_SIZE		32
 +#define _FP_W_TYPE		unsigned long
@@ -4098,18 +4462,18 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/sfp-machine.h gcc-4.4.5/gcc/config/lm3
 +# define strong_alias(name, aliasname) _strong_alias(name, aliasname)
 +# define _strong_alias(name, aliasname) \
 +  extern __typeof (name) aliasname __attribute__ ((alias (#name)));
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/t-fprules-softfp gcc-4.4.5/gcc/config/lm32/t-fprules-softfp
--- gcc-4.4.5.orig/gcc/config/lm32/t-fprules-softfp	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/t-fprules-softfp	2011-03-01 05:57:30.852524023 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/t-fprules-softfp gcc-4.4.6/gcc/config/lm32/t-fprules-softfp
+--- gcc-4.4.6.orig/gcc/config/lm32/t-fprules-softfp	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/t-fprules-softfp	2011-08-29 07:16:18.136123965 +0200
@@ -0,0 +1,5 @@
 +softfp_float_modes := sf df
 +softfp_int_modes := si di
 +softfp_extensions := sfdf
 +softfp_truncations := dfsf
 +softfp_machine_header := lm32/sfp-machine.h
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/t-lm32 gcc-4.4.5/gcc/config/lm32/t-lm32
--- gcc-4.4.5.orig/gcc/config/lm32/t-lm32	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/t-lm32	2011-03-01 05:57:30.852524023 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/t-lm32 gcc-4.4.6/gcc/config/lm32/t-lm32
+--- gcc-4.4.6.orig/gcc/config/lm32/t-lm32	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/t-lm32	2011-08-29 07:16:18.136123965 +0200
@@ -0,0 +1,19 @@
 +LIB1ASMSRC = lm32/lib1funcs.S
 +LIB1ASMFUNCS = _ashlsi3 _ashrsi3 _lshrsi3
@@ -4130,9 +4494,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/t-lm32 gcc-4.4.5/gcc/config/lm32/t-lm3
 +
 +MULTILIB_OPTIONS = mmultiply-enabled mbarrel-shift-enabled 
 +# Don't bother building multilib with mdivide-enabled, not much of a gain
-diff -Naur gcc-4.4.5.orig/gcc/config/lm32/uclinux-elf.h gcc-4.4.5/gcc/config/lm32/uclinux-elf.h
--- gcc-4.4.5.orig/gcc/config/lm32/uclinux-elf.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/gcc/config/lm32/uclinux-elf.h	2011-03-01 05:57:30.852524023 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/lm32/uclinux-elf.h gcc-4.4.6/gcc/config/lm32/uclinux-elf.h
+--- gcc-4.4.6.orig/gcc/config/lm32/uclinux-elf.h	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/gcc/config/lm32/uclinux-elf.h	2011-08-29 07:16:18.137124000 +0200
@@ -0,0 +1,85 @@
 +/* Definitions for LM32 running Linux-based GNU systems using ELF
 +   Copyright (C) 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -4219,9 +4583,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/lm32/uclinux-elf.h gcc-4.4.5/gcc/config/lm3
 +#undef  CC1_SPEC
 +#define CC1_SPEC "%{G*} %{!fno-PIC:-fPIC}"
 +
-diff -Naur gcc-4.4.5.orig/gcc/config/m32c/rtems.h gcc-4.4.5/gcc/config/m32c/rtems.h
--- gcc-4.4.5.orig/gcc/config/m32c/rtems.h	2008-12-01 17:34:42.000000000 +0100
-+++ gcc-4.4.5/gcc/config/m32c/rtems.h	2011-03-01 05:57:30.852524023 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/m32c/rtems.h gcc-4.4.6/gcc/config/m32c/rtems.h
+--- gcc-4.4.6.orig/gcc/config/m32c/rtems.h	2008-12-01 17:34:42.000000000 +0100
+++ gcc-4.4.6/gcc/config/m32c/rtems.h	2011-08-29 07:16:18.137124000 +0200
@@ -29,5 +29,9 @@
     }						\
   while (0)
@@ -4233,9 +4597,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/m32c/rtems.h gcc-4.4.5/gcc/config/m32c/rtem
 +#undef WCHAR_TYPE
 +
 +#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.4.5.orig/gcc/config/m68k/rtemself.h gcc-4.4.5/gcc/config/m68k/rtemself.h
--- gcc-4.4.5.orig/gcc/config/m68k/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/m68k/rtemself.h	2011-03-01 05:57:30.852524023 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/m68k/rtemself.h gcc-4.4.6/gcc/config/m68k/rtemself.h
+--- gcc-4.4.6.orig/gcc/config/m68k/rtemself.h	2007-08-02 12:49:31.000000000 +0200
+++ gcc-4.4.6/gcc/config/m68k/rtemself.h	2011-08-29 07:16:18.137124000 +0200
@@ -31,3 +31,8 @@
 	builtin_assert ("system=rtems");	\
     }						\
@@ -4245,9 +4609,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/m68k/rtemself.h gcc-4.4.5/gcc/config/m68k/r
 +#undef WCHAR_TYPE
 +
 +#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.4.5.orig/gcc/config/mips/elf.h gcc-4.4.5/gcc/config/mips/elf.h
--- gcc-4.4.5.orig/gcc/config/mips/elf.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/mips/elf.h	2011-03-01 05:57:30.853524036 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/mips/elf.h gcc-4.4.6/gcc/config/mips/elf.h
+--- gcc-4.4.6.orig/gcc/config/mips/elf.h	2007-08-02 12:49:31.000000000 +0200
+++ gcc-4.4.6/gcc/config/mips/elf.h	2011-08-29 07:16:18.137124000 +0200
@@ -48,6 +48,4 @@
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
@@ -4255,9 +4619,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/mips/elf.h gcc-4.4.5/gcc/config/mips/elf.h
 -#define NO_IMPLICIT_EXTERN_C 1
 -
 #define HANDLE_PRAGMA_PACK_PUSH_POP 1
-diff -Naur gcc-4.4.5.orig/gcc/config/rs6000/rtems.h gcc-4.4.5/gcc/config/rs6000/rtems.h
--- gcc-4.4.5.orig/gcc/config/rs6000/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/rs6000/rtems.h	2011-03-01 05:57:30.853524036 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/rs6000/rtems.h gcc-4.4.6/gcc/config/rs6000/rtems.h
+--- gcc-4.4.6.orig/gcc/config/rs6000/rtems.h	2007-08-02 12:49:31.000000000 +0200
+++ gcc-4.4.6/gcc/config/rs6000/rtems.h	2011-08-29 07:16:18.137124000 +0200
@@ -49,8 +49,22 @@
 %{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
 %{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
@@ -4282,9 +4646,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/rs6000/rtems.h gcc-4.4.5/gcc/config/rs6000/
 +#undef WCHAR_TYPE
 +
 +#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.4.5.orig/gcc/config/rs6000/t-rtems gcc-4.4.5/gcc/config/rs6000/t-rtems
--- gcc-4.4.5.orig/gcc/config/rs6000/t-rtems	2009-03-25 13:54:16.000000000 +0100
-+++ gcc-4.4.5/gcc/config/rs6000/t-rtems	2011-03-01 06:06:18.706820035 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/rs6000/t-rtems gcc-4.4.6/gcc/config/rs6000/t-rtems
+--- gcc-4.4.6.orig/gcc/config/rs6000/t-rtems	2009-03-25 13:54:16.000000000 +0100
+++ gcc-4.4.6/gcc/config/rs6000/t-rtems	2011-08-29 07:16:18.137124000 +0200
@@ -1,13 +1,29 @@
 # Multilibs for powerpc RTEMS targets.
 +#
@@ -4340,9 +4704,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/rs6000/t-rtems gcc-4.4.5/gcc/config/rs6000/
 -MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
 -MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
 -MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
-diff -Naur gcc-4.4.5.orig/gcc/config/rtems.h gcc-4.4.5/gcc/config/rtems.h
--- gcc-4.4.5.orig/gcc/config/rtems.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/rtems.h	2011-03-01 05:57:30.853524036 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/rtems.h gcc-4.4.6/gcc/config/rtems.h
+--- gcc-4.4.6.orig/gcc/config/rtems.h	2007-08-02 12:49:31.000000000 +0200
+++ gcc-4.4.6/gcc/config/rtems.h	2011-08-29 07:16:18.138124032 +0200
@@ -38,6 +38,5 @@
 #undef LIB_SPEC
 #define LIB_SPEC "%{!qrtems: " STD_LIB_SPEC "} " \
@@ -4351,9 +4715,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/rtems.h gcc-4.4.5/gcc/config/rtems.h
 - %{qrtems_debug: -lrtemsbsp_g -lrtemscpu_g} \
 + -lrtemsbsp -lrtemscpu \
  -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}}"
-diff -Naur gcc-4.4.5.orig/gcc/config/sh/rtemself.h gcc-4.4.5/gcc/config/sh/rtemself.h
--- gcc-4.4.5.orig/gcc/config/sh/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/sh/rtemself.h	2011-03-01 05:57:30.853524036 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/sh/rtemself.h gcc-4.4.6/gcc/config/sh/rtemself.h
+--- gcc-4.4.6.orig/gcc/config/sh/rtemself.h	2007-08-02 12:49:31.000000000 +0200
+++ gcc-4.4.6/gcc/config/sh/rtemself.h	2011-08-29 07:16:18.138124032 +0200
@@ -24,3 +24,8 @@
   builtin_define( "__rtems__" );		\
   builtin_assert( "system=rtems" );		\
@@ -4363,9 +4727,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config/sh/rtemself.h gcc-4.4.5/gcc/config/sh/rtems
 +#undef WCHAR_TYPE
 +
 +#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.4.5.orig/gcc/config/sparc/rtemself.h gcc-4.4.5/gcc/config/sparc/rtemself.h
--- gcc-4.4.5.orig/gcc/config/sparc/rtemself.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.4.5/gcc/config/sparc/rtemself.h	2011-03-01 05:57:30.854524049 +0100
+diff -Naur gcc-4.4.6.orig/gcc/config/sparc/rtemself.h gcc-4.4.6/gcc/config/sparc/rtemself.h
+--- gcc-4.4.6.orig/gcc/config/sparc/rtemself.h	2007-08-02 12:49:31.000000000 +0200
+++ gcc-4.4.6/gcc/config/sparc/rtemself.h	2011-08-29 07:16:18.138124032 +0200
@@ -29,5 +29,9 @@
     }						\
   while (0)
@@ -4377,10 +4741,10 @@ diff -Naur gcc-4.4.5.orig/gcc/config/sparc/rtemself.h gcc-4.4.5/gcc/config/sparc
 +#undef WCHAR_TYPE
 +
 +#undef WCHAR_TYPE_SIZE
-diff -Naur gcc-4.4.5.orig/gcc/config.gcc gcc-4.4.5/gcc/config.gcc
--- gcc-4.4.5.orig/gcc/config.gcc	2010-06-14 00:16:50.000000000 +0200
-+++ gcc-4.4.5/gcc/config.gcc	2011-03-01 05:57:30.855524063 +0100
-@@ -1376,6 +1376,23 @@
+diff -Naur gcc-4.4.6.orig/gcc/config.gcc gcc-4.4.6/gcc/config.gcc
+--- gcc-4.4.6.orig/gcc/config.gcc	2011-02-18 22:39:51.000000000 +0100
+++ gcc-4.4.6/gcc/config.gcc	2011-08-29 07:16:18.132123787 +0200
+@@ -1377,6 +1377,23 @@
         out_file=iq2000/iq2000.c
         md_file=iq2000/iq2000.md
         ;;
@@ -4404,9 +4768,9 @@ diff -Naur gcc-4.4.5.orig/gcc/config.gcc gcc-4.4.5/gcc/config.gcc
 m32r-*-elf*)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
 	extra_parts="crtinit.o crtfini.o"
-diff -Naur gcc-4.4.5.orig/gcc/doc/contrib.texi gcc-4.4.5/gcc/doc/contrib.texi
--- gcc-4.4.5.orig/gcc/doc/contrib.texi	2009-02-20 16:20:38.000000000 +0100
-+++ gcc-4.4.5/gcc/doc/contrib.texi	2011-03-01 05:57:30.855524063 +0100
+diff -Naur gcc-4.4.6.orig/gcc/doc/contrib.texi gcc-4.4.6/gcc/doc/contrib.texi
+--- gcc-4.4.6.orig/gcc/doc/contrib.texi	2009-02-20 16:20:38.000000000 +0100
+++ gcc-4.4.6/gcc/doc/contrib.texi	2011-08-29 07:16:21.941181976 +0200
@@ -55,7 +55,7 @@
 Wolfgang Bangerth for processing tons of bug reports.
 
@@ -4416,9 +4780,9 @@ diff -Naur gcc-4.4.5.orig/gcc/doc/contrib.texi gcc-4.4.5/gcc/doc/contrib.texi
 
 @item
 Daniel Berlin for better DWARF2 support, faster/better optimizations,
-diff -Naur gcc-4.4.5.orig/gcc/doc/install.texi gcc-4.4.5/gcc/doc/install.texi
--- gcc-4.4.5.orig/gcc/doc/install.texi	2010-07-15 11:26:30.000000000 +0200
-+++ gcc-4.4.5/gcc/doc/install.texi	2011-03-01 05:57:30.856524077 +0100
+diff -Naur gcc-4.4.6.orig/gcc/doc/install.texi gcc-4.4.6/gcc/doc/install.texi
+--- gcc-4.4.6.orig/gcc/doc/install.texi	2010-07-15 11:26:30.000000000 +0200
+++ gcc-4.4.6/gcc/doc/install.texi	2011-08-29 07:16:21.942182004 +0200
@@ -2660,6 +2660,10 @@
 @item
 @uref{#iq2000-x-elf,,iq2000-*-elf}
@@ -4451,10 +4815,10 @@ diff -Naur gcc-4.4.5.orig/gcc/doc/install.texi gcc-4.4.5/gcc/doc/install.texi
 @heading @anchor{m32c-x-elf}m32c-*-elf
 Renesas M32C processor.
 This configuration is intended for embedded systems.
-diff -Naur gcc-4.4.5.orig/gcc/doc/invoke.texi gcc-4.4.5/gcc/doc/invoke.texi
--- gcc-4.4.5.orig/gcc/doc/invoke.texi	2010-09-08 20:13:03.000000000 +0200
-+++ gcc-4.4.5/gcc/doc/invoke.texi	2011-03-01 05:57:30.861524147 +0100
-@@ -606,6 +606,10 @@
+diff -Naur gcc-4.4.6.orig/gcc/doc/invoke.texi gcc-4.4.6/gcc/doc/invoke.texi
+--- gcc-4.4.6.orig/gcc/doc/invoke.texi	2011-03-23 23:02:12.000000000 +0100
+++ gcc-4.4.6/gcc/doc/invoke.texi	2011-08-29 07:16:21.948182208 +0200
+@@ -610,6 +610,10 @@
 -mno-sched-prefer-non-control-spec-insns @gol
 -mno-sched-count-spec-in-critical-path}
 
@@ -4473,7 +4837,7 @@ diff -Naur gcc-4.4.5.orig/gcc/doc/invoke.texi gcc-4.4.5/gcc/doc/invoke.texi
 * M32C Options::
 * M32R/D Options::
 * M680x0 Options::
-@@ -11842,6 +11847,35 @@
+@@ -11907,6 +11912,35 @@
 
 @end table
 
@@ -4509,18 +4873,42 @@ diff -Naur gcc-4.4.5.orig/gcc/doc/invoke.texi gcc-4.4.5/gcc/doc/invoke.texi
 @node M32R/D Options
 @subsection M32R/D Options
 @cindex M32R/D options
-diff -Naur gcc-4.4.5.orig/libgcc/ChangeLog.rtems gcc-4.4.5/libgcc/ChangeLog.rtems
--- gcc-4.4.5.orig/libgcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/libgcc/ChangeLog.rtems	2011-03-01 05:57:30.861524147 +0100
+diff -Naur gcc-4.4.6.orig/gcc/toplev.c gcc-4.4.6/gcc/toplev.c
+--- gcc-4.4.6.orig/gcc/toplev.c	2010-03-31 04:51:31.000000000 +0200
+++ gcc-4.4.6/gcc/toplev.c	2011-08-29 07:16:21.949182232 +0200
+@@ -527,7 +527,7 @@
+    for floor_log2 and exact_log2; see toplev.h.  That construct, however,
+    conflicts with the ISO C++ One Definition Rule.   */
+ 
+-#if GCC_VERSION < 3004 || !defined (__cplusplus)
+#if ((GCC_VERSION < 3004) || defined(__clang__)) || !defined (__cplusplus)
+ 
+ /* Given X, an unsigned number, return the largest int Y such that 2**Y <= X.
+    If X is 0, return -1.  */
+diff -Naur gcc-4.4.6.orig/gcc/toplev.h gcc-4.4.6/gcc/toplev.h
+--- gcc-4.4.6.orig/gcc/toplev.h	2009-02-20 16:20:38.000000000 +0100
+++ gcc-4.4.6/gcc/toplev.h	2011-08-29 07:16:21.949182232 +0200
+@@ -174,7 +174,7 @@
+ extern int floor_log2                  (unsigned HOST_WIDE_INT);
+ 
+ /* Inline versions of the above for speed.  */
+-#if GCC_VERSION >= 3004
+#if (GCC_VERSION >= 3004) && !defined(__clang__)
+ # if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG
+ #  define CLZ_HWI __builtin_clzl
+ #  define CTZ_HWI __builtin_ctzl
+diff -Naur gcc-4.4.6.orig/libgcc/ChangeLog.rtems gcc-4.4.6/libgcc/ChangeLog.rtems
+--- gcc-4.4.6.orig/libgcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/libgcc/ChangeLog.rtems	2011-08-29 07:16:21.949182232 +0200
@@ -0,0 +1,5 @@
 +		Jon Beniston <jon@beniston.com>
 +
 +	* libgcc/config/lm32/t-elf, libgcc/config/lm32/t-uclinux,
 +	libgcc/config/lm32/t-uclinux: New (lm32 port).
 +	* libgcc/config.host: Add lm32* targets.
-diff -Naur gcc-4.4.5.orig/libgcc/config/lm32/t-elf gcc-4.4.5/libgcc/config/lm32/t-elf
--- gcc-4.4.5.orig/libgcc/config/lm32/t-elf	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/libgcc/config/lm32/t-elf	2011-03-01 05:57:30.861524147 +0100
+diff -Naur gcc-4.4.6.orig/libgcc/config/lm32/t-elf gcc-4.4.6/libgcc/config/lm32/t-elf
+--- gcc-4.4.6.orig/libgcc/config/lm32/t-elf	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/libgcc/config/lm32/t-elf	2011-08-29 07:16:21.950182265 +0200
@@ -0,0 +1,12 @@
 +# Assemble startup files.
 +
@@ -4534,15 +4922,15 @@ diff -Naur gcc-4.4.5.orig/libgcc/config/lm32/t-elf gcc-4.4.5/libgcc/config/lm32/
 +
 +CRTSTUFF_T_CFLAGS = -G 0
 +TARGET_LIBGCC2_CFLAGS = -G 0
-diff -Naur gcc-4.4.5.orig/libgcc/config/lm32/t-uclinux gcc-4.4.5/libgcc/config/lm32/t-uclinux
--- gcc-4.4.5.orig/libgcc/config/lm32/t-uclinux	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.4.5/libgcc/config/lm32/t-uclinux	2011-03-01 05:57:30.861524147 +0100
+diff -Naur gcc-4.4.6.orig/libgcc/config/lm32/t-uclinux gcc-4.4.6/libgcc/config/lm32/t-uclinux
+--- gcc-4.4.6.orig/libgcc/config/lm32/t-uclinux	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6/libgcc/config/lm32/t-uclinux	2011-08-29 07:16:21.950182265 +0200
@@ -0,0 +1,2 @@
 +CRTSTUFF_T_CFLAGS = -fPIC
 +TARGET_LIBGCC2_CFLAGS = -fPIC
-diff -Naur gcc-4.4.5.orig/libgcc/config.host gcc-4.4.5/libgcc/config.host
--- gcc-4.4.5.orig/libgcc/config.host	2009-04-17 13:58:41.000000000 +0200
-+++ gcc-4.4.5/libgcc/config.host	2011-03-01 05:57:30.862524160 +0100
+diff -Naur gcc-4.4.6.orig/libgcc/config.host gcc-4.4.6/libgcc/config.host
+--- gcc-4.4.6.orig/libgcc/config.host	2009-04-17 13:58:41.000000000 +0200
+++ gcc-4.4.6/libgcc/config.host	2011-08-29 07:16:21.949182232 +0200
@@ -95,6 +95,9 @@
 hppa*-*-*)
 	cpu_type=pa
--- a/contrib/crossrpms/patches/gcc-g++-4.4.6-rtems4.10-20110829.diff
+++ b/contrib/crossrpms/patches/gcc-g++-4.4.6-rtems4.10-20110829.diff
@@ -0,0 +1,104 @@
+diff -Naur gcc-4.4.6.orig/gcc/cp/cfns.h gcc-4.4.6gcc/cp/cfns.h
+--- gcc-4.4.6.orig/gcc/cp/cfns.h	2011-08-29 08:52:31.238300940 +0200
+++ gcc-4.4.6gcc/cp/cfns.h	2011-08-29 08:53:20.485041120 +0200
+@@ -1,5 +1,5 @@
+-/* ANSI-C code produced by gperf version 3.0.1 */
+-/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C ../../gcc/cp/cfns.gperf  */
+/* ANSI-C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf  */
+ 
+ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+@@ -74,13 +74,13 @@
+       400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+       400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+       400, 400, 400, 400, 400, 400, 400, 400,   0,   0,
+-	1, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+        1, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+       400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+       400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+       400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+       400, 400, 400, 400, 400, 400, 400,  28,  90,   0,
+        95,   0,  51,  93, 114,  26, 109, 124,   5,   1,
+-	6,  13,  37, 128,   3,   0,   0,  49,  38,   0,
+        6,  13,  37, 128,   3,   0,   0,  49,  38,   0,
+       104,  45,   0, 400, 400, 400, 400, 400, 400, 400,
+       400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+       400, 400, 400, 400, 400, 400, 400, 400, 400, 400,
+@@ -101,29 +101,32 @@
+   switch (hval)
+     {
+       default:
+-	hval += asso_values[(unsigned char)str[5]+1];
+        hval += asso_values[(unsigned char)str[5]+1];
+       /*FALLTHROUGH*/
+       case 5:
+-	hval += asso_values[(unsigned char)str[4]];
+        hval += asso_values[(unsigned char)str[4]];
+       /*FALLTHROUGH*/
+       case 4:
+-	hval += asso_values[(unsigned char)str[3]];
+        hval += asso_values[(unsigned char)str[3]];
+       /*FALLTHROUGH*/
+       case 3:
+-	hval += asso_values[(unsigned char)str[2]];
+        hval += asso_values[(unsigned char)str[2]];
+       /*FALLTHROUGH*/
+       case 2:
+-	hval += asso_values[(unsigned char)str[1]];
+        hval += asso_values[(unsigned char)str[1]];
+       /*FALLTHROUGH*/
+       case 1:
+-	hval += asso_values[(unsigned char)str[0]];
+-	break;
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+     }
+   return hval + asso_values[(unsigned char)str[len - 1]];
+ }
+ 
+ #ifdef __GNUC__
+ __inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+ #endif
+ const char *
+ libc_name_p (register const char *str, register unsigned int len)
+@@ -346,17 +349,17 @@
+       register int key = hash (str, len);
+ 
+       if (key <= MAX_HASH_VALUE && key >= 0)
+-	{
+-	  register int index = lookup[key];
+        {
+          register int index = lookup[key];
+ 
+-	  if (index >= 0)
+-	    {
+-	      register const char *s = wordlist[index];
+-
+-	      if (*str == *s && !strcmp (str + 1, s + 1))
+-		return s;
+-	    }
+-	}
+          if (index >= 0)
+            {
+              register const char *s = wordlist[index];
+
+              if (*str == *s && !strcmp (str + 1, s + 1))
+                return s;
+            }
+        }
+     }
+   return 0;
+ }
+diff -Naur gcc-4.4.6.orig/gcc/cp/ChangeLog.rtems gcc-4.4.6gcc/cp/ChangeLog.rtems
+--- gcc-4.4.6.orig/gcc/cp/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
+++ gcc-4.4.6gcc/cp/ChangeLog.rtems	2011-08-29 07:14:47.561734025 +0200
+@@ -0,0 +1,5 @@
+2011-08-29	Ralf Corsépius <ralf.corsepius@rtems.org> 
+	and Eric Norum <wenorum@lbl.gov>
+
+	Fix bootstrap breakdowns on OS X 10.7.1 (Lion):
+	* cfns.h: Regenerate.
--- a/contrib/crossrpms/patches/gdb-7.3.1-rtems4.10-20110919.diff
+++ b/contrib/crossrpms/patches/gdb-7.3.1-rtems4.10-20110919.diff
@@ -0,0 +1,586 @@
+diff -Naur gdb-7.3.1.orig/gdb/lm32-tdep.c gdb-7.3.1/gdb/lm32-tdep.c
+--- gdb-7.3.1.orig/gdb/lm32-tdep.c	2011-03-18 19:52:30.000000000 +0100
+++ gdb-7.3.1/gdb/lm32-tdep.c	2011-09-05 05:15:58.049769734 +0200
+@@ -35,7 +35,7 @@
+ #include "regcache.h"
+ #include "trad-frame.h"
+ #include "reggroups.h"
+-#include "opcodes/lm32-desc.h"
+#include "../opcodes/lm32-desc.h"
+ 
+ #include "gdb_string.h"
+ 
+diff -Naur gdb-7.3.1.orig/gdb/sparc-tdep.c gdb-7.3.1/gdb/sparc-tdep.c
+--- gdb-7.3.1.orig/gdb/sparc-tdep.c	2011-03-18 19:52:32.000000000 +0100
+++ gdb-7.3.1/gdb/sparc-tdep.c	2011-09-05 05:15:58.049769734 +0200
+@@ -1117,7 +1117,7 @@
+ sparc32_store_return_value (struct type *type, struct regcache *regcache,
+ 			    const gdb_byte *valbuf)
+ {
+-  int len = TYPE_LENGTH (type);
+  size_t len = TYPE_LENGTH (type);
+   gdb_byte buf[8];
+ 
+   gdb_assert (!sparc_structure_or_union_p (type));
+diff -Naur gdb-7.3.1.orig/sim/common/gentmap.c gdb-7.3.1/sim/common/gentmap.c
+--- gdb-7.3.1.orig/sim/common/gentmap.c	2006-11-07 20:29:59.000000000 +0100
+++ gdb-7.3.1/sim/common/gentmap.c	2011-09-05 05:15:58.064769977 +0200
+@@ -2,6 +2,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+#include <string.h>
+ 
+ struct tdefs {
+   char *symbol;
+diff -Naur gdb-7.3.1.orig/sim/erc32/configure gdb-7.3.1/sim/erc32/configure
+--- gdb-7.3.1.orig/sim/erc32/configure	2010-01-09 22:11:39.000000000 +0100
+++ gdb-7.3.1/sim/erc32/configure	2011-09-05 05:15:58.075770156 +0200
+@@ -591,8 +591,9 @@
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ cgen_breaks
+READLINE_CFLAGS
+READLINE_DEPS
+ READLINE
+-TERMCAP
+ REPORT_BUGS_TEXI
+ REPORT_BUGS_TO
+ PKGVERSION
+@@ -716,6 +717,7 @@
+ enable_sim_profile
+ with_pkgversion
+ with_bugurl
+with_system_readline
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -1358,6 +1360,7 @@
+   --with-zlib             include zlib support (auto/yes/no) default=auto
+   --with-pkgversion=PKG   Use PKG in the version string in place of "GDB"
+   --with-bugurl=URL       Direct users to URL to report a bug
+  --with-system-readline  use installed readline library
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -2416,7 +2419,6 @@
+ 
+ 
+ 
+-
+ # Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
+ # it by inlining the macro's contents.
+ # This file contains common code used by all simulators.
+@@ -2916,18 +2918,18 @@
+ int
+ main ()
+ {
+-
+return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ 
+ # The possible output files:
+@@ -2989,10 +2991,10 @@
+ else
+   ac_file=''
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+ if test -z "$ac_file"; then :
+-  $as_echo "$as_me: failed program was:" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+@@ -3000,51 +3002,18 @@
+ { as_fn_set_status 77
+ as_fn_error "C compiler cannot create executables
+ See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+ 
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
+-  { { case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
+-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
+-    fi
+-  fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+ if { { ac_try="$ac_link"
+@@ -3084,6 +3053,63 @@
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+ if test "${ac_cv_objext+set}" = set; then :
+@@ -4532,86 +4558,41 @@
+ done
+ 
+ 
+-# In the Cygwin environment, we need some additional flags.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin" >&5
+-$as_echo_n "checking for cygwin... " >&6; }
+-if test "${sim_cv_os_cygwin+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+ 
+-#ifdef __CYGWIN__
+-lose
+-#endif
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "lose" >/dev/null 2>&1; then :
+-  sim_cv_os_cygwin=yes
+-else
+-  sim_cv_os_cygwin=no
+# Check whether --with-system-readline was given.
+if test "${with_system_readline+set}" = set; then :
+  withval=$with_system_readline;
+ fi
+-rm -f conftest*
+ 
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_cv_os_cygwin" >&5
+-$as_echo "$sim_cv_os_cygwin" >&6; }
+ 
+-if test x$sim_cv_os_cygwin = xyes; then
+-  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltermcap" >&5
+-$as_echo_n "checking for main in -ltermcap... " >&6; }
+-if test "${ac_cv_lib_termcap_main+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltermcap  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "$with_system_readline" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
+$as_echo_n "checking for readline... " >&6; }
+  save_LIBS="$LIBS"
+  LIBS="-lreadline $save_LIBS"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char add_history ();
+ int
+ main ()
+ {
+-return main ();
+return add_history ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_termcap_main=yes
+-else
+-  ac_cv_lib_termcap_main=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_main" >&5
+-$as_echo "$ac_cv_lib_termcap_main" >&6; }
+-if test "x$ac_cv_lib_termcap_main" = x""yes; then :
+-  TERMCAP=-ltermcap
+-else
+-  TERMCAP=""
+-fi
+-
+-fi
+-
+-
+-# We prefer the in-tree readline.  Top-level dependencies make sure
+-# src/readline (if it's there) is configured before src/sim.
+-if test -r ../../readline/Makefile; then
+-  READLINE=../../readline/libreadline.a
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+-$as_echo_n "checking for readline in -lreadline... " >&6; }
+-if test "${ac_cv_lib_readline_readline+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+  READLINE=-lreadline
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $TERMCAP $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   LIBS="-lreadline -lncurses $save_LIBS"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -4620,33 +4601,39 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char readline ();
+char add_history ();
+ int
+ main ()
+ {
+-return readline ();
+return add_history ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_readline_readline=yes
+  READLINE="-lreadline -lncurses"
+ else
+-  ac_cv_lib_readline_readline=no
+  as_fn_error "unable to detect readline" "$LINENO" 5
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+-$as_echo "$ac_cv_lib_readline_readline" >&6; }
+-if test "x$ac_cv_lib_readline_readline" = x""yes; then :
+-  READLINE=-lreadline
+-else
+-  as_fn_error "the required \"readline\" library is missing" "$LINENO" 5
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LIBS="$save_LIBS"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
+$as_echo "$READLINE" >&6; }
+  READLINE_DEPS=
+  READLINE_CFLAGS=
+else
+  READLINE='../../readline/libreadline.a -lncurses'
+  READLINE_DEPS='$(READLINE)'
+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
+ fi
+ 
+-fi
+
+
+ 
+ 
+ ac_sources="$sim_link_files"
+diff -Naur gdb-7.3.1.orig/sim/erc32/configure.ac gdb-7.3.1/sim/erc32/configure.ac
+--- gdb-7.3.1.orig/sim/erc32/configure.ac	2006-12-20 23:35:51.000000000 +0100
+++ gdb-7.3.1/sim/erc32/configure.ac	2011-09-05 05:15:58.075770156 +0200
+@@ -11,27 +11,32 @@
+ 
+ AC_CHECK_HEADERS(stdlib.h)
+ 
+-# In the Cygwin environment, we need some additional flags.
+-AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
+-[AC_EGREP_CPP(lose, [
+-#ifdef __CYGWIN__
+-lose
+-#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])])
+AC_ARG_WITH([system-readline],
+  [AS_HELP_STRING([--with-system-readline],
+                  [use installed readline library])])
+ 
+-if test x$sim_cv_os_cygwin = xyes; then
+-  TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32'
+if test "$with_system_readline" = yes; then
+  AC_MSG_CHECKING([for readline])
+  save_LIBS="$LIBS"
+  LIBS="-lreadline $save_LIBS"
+  AC_LINK_IFELSE([AC_LANG_CALL([],
+    [add_history])], [READLINE=-lreadline], 
+    [ LIBS="-lreadline -lncurses $save_LIBS"
+      AC_LINK_IFELSE([AC_LANG_CALL([],
+        [add_history])], [READLINE="-lreadline -lncurses"],
+        [AC_MSG_ERROR([unable to detect readline])])
+    ])
+  LIBS="$save_LIBS"
+  AC_MSG_RESULT($READLINE)
+  READLINE_DEPS=
+  READLINE_CFLAGS=
+ else
+-  AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="")
+-fi
+-AC_SUBST(TERMCAP)
+-
+-# We prefer the in-tree readline.  Top-level dependencies make sure
+-# src/readline (if it's there) is configured before src/sim.
+-if test -r ../../readline/Makefile; then
+-  READLINE=../../readline/libreadline.a
+-else
+-  AC_CHECK_LIB(readline, readline, READLINE=-lreadline,
+-	       AC_ERROR([the required "readline" library is missing]), $TERMCAP)
+  READLINE='../../readline/libreadline.a -lncurses'
+  READLINE_DEPS='$(READLINE)'
+  READLINE_CFLAGS='-I$(READLINE_SRC)/..'
+ fi
+ AC_SUBST(READLINE)
+AC_SUBST(READLINE_DEPS)
+AC_SUBST(READLINE_CFLAGS)
+
+ SIM_AC_OUTPUT
+diff -Naur gdb-7.3.1.orig/sim/erc32/erc32.c gdb-7.3.1/sim/erc32/erc32.c
+--- gdb-7.3.1.orig/sim/erc32/erc32.c	2010-05-11 16:18:20.000000000 +0200
+++ gdb-7.3.1/sim/erc32/erc32.c	2011-09-05 05:15:58.076770172 +0200
+@@ -414,7 +414,7 @@
+     if (rom8) mec_memcfg &= ~0x20000;
+     else mec_memcfg |= 0x20000;
+ 
+-    mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
+    mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
+     mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
+ 
+     if (sparclite_board) {
+diff -Naur gdb-7.3.1.orig/sim/erc32/Makefile.in gdb-7.3.1/sim/erc32/Makefile.in
+--- gdb-7.3.1.orig/sim/erc32/Makefile.in	2011-01-01 16:33:58.000000000 +0100
+++ gdb-7.3.1/sim/erc32/Makefile.in	2011-09-05 05:15:58.076770172 +0200
+@@ -19,12 +19,12 @@
+ 
+ ## COMMON_PRE_CONFIG_FRAG
+ 
+-TERMCAP_LIB = @TERMCAP@
+# TERMCAP_LIB = -lncurses
+ READLINE_LIB = @READLINE@
+ 
+ SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
+ SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
+-SIM_EXTRA_ALL = sis
+SIM_EXTRA_ALL = sis$(EXEEXT)
+ SIM_EXTRA_INSTALL = install-sis
+ SIM_EXTRA_CLEAN = clean-sis
+ 
+@@ -38,8 +38,8 @@
+ # `sis' doesn't need interf.o.
+ SIS_OFILES = exec.o erc32.o func.o help.o float.o
+ 
+-sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
+-	$(CC) $(ALL_CFLAGS) -o sis \
+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
+	$(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
+ 	  sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
+ 
+ # FIXME: This computes the build host's endianness, doesn't it?
+@@ -52,11 +52,11 @@
+ 
+ # Copy the files into directories where they will be run.
+ install-sis: installdirs
+-	n=`echo sis | sed '$(program_transform_name)'`; \
+-	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
+	n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
+	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
+ 
+ clean-sis:
+-	rm -f sis end end.h
+	rm -f sis$(EXEEXT) end end.h
+ 
+ configure:
+ 	@echo "Rebuilding configure..."
+diff -Naur gdb-7.3.1.orig/sim/h8300/compile.c gdb-7.3.1/sim/h8300/compile.c
+--- gdb-7.3.1.orig/sim/h8300/compile.c	2011-01-11 15:19:32.000000000 +0100
+++ gdb-7.3.1/sim/h8300/compile.c	2011-09-05 05:15:58.085770319 +0200
+@@ -38,6 +38,12 @@
+ # define SIGTRAP 5
+ #endif
+ 
+#ifdef _WIN32
+#ifndef SIGBUS
+#define SIGBUS 10
+#endif
+#endif
+
+ int debug;
+ 
+ host_callback *sim_callback;
+diff -Naur gdb-7.3.1.orig/sim/m32c/Makefile.in gdb-7.3.1/sim/m32c/Makefile.in
+--- gdb-7.3.1.orig/sim/m32c/Makefile.in	2011-01-01 16:34:01.000000000 +0100
+++ gdb-7.3.1/sim/m32c/Makefile.in	2011-09-05 05:15:58.098770530 +0200
+@@ -56,7 +56,7 @@
+ 	./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c
+ 
+ opc2c : opc2c.o safe-fgets.o
+-	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@ $(BUILD_LIBS)
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ $(BUILD_LIBS)
+ 
+ sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
+ 	../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
+@@ -90,8 +90,8 @@
+ r8c.o : cpu.h mem.h misc.h int.h
+ 
+ opc2c.o : opc2c.c safe-fgets.h
+-	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/opc2c.c
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c
+ 
+ safe-fgets.o : safe-fgets.c safe-fgets.h
+-	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/safe-fgets.c
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c
+ 
+diff -Naur gdb-7.3.1.orig/sim/ppc/device.c gdb-7.3.1/sim/ppc/device.c
+--- gdb-7.3.1.orig/sim/ppc/device.c	2011-02-14 06:14:27.000000000 +0100
+++ gdb-7.3.1/sim/ppc/device.c	2011-09-05 05:15:58.112770758 +0200
+@@ -1816,7 +1816,7 @@
+ /* I/O */
+ 
+ EXTERN_DEVICE\
+-(void volatile)
+(void)
+ device_error(device *me,
+ 	     const char *fmt,
+ 	     ...)
+diff -Naur gdb-7.3.1.orig/sim/ppc/device.h gdb-7.3.1/sim/ppc/device.h
+--- gdb-7.3.1.orig/sim/ppc/device.h	2001-12-14 01:22:12.000000000 +0100
+++ gdb-7.3.1/sim/ppc/device.h	2011-09-05 05:15:58.112770758 +0200
+@@ -727,7 +727,7 @@
+    */
+ 
+ EXTERN_DEVICE\
+-(void volatile) device_error
+(void) device_error
+ (device *me,
+  const char *fmt,
+  ...) __attribute__ ((format (printf, 2, 3)));
+diff -Naur gdb-7.3.1.orig/sim/ppc/hw_glue.c gdb-7.3.1/sim/ppc/hw_glue.c
+--- gdb-7.3.1.orig/sim/ppc/hw_glue.c	1999-04-16 03:35:09.000000000 +0200
+++ gdb-7.3.1/sim/ppc/hw_glue.c	2011-09-05 05:15:58.112770758 +0200
+@@ -194,13 +194,13 @@
+     if (glue->sizeof_output == 0)
+       device_error(me, "at least one reg property size must be nonzero");
+     if (glue->sizeof_output % sizeof(unsigned_word) != 0)
+-      device_error(me, "reg property size must be %d aligned", sizeof(unsigned_word));
+      device_error(me, "reg property size must be %zd aligned", sizeof(unsigned_word));
+     /* and the address */
+     device_address_to_attach_address(device_parent(me),
+ 				     &unit.address, &glue->space, &glue->address,
+ 				     me);
+     if (glue->address % (sizeof(unsigned_word) * max_nr_interrupts) != 0)
+-      device_error(me, "reg property address must be %d aligned",
+      device_error(me, "reg property address must be %zd aligned",
+ 		   sizeof(unsigned_word) * max_nr_interrupts);
+     glue->nr_outputs = glue->sizeof_output / sizeof(unsigned_word);
+     glue->output = zalloc(glue->sizeof_output);
--- a/contrib/crossrpms/patches/newlib-1.18.0-rtems4.10-20110419.diff
+++ b/contrib/crossrpms/patches/newlib-1.18.0-rtems4.10-20110419.diff
--- a/contrib/crossrpms/rtems4.10/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/arm/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4

 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
@@ -22,6 +22,6 @@ GCC_OPTS += --languages=cxx

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/arm/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/arm/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	arm-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-arm-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-arm-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-arm-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-arm-rtems4.10-binutils
 Requires:	rtems-4.10-arm-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-arm-rtems4.10-binutils
-# Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for arm-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-arm-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for arm-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for arm-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec
@@ -52,18 +52,30 @@ Name:		rtems-4.10-arm-rtems4.10-gdb
 Summary:	Gdb for target arm-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -71,34 +83,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -140,16 +131,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/arm-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -179,20 +163,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -243,6 +231,7 @@ GNU gdb targetting arm-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/arm-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/avr/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS +=

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/avr/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/avr/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	avr-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-avr-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-avr-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-avr-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-avr-rtems4.10-binutils
 Requires:	rtems-4.10-avr-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,13 +255,9 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

@@ -350,7 +344,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -622,7 +616,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-avr-rtems4.10-binutils
-# Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -640,7 +634,7 @@ Summary:        libgcc for avr-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-avr-rtems4.10-gcc-libgcc
@@ -755,7 +749,7 @@ Summary:      	C Library (newlib) for avr-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -776,7 +770,7 @@ Newlib C Library for avr-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec
@@ -52,18 +52,30 @@ Name:		rtems-4.10-avr-rtems4.10-gdb
 Summary:	Gdb for target avr-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -71,34 +83,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -140,16 +131,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/avr-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -179,20 +163,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libavr-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/avr-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/avr-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/avr-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -243,6 +231,7 @@ GNU gdb targetting avr-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/avr-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/bfin/Makefile.am
@@ -12,15 +12,15 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
 include ../gcc.am
 GCC_OPTS += --languages=cxx

-GDB_VERS = 6.5
+GDB_VERS = 7.3.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 12
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS += --disable-infos
--- a/contrib/crossrpms/rtems4.10/bfin/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/bfin/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/bfin/gdb-sources.add
+++ b/contrib/crossrpms/rtems4.10/bfin/gdb-sources.add
@@ -1,3 +1,13 @@
-Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
-%{?_without_sources:NoSource:	0}
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.5-bfinrtems-20090122.diff
+BuildRequires:  @rpmprefix@bfin-rtems4.10-binutils
+BuildRequires:  texinfo
+
+# The bfin simulator silently tries to conditionally build an SDL based GUI, 
+# but fails to link correctly
+# Force not building the GUI.
+%{!?suse:BuildConflicts: SDL-devel}
+%{?suse:BuildConflicts: libSDL-devel}
+
+%if "%{gdb_version}" == "7.3.1"
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-7.3.1-rtems4.10-20110919.diff
+%endif
--- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	bfin-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-bfin-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-bfin-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-bfin-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-bfin-rtems4.10-binutils
 Requires:	rtems-4.10-bfin-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-bfin-rtems4.10-binutils
-# Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for bfin-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-bfin-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for bfin-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for bfin-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec
@@ -45,24 +45,37 @@
 %define _host_rpmprefix %{nil}
 %endif

-%define gdb_version 6.5
-%define gdb_rpmvers %{expand:%(echo 6.5 | tr - _)} 
+%define gdb_version 7.3.1
+%define gdb_rpmvers %{expand:%(echo 7.3.1 | tr - _)} 

 Name:		rtems-4.10-bfin-rtems4.10-gdb
 Summary:	Gdb for target bfin-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	12%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -70,34 +83,23 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
+BuildRequires:  rtems-4.10-bfin-rtems4.10-binutils
+BuildRequires:  texinfo
+
+# The bfin simulator silently tries to conditionally build an SDL based GUI, 
+# but fails to link correctly
+# Force not building the GUI.
+%{!?suse:BuildConflicts: SDL-devel}
+%{?suse:BuildConflicts: libSDL-devel}
+
+%if "%{gdb_version}" == "7.3.1"
+Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2
+Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-7.3.1-rtems4.10-20110919.diff
 %endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
-
-
-Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
-%{?_without_sources:NoSource:	0}
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.5-bfinrtems-20090122.diff

 %description
 GDB for target bfin-rtems4.10
@@ -128,16 +130,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/bfin-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -161,20 +156,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libbfin-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -225,6 +224,7 @@ GNU gdb targetting bfin-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/bfin-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/h8300/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/h8300/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/h8300/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	h8300-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-h8300-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-h8300-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-h8300-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-h8300-rtems4.10-binutils
 Requires:	rtems-4.10-h8300-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-h8300-rtems4.10-binutils
-# Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for h8300-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-h8300-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for h8300-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for h8300-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec
@@ -52,22 +52,34 @@ Name:		rtems-4.10-h8300-rtems4.10-gdb
 Summary:	Gdb for target h8300-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace
 %ifos mingw mingw32
 # Mingw lacks functions required by the h8300 simulator
 %define build_sim --disable-sim
 %endif

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -75,34 +87,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -144,16 +135,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/h8300-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -183,20 +167,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libh8300-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/h8300-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/h8300-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/h8300-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -247,6 +235,7 @@ GNU gdb targetting h8300-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/h8300-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/i386/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/i386/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/i386/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	i386-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-i386-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-i386-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-i386-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-i386-rtems4.10-binutils
 Requires:	rtems-4.10-i386-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-i386-rtems4.10-binutils
-# Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for i386-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-i386-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for i386-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for i386-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec
@@ -52,18 +52,30 @@ Name:		rtems-4.10-i386-rtems4.10-gdb
 Summary:	Gdb for target i386-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -71,34 +83,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -140,16 +131,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/i386-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -179,20 +163,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libi386-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/i386-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/i386-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/i386-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -243,6 +231,7 @@ GNU gdb targetting i386-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/i386-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/lm32/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/lm32/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/lm32/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/lm32/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	lm32-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-lm32-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-lm32-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-lm32-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-lm32-rtems4.10-binutils
 Requires:	rtems-4.10-lm32-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-lm32-rtems4.10-binutils
-# Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for lm32-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-lm32-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for lm32-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for lm32-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec
@@ -52,22 +52,34 @@ Name:		rtems-4.10-lm32-rtems4.10-gdb
 Summary:	Gdb for target lm32-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace
 %ifos mingw mingw32
 # Mingw lacks functions required by the lm32 simulator
 %define build_sim --disable-sim
 %endif

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -75,34 +87,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -144,16 +135,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/lm32-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -183,20 +167,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/liblm32-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/lm32-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/lm32-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/lm32-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -247,6 +235,7 @@ GNU gdb targetting lm32-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/lm32-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/m32c/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m32c/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS +=

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/m32c/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/m32c/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	m32c-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-m32c-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-m32c-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-m32c-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-m32c-rtems4.10-binutils
 Requires:	rtems-4.10-m32c-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,13 +255,9 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

@@ -350,7 +344,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -622,7 +616,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-m32c-rtems4.10-binutils
-# Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -640,7 +634,7 @@ Summary:        libgcc for m32c-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-m32c-rtems4.10-gcc-libgcc
@@ -756,7 +750,7 @@ Summary:      	C Library (newlib) for m32c-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -777,7 +771,7 @@ Newlib C Library for m32c-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec
@@ -52,22 +52,34 @@ Name:		rtems-4.10-m32c-rtems4.10-gdb
 Summary:	Gdb for target m32c-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace
 %ifos mingw mingw32
 # Mingw lacks functions required by the m32c simulator
 %define build_sim --disable-sim
 %endif

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -75,34 +87,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -144,16 +135,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/m32c-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -183,20 +167,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm32c-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/m32c-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/m32c-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/m32c-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -247,6 +235,7 @@ GNU gdb targetting m32c-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/m32c-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/m32r/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m32r/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS +=

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/m32r/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/m32r/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	m32r-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-m32r-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-m32r-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-m32r-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-m32r-rtems4.10-binutils
 Requires:	rtems-4.10-m32r-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,13 +255,9 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

@@ -350,7 +344,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -622,7 +616,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-m32r-rtems4.10-binutils
-# Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -640,7 +634,7 @@ Summary:        libgcc for m32r-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-m32r-rtems4.10-gcc-libgcc
@@ -756,7 +750,7 @@ Summary:      	C Library (newlib) for m32r-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -777,7 +771,7 @@ Newlib C Library for m32r-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec
@@ -52,18 +52,30 @@ Name:		rtems-4.10-m32r-rtems4.10-gdb
 Summary:	Gdb for target m32r-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -71,34 +83,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -140,16 +131,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/m32r-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -179,20 +163,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm32r-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/m32r-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/m32r-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/m32r-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -243,6 +231,7 @@ GNU gdb targetting m32r-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/m32r-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/m68k/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/m68k/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/m68k/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	m68k-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-m68k-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-m68k-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-m68k-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-m68k-rtems4.10-binutils
 Requires:	rtems-4.10-m68k-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-m68k-rtems4.10-binutils
-# Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for m68k-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-m68k-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for m68k-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for m68k-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec
@@ -52,18 +52,30 @@ Name:		rtems-4.10-m68k-rtems4.10-gdb
 Summary:	Gdb for target m68k-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -71,34 +83,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -140,16 +131,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/m68k-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -179,20 +163,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm68k-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/m68k-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/m68k-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/m68k-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -243,6 +231,7 @@ GNU gdb targetting m68k-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/m68k-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/mips/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/mips/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/mips/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	mips-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-mips-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-mips-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-mips-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-mips-rtems4.10-binutils
 Requires:	rtems-4.10-mips-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-mips-rtems4.10-binutils
-# Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for mips-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-mips-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for mips-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for mips-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec
@@ -52,18 +52,30 @@ Name:		rtems-4.10-mips-rtems4.10-gdb
 Summary:	Gdb for target mips-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -71,34 +83,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -140,16 +131,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/mips-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -179,20 +163,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmips-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/mips-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/mips-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mips-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -243,6 +231,7 @@ GNU gdb targetting mips-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/mips-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am
@@ -7,6 +7,6 @@ include $(top_srcdir)/mkspec.am
 # We only want a gdb with a tx39 simulator in it.  We share the other tools
 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec
@@ -52,22 +52,34 @@ Name:		rtems-4.10-mipstx39-rtems4.10-gdb
 Summary:	Gdb for target mipstx39-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace
 %ifos mingw mingw32
 # Mingw lacks functions required by the mipstx39 simulator
 %define build_sim --disable-sim
 %endif

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -75,34 +87,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -144,16 +135,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/mipstx39-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -183,20 +167,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmipstx39-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/mipstx39-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/mipstx39-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mipstx39-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -247,6 +235,7 @@ GNU gdb targetting mipstx39-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/mipstx39-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/powerpc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/powerpc/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	powerpc-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-powerpc-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-powerpc-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-powerpc-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-powerpc-rtems4.10-binutils
 Requires:	rtems-4.10-powerpc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-powerpc-rtems4.10-binutils
-# Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for powerpc-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for powerpc-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for powerpc-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec
@@ -52,23 +52,35 @@ Name:		rtems-4.10-powerpc-rtems4.10-gdb
 Summary:	Gdb for target powerpc-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim
+
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}

 %if "%{_build}" != "%{_host}"
 # psim doesn't support Cdn-X
-%define build_sim --disable-sim
+%global build_sim --disable-sim
 %else
-%define build_sim --enable-sim --enable-sim-trace
+%global build_sim --enable-sim --enable-sim-trace
 %endif

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -76,34 +88,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -145,16 +136,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/powerpc-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -184,20 +168,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpowerpc-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/powerpc-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/powerpc-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/powerpc-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -248,6 +236,7 @@ GNU gdb targetting powerpc-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/powerpc-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/sh/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/sh/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/sh/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	sh-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-sh-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-sh-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-sh-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-sh-rtems4.10-binutils
 Requires:	rtems-4.10-sh-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-sh-rtems4.10-binutils
-# Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for sh-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-sh-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for sh-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for sh-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec
@@ -52,18 +52,30 @@ Name:		rtems-4.10-sh-rtems4.10-gdb
 Summary:	Gdb for target sh-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -71,34 +83,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -140,16 +131,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/sh-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -179,20 +163,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsh-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/sh-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/sh-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/sh-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -243,6 +231,7 @@ GNU gdb targetting sh-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/sh-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/contrib/crossrpms/rtems4.10/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.10/sparc/Makefile.am
@@ -12,7 +12,7 @@ BINUTILS_OPTS +=

 GCC_VERS = 4.4.6
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.18.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23`
@@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx

 GDB_VERS = 7.2
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 include ../gdb.am
 GDB_OPTS +=
--- a/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add
@@ -1,19 +1,13 @@
-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

 %if %build_cxx
-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

--- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	sparc-rtems4.10 gcc

 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,12 +107,6 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.3.1
 %endif

-%if 0%{?fc13}
-%global mpc_provided 0.8.1
-%global mpfr_provided 2.4.2
-%global gmp_provided 4.3.1
-%endif
-
 %if 0%{?el6}
 %global mpc_provided %{nil}
 %global mpfr_provided 2.4.1
@@ -125,6 +119,12 @@ BuildRequires:  %{_host_rpmprefix}gcc
 %global gmp_provided 4.1.4
 %endif

+%if 0%{?suse12_1}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.0.1
+%global gmp_provided 5.0.2
+%endif
+
 %if 0%{?suse11_3}
 %global mpc_provided 0.8.1
 %global mpfr_provided 2.4.2
@@ -209,7 +209,6 @@ BuildRequires:  %{_host_rpmprefix}libelf-devel >= %{libelf_required}


 %if %{defined cloog_required}
-%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
 %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
@@ -234,10 +233,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 BuildRequires:  rtems-4.10-sparc-rtems4.10-gcc = %{gcc_rpmvers}
 %endif

-%if "%{gcc_version}" >= "4.2.0"
+# Not strictly required, but patches may introduce a need to use them.
+# For reasons of simplicity, always require them.
 BuildRequires:	flex bison
-%endif
-

 BuildRequires:	texinfo >= 4.2
 BuildRequires:	rtems-4.10-sparc-rtems4.10-binutils
@@ -245,7 +243,7 @@ BuildRequires:	rtems-4.10-sparc-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-sparc-rtems4.10-binutils
 Requires:	rtems-4.10-sparc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:	rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-27%{?dist}

 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -257,21 +255,15 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel

 %global _gcclibdir %{_prefix}/lib

-%if "%{gcc_version}" == "4.4.5"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff
-%endif
 %if "%{gcc_version}" == "4.4.6"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff
+Patch0:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	0}

-%if "%{gcc_version}" == "4.4.5" 
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
 %if "%{gcc_version}" == "4.4.6" 
 Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
+Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff
 %endif
 %{?_without_sources:NoSource:	1}

@@ -362,7 +354,7 @@ cd ..
  ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif

-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE


  # Fix timestamps
@@ -635,7 +627,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-sparc-rtems4.10-binutils
-# Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+# Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 # License:	GPL

 # %if %build_infos
@@ -653,7 +645,7 @@ Summary:        libgcc for sparc-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-25%{?dist}
+Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-27%{?dist}
 License:	GPL

 %description -n rtems-4.10-sparc-rtems4.10-gcc-libgcc
@@ -829,7 +821,7 @@ Summary:      	C Library (newlib) for sparc-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}

 Requires:	rtems-4.10-newlib-common
@@ -850,7 +842,7 @@ Newlib C Library for sparc-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        25%{?dist}
+Release:        27%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

--- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec
+++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec
@@ -52,22 +52,34 @@ Name:		rtems-4.10-sparc-rtems4.10-gdb
 Summary:	Gdb for target sparc-rtems4.10
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 BuildRequires:  %{_host_rpmprefix}gcc

-%define build_sim --enable-sim
+%global build_sim --enable-sim

-%define build_sim --enable-sim --enable-sim-trace
+# Whether to build against system readline
+# Default: yes
+%bcond_without system_readline
+
+# Whether to build python support
+%if "%{_build}" != "%{_host}"
+# Can't build python Cdn-X
+%bcond_with python
+%else
+%bcond_without python
+%endif
+%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
+
+%global build_sim --enable-sim --enable-sim-trace
 %ifos mingw mingw32
 # Mingw lacks functions required by the sparc simulator
 %define build_sim --disable-sim
 %endif

-%if "%{gdb_version}" >= "6.6"
 # suse
 %if "%{?suse}" >= "10.3"
 BuildRequires: libexpat-devel
@@ -75,34 +87,13 @@ BuildRequires: libexpat-devel
 # Fedora/CentOS/Cygwin/MinGW
 BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
-%endif

-%if "%{gdb_version}" < "6.7"
-%if "%{_build}" != "%{_host}"
-BuildRequires:  %{_host_rpmprefix}termcap-devel
-%endif
-%bcond_with system_readline
-%else
-%bcond_without system_readline
-%endif
 %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel

-%if "%{gdb_version}" >= "6.8.50"
-%if "%{_build}" != "%{_host}"
-# Can't build python Cdn-X
-%bcond_with python
-%else
-%bcond_without python
-%endif
-%endif
-%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel}
-
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-
-
 Requires:	rtems-4.10-gdb-common

 %if "%{gdb_version}" == "7.2"
@@ -144,16 +135,9 @@ cd ..
    --disable-werror \
    %{build_sim} \
    %{?with_system_readline:--with-system-readline} \
-%if "%{gdb_version}" >= "6.6"
    --with-expat \
-%endif
-%if "%{gdb_version}" >= "6.8.50"
-%if %{with python}
-    --with-python \
-%else
-    --without-python \
-%endif
-%endif
+    %{?with_python:--with-python}%{!?with_python:--without-python} \
+    --with-gdb-datadir=%{_datadir}/sparc-rtems4.10-gdb \
    --prefix=%{_prefix} --bindir=%{_bindir} \
    --includedir=%{_includedir} --libdir=%{_libdir} \
    --mandir=%{_mandir} --infodir=%{_infodir}
@@ -183,20 +167,24 @@ cd ..
 # host library, installed to a bogus directory
  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsparc-rtems4.10-sim.a

-%if "%{gdb_version}" >= "7.0"
 # Bug in gdb-7.0, bogusly installs linux-only files
  somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/sparc-rtems4.10-gdb/syscalls/*.xml; do
    case $f in
    *linux.xml) rm -f $f;;
    *.xml) somethinguseful=1;;
    esac
  done
  if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/sparc-rtems4.10-gdb/syscalls"
  fi
-%endif

+%if "{gdb_version}" >= "7.3"
+%if ! %{with python}
+# gdb-7.3 doesn't honor --without-python correctly
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/sparc-rtems4.10-gdb/python
+%endif
+%endif
  cd ..

 # Extract %%__os_install_post into os_install_post~
@@ -247,6 +235,7 @@ GNU gdb targetting sparc-rtems4.10.
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
+%{?with_python:%{_datadir}/sparc-rtems4.10-gdb}

 %dir %{_mandir}
 %dir %{_mandir}/man1
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,88 @@
+2011-12-09	Chris Johns <chrisj@rtems.org>
+
+	PR 1968/filesystem
+	* libfs/src/rfs/rtems-rfs-file.c: Fix to the seek bug where a seek
+	to 0 after reading the end of the file did not point to the
+	correct block.
+	* libfs/src/rfs/rtems-rfs-rtems.h,
+	libfs/src/rfs/rtems-rfs-trace.c: Fix the trace flags. Used to fix
+	the bug.
+	
+2011-12-07	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	PR 1983/networking
+	* libnetworking/libc/gethostbyht.c (gethostent_r):
+	Abort if (!hostf).
+
+2011-11-30	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* librpc/src/rpc/clnt_udp.c (struct cu_data):
+	Introduce unions _cu_inbuf, _cu_outbuf to avoid aliasing.
+
+2011-11-28	Werner Almesberger <werner@almesberger.net>
+
+	PR 1961/cpukit
+	* score/src/coremsgsubmit.c: Close window caused by using message
+	pending count rather than directly obtaining unused buffer.
+
+2011-11-07	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	PR 1952/cpukit
+	* libmisc/untar/untar.c: Add return code for failure when unable to
+	write file.
+
+2011-11-03	Chris Johns <chrisj@rtems.org>
+
+	PR 1948/filesystem
+	* libfs/src/rfs/rtems-rfs-file-system.c,
+	libfs/src/rfs/rtems-rfs-file-system.h,
+	libfs/src/rfs/rtems-rfs-format.c, libfs/src/rfs/rtems-rfs-rtems.c:
+	Add support for mount passing an ASCIIZ string containing
+	configuration options.
+	* libblock/src/bdbuf.c: Fix state labels in trace output.
+
+2011-10-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libmisc/serdbg/serdbg.h (putDebugChar, getDebugChar):
+	Remove duplicate decls.
+
+2011-09-01	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1895/cpukit
+	* posix/src/mqueuerecvsupp.c, posix/src/pthreadjoin.c,
+	score/src/coretodmsecstoticks.c, score/src/coretodusectoticks.c,
+	score/src/timespectoticks.c: Ensure time conversions to ticks do not
+	ignore partial tick and return 1 less than desired.
+
+2011-07-31	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1855/cpukit
+	* posix/src/psignal.c, posix/src/psignalunblockthread.c,
+	posix/src/pthread.c, posix/src/pthreadjoin.c: Correct signal
+	processing during pthread_join. We are supposed to unblock the thread
+	waiting on a pthread_join(), dispatch the signal handler, account for
+	it potentially overwriting errno, and then have the thread return to
+	blocking within pthread_join().
+
+2011-07-31	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1867/cpukit
+	* posix/src/pthreadexit.c, posix/src/pthreadjoin.c: Correct
+	implementation of pthread_exit() and pthread_join() to support the
+	case where a thread is joinable but calls pthread_exit() before a
+	thread has attempted to join.
+
+2011-07-31	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1839/filesystem
+	* libcsupport/include/rtems/libio_.h, libcsupport/src/fchdir.c,
+	libcsupport/src/fdatasync.c, libcsupport/src/fpathconf.c,
+	libcsupport/src/fsync.c, libcsupport/src/ftruncate.c,
+	libcsupport/src/read.c, libcsupport/src/readv.c,
+	libcsupport/src/write.c, libcsupport/src/writev.c: Some calls did not
+	return proper status for permission errors or incorrectly permissions
+	at all.
+
 2011-07-19	Joel Sherrill <joel.sherrilL@OARcorp.com>

 	PR 1838/filesystem
--- a/cpukit/aclocal/version.m4
+++ b/cpukit/aclocal/version.m4
@@ -1,4 +1,4 @@
 AC_DEFUN([RTEMS_VERSIONING],
-m4_define([_RTEMS_VERSION],[4.10.1]))
+m4_define([_RTEMS_VERSION],[4.10.2]))

 m4_define([RTEMS_API],[4.10])
--- a/cpukit/libblock/src/bdbuf.c
+++ b/cpukit/libblock/src/bdbuf.c
@@ -291,7 +291,7 @@ void
 rtems_bdbuf_show_users (const char* where, rtems_bdbuf_buffer* bd)
 {
  const char* states[] =
-    { "EM", "FR", "CH", "AC", "AM", "MD", "SY", "TR" };
+    { "FR", "EM", "CH", "AC", "AM", "MD", "SY", "TR" };

  printf ("bdbuf:users: %15s: [%" PRIu32 " (%s)] %td:%td = %" PRIu32 " %s\n",
          where,
--- a/cpukit/libcsupport/include/rtems/libio_.h
+++ b/cpukit/libcsupport/include/rtems/libio_.h
@@ -124,19 +124,30 @@ extern rtems_libio_t *rtems_libio_iop_freelist;
  } while (0)

 /*
- *  rtems_libio_check_permissions
+ *  rtems_libio_check_permissions_with_error
 *
 *  Macro to check if a file descriptor is open for this operation.
+ *  On failure, return the user specified error.
 */

-#define rtems_libio_check_permissions(_iop, _flag)          \
+#define rtems_libio_check_permissions_with_error(_iop, _flag, _errno) \
  do {                                                      \
      if (((_iop)->flags & (_flag)) == 0) {                 \
-            rtems_set_errno_and_return_minus_one( EINVAL ); \
+            rtems_set_errno_and_return_minus_one( _errno ); \
            return -1;                                      \
      }                                                     \
  } while (0)

+/*
+ *  rtems_libio_check_permissions
+ *
+ *  Macro to check if a file descriptor is open for this operation.
+ *  On failure, return EINVAL
+ */
+
+#define rtems_libio_check_permissions(_iop, _flag) \
+   rtems_libio_check_permissions_with_error(_iop, _flag, EINVAL )
+
 /*
 *  rtems_filesystem_freenode
 *
--- a/cpukit/libcsupport/src/fchdir.c
+++ b/cpukit/libcsupport/src/fchdir.c
@@ -1,7 +1,7 @@
 /*
 *  fchdir() - compatible with SVr4, 4.4BSD and X/OPEN - Change Directory
 *
- *  COPYRIGHT (c) 1989-2000.
+ *  COPYRIGHT (c) 1989-2011.
 *  On-Line Applications Research Corporation (OAR).
 *
 *  The license and distribution terms for this file may be
@@ -35,12 +35,6 @@ int fchdir(
  iop = rtems_libio_iop( fd );
  rtems_libio_check_is_open(iop);

-  /*
-   *  Now process the fchmod().
-   */
-
-  rtems_libio_check_permissions( iop, LIBIO_FLAGS_READ );
-
  /*
   * Verify you can change directory into this node.
   */
--- a/cpukit/libcsupport/src/fdatasync.c
+++ b/cpukit/libcsupport/src/fdatasync.c
@@ -1,7 +1,7 @@
 /*
 *  fdatasync() - POSIX 1003.1b 6.6.2 - Synchronize the Data of a File
 *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2011.
 *  On-Line Applications Research Corporation (OAR).
 *
 *  The license and distribution terms for this file may be
@@ -29,7 +29,7 @@ int fdatasync(
  rtems_libio_check_fd( fd );
  iop = rtems_libio_iop( fd );
  rtems_libio_check_is_open(iop);
-  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
+  rtems_libio_check_permissions_with_error( iop, LIBIO_FLAGS_WRITE, EBADF );

  /*
   *  Now process the fdatasync().
--- a/cpukit/libcsupport/src/fpathconf.c
+++ b/cpukit/libcsupport/src/fpathconf.c
@@ -1,7 +1,7 @@
 /*
 *  fpathconf() - POSIX 1003.1b - 5.7.1 - Configurable Pathname Varables
 *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2011.
 *  On-Line Applications Research Corporation (OAR).
 *
 *  The license and distribution terms for this file may be
@@ -33,7 +33,6 @@ long fpathconf(
  rtems_libio_check_fd(fd);
  iop = rtems_libio_iop(fd);
  rtems_libio_check_is_open(iop);
-  rtems_libio_check_permissions(iop, LIBIO_FLAGS_READ);

  /*
   *  Now process the information request.
--- a/cpukit/libcsupport/src/fsync.c
+++ b/cpukit/libcsupport/src/fsync.c
@@ -1,7 +1,7 @@
 /*
 *  fsync() - POSIX 1003.1b 6.6.1 - Synchronize the State of a File
 *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2011.
 *  On-Line Applications Research Corporation (OAR).
 *
 *  The license and distribution terms for this file may be
@@ -29,7 +29,6 @@ int fsync(
  rtems_libio_check_fd( fd );
  iop = rtems_libio_iop( fd );
  rtems_libio_check_is_open(iop);
-  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );

  /*
   *  Now process the fsync().
--- a/cpukit/libcsupport/src/ftruncate.c
+++ b/cpukit/libcsupport/src/ftruncate.c
@@ -32,6 +32,7 @@ int ftruncate(
  rtems_libio_check_fd( fd );
  iop = rtems_libio_iop( fd );
  rtems_libio_check_is_open(iop);
+  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );

  /*
   *  Now process the ftruncate() request.
--- a/cpukit/libcsupport/src/read.c
+++ b/cpukit/libcsupport/src/read.c
@@ -32,7 +32,7 @@ ssize_t read(
  rtems_libio_check_is_open( iop );
  rtems_libio_check_buffer( buffer );
  rtems_libio_check_count( count );
-  rtems_libio_check_permissions( iop, LIBIO_FLAGS_READ );
+  rtems_libio_check_permissions_with_error( iop, LIBIO_FLAGS_READ, EBADF );

  /*
   *  Now process the read().
--- a/cpukit/libcsupport/src/readv.c
+++ b/cpukit/libcsupport/src/readv.c
@@ -5,7 +5,7 @@
 *
 *  http://www.opengroup.org/onlinepubs/009695399/functions/readv.html
 *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2011.
 *  On-Line Applications Research Corporation (OAR).
 *
 *  The license and distribution terms for this file may be
@@ -40,7 +40,7 @@ ssize_t readv(
  rtems_libio_check_fd( fd );
  iop = rtems_libio_iop( fd );
  rtems_libio_check_is_open( iop );
-  rtems_libio_check_permissions( iop, LIBIO_FLAGS_READ );
+  rtems_libio_check_permissions_with_error( iop, LIBIO_FLAGS_READ, EBADF );

  /*
   *  Argument validation on IO vector
--- a/cpukit/libcsupport/src/write.c
+++ b/cpukit/libcsupport/src/write.c
@@ -39,7 +39,7 @@ ssize_t write(
  rtems_libio_check_is_open( iop );
  rtems_libio_check_buffer( buffer );
  rtems_libio_check_count( count );
-  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
+  rtems_libio_check_permissions_with_error( iop, LIBIO_FLAGS_WRITE, EBADF );

  /*
   *  Now process the write() request.
--- a/cpukit/libcsupport/src/writev.c
+++ b/cpukit/libcsupport/src/writev.c
@@ -5,7 +5,7 @@
 *
 *  http://www.opengroup.org/onlinepubs/009695399/functions/writev.html
 *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2011.
 *  On-Line Applications Research Corporation (OAR).
 *
 *  The license and distribution terms for this file may be
@@ -41,7 +41,7 @@ ssize_t writev(
  rtems_libio_check_fd( fd );
  iop = rtems_libio_iop( fd );
  rtems_libio_check_is_open( iop );
-  rtems_libio_check_permissions( iop, LIBIO_FLAGS_WRITE );
+  rtems_libio_check_permissions_with_error( iop, LIBIO_FLAGS_WRITE, EBADF );

  /*
   *  Argument validation on IO vector
--- a/cpukit/libfs/src/rfs/rtems-rfs-file-system.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-file-system.c
@@ -196,6 +196,7 @@ int
 rtems_rfs_fs_open (const char*             name,
                   void*                   user,
                   uint32_t                flags,
+                   uint32_t                max_held_buffers,
                   rtems_rfs_file_system** fs)
 {
  rtems_rfs_group*       group;
@@ -224,7 +225,7 @@ rtems_rfs_fs_open (const char*             name,
  rtems_chain_initialize_empty (&(*fs)->release_modified);
  rtems_chain_initialize_empty (&(*fs)->file_shares);

-  (*fs)->max_held_buffers = RTEMS_RFS_FS_MAX_HELD_BUFFERS;
+  (*fs)->max_held_buffers = max_held_buffers;
  (*fs)->buffers_count = 0;
  (*fs)->release_count = 0;
  (*fs)->release_modified_count = 0;
--- a/cpukit/libfs/src/rfs/rtems-rfs-file-system.h
+++ b/cpukit/libfs/src/rfs/rtems-rfs-file-system.h
@@ -384,11 +384,14 @@ uint64_t rtems_rfs_fs_media_size (rtems_rfs_file_system* fs);
 * @param name The device to open.
 * @param fs The file system data filled in by this call.
 * @param user A pointer to user data.
+ * @param flags The initial set of user flags for the file system.
+ * @param max_held_buffers The maximum number of buffers the RFS holds.
 * @return int The error number (errno). No error if 0.
 */
 int rtems_rfs_fs_open (const char*             name,
                       void*                   user,
                       uint32_t                flags,
+                       uint32_t                max_held_buffers,
                       rtems_rfs_file_system** fs);

 /**
--- a/cpukit/libfs/src/rfs/rtems-rfs-file.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-file.c
@@ -424,7 +424,44 @@ rtems_rfs_file_seek (rtems_rfs_file_handle* handle,
   */
  if (pos < rtems_rfs_file_shared_get_size (rtems_rfs_file_fs (handle),
                                            handle->shared))
+  {
    rtems_rfs_file_set_bpos (handle, pos);
+    
+    /*
+     * If the file has a block check if it maps to the current position and it
+     * does not release it. That will force us to get the block at the new
+     * position when the I/O starts.
+     */
+    if (rtems_rfs_buffer_handle_has_block (&handle->buffer))
+    {
+      rtems_rfs_buffer_block block;
+      int                    rc;
+      
+      rc = rtems_rfs_block_map_find (rtems_rfs_file_fs (handle),
+                                     rtems_rfs_file_map (handle),
+                                     rtems_rfs_file_bpos (handle),
+                                     &block);
+      if (rc > 0)
+        return rc;
+      if (rtems_rfs_buffer_bnum (&handle->buffer) != block)
+      {        
+        rc = rtems_rfs_buffer_handle_release (rtems_rfs_file_fs (handle),
+                                              rtems_rfs_file_buffer (handle));
+        if (rc > 0)
+          return rc;
+      }
+    }
+  }
+  else
+  {
+    /*
+     * The seek is outside the current file so release any buffer. A write will
+     * extend the file.
+     */
+    int rc = rtems_rfs_file_io_release (handle);
+    if (rc > 0)
+      return rc;
+  }
  
  *new_pos = pos;
  return 0;
@@ -441,23 +478,25 @@ rtems_rfs_file_set_size (rtems_rfs_file_handle* handle,
  if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
    printf ("rtems-rfs: file-set-size: size=%" PRIu64 "\n", new_size);

-  /*
-   * Short cut for the common truncate on open call.
-   */
-  if (new_size == 0)
-  {
-    rc = rtems_rfs_block_map_free_all (rtems_rfs_file_fs (handle), map);
-    if (rc > 0)
-      return rc;
-  }
-  else
-  {
-    size = rtems_rfs_file_size (handle);
+  size = rtems_rfs_file_size (handle);
  
+  /*
+   * If the file is same size do nothing else grow or shrink it ?
+   *
+   * If the file does not change size do not update the times.
+   */
+  if (size != new_size)
+  {
    /*
-     * If the file is same size do nothing else grow or shrink it ?
+     * Short cut for the common truncate on open call.
     */
-    if (size != new_size)
+    if (new_size == 0)
+    {
+      rc = rtems_rfs_block_map_free_all (rtems_rfs_file_fs (handle), map);
+      if (rc > 0)
+        return rc;
+    }
+    else
    {
      if (size < new_size)
      {
@@ -567,13 +606,13 @@ rtems_rfs_file_set_size (rtems_rfs_file_handle* handle,
                                         rtems_rfs_file_bpos (handle));
      }
    }
+
+    handle->shared->size.count  = rtems_rfs_block_map_count (map);
+    handle->shared->size.offset = rtems_rfs_block_map_size_offset (map);
+
+    if (rtems_rfs_file_update_mtime (handle))
+      handle->shared->mtime = time (NULL);
  }
-
-  handle->shared->size.count  = rtems_rfs_block_map_count (map);
-  handle->shared->size.offset = rtems_rfs_block_map_size_offset (map);
-
-  if (rtems_rfs_file_update_mtime (handle))
-    handle->shared->mtime = time (NULL);
  
  return 0;
 }
--- a/cpukit/libfs/src/rfs/rtems-rfs-format.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-format.c
@@ -465,7 +465,9 @@ rtems_rfs_write_root_dir (const char* name)
  /*
   * External API so returns -1.
   */
-  rc = rtems_rfs_fs_open (name, NULL, RTEMS_RFS_FS_FORCE_OPEN, &fs);
+  rc = rtems_rfs_fs_open (name, NULL,
+                          RTEMS_RFS_FS_FORCE_OPEN | RTEMS_RFS_FS_NO_LOCAL_CACHE,
+                          0, &fs);
  if (rc < 0)
  {
    printf ("rtems-rfs: format: file system open failed: %d: %s\n",
--- a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c
@@ -1268,8 +1268,40 @@ rtems_rfs_rtems_initialise (rtems_filesystem_mount_table_entry_t* mt_entry,
 {
  rtems_rfs_rtems_private* rtems;
  rtems_rfs_file_system*   fs;
+  uint32_t                 flags = 0;
+  uint32_t                 max_held_buffers = RTEMS_RFS_FS_MAX_HELD_BUFFERS;
+  const char*              options = data;
  int                      rc;

+  /*
+   * Parse the options the user specifiies.
+   */
+  while (options)
+  {
+    printf ("options=%s\n", options);
+    if (strncmp (options, "hold-bitmaps",
+                 sizeof ("hold-bitmaps") - 1) == 0)
+      flags |= RTEMS_RFS_FS_BITMAPS_HOLD;
+    else if (strncmp (options, "no-local-cache",
+                      sizeof ("no-local-cache") - 1) == 0)
+      flags |= RTEMS_RFS_FS_NO_LOCAL_CACHE;
+    else if (strncmp (options, "max-held-bufs",
+                      sizeof ("max-held-bufs") - 1) == 0)
+    {
+      max_held_buffers = strtoul (options + sizeof ("max-held-bufs"), 0, 0);
+    }
+    else
+      return rtems_rfs_rtems_error ("initialise: invalid option", EINVAL);
+
+    options = strchr (options, ',');
+    if (options)
+    {
+      ++options;
+      if (*options == '\0')
+        options = NULL;
+    }
+  }
+  
  rtems = malloc (sizeof (rtems_rfs_rtems_private));
  if (!rtems)
    return rtems_rfs_rtems_error ("initialise: local data", ENOMEM);
@@ -1291,7 +1323,7 @@ rtems_rfs_rtems_initialise (rtems_filesystem_mount_table_entry_t* mt_entry,
    return rtems_rfs_rtems_error ("initialise: cannot lock access  mutex", rc);
  }
  
-  rc = rtems_rfs_fs_open (mt_entry->dev, rtems, 0, &fs);
+  rc = rtems_rfs_fs_open (mt_entry->dev, rtems, flags, max_held_buffers, &fs);
  if (rc)
  {
    free (rtems);
--- a/cpukit/libfs/src/rfs/rtems-rfs-rtems.h
+++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems.h
@@ -25,12 +25,12 @@
 #include <errno.h>

 /**
- * RTEMS RFS RTEMS Error Enable. Set to 1 to printing of errors. Default is off.
+ * RTEMS RFS RTEMS Error Enable. Set to 1 for printing of errors. Default is off.
 */
 #define RTEMS_RFS_RTEMS_ERROR 0

 /**
- * RTEMS RFS RTEMS Trace Enable. Set to 1 to printing of errors. Default is off.
+ * RTEMS RFS RTEMS Trace Enable. Set to 1 for printing of errors. Default is off.
 */
 #define RTEMS_RFS_RTEMS_TRACE 0

@@ -72,13 +72,14 @@ int rtems_rfs_rtems_error (const char* mesg, int error);
 #define RTEMS_RFS_RTEMS_DEBUG_READLINK      (1 << 9)
 #define RTEMS_RFS_RTEMS_DEBUG_FCHMOD        (1 << 10)
 #define RTEMS_RFS_RTEMS_DEBUG_STAT          (1 << 11)
-#define RTEMS_RFS_RTEMS_DEBUG_DIR_RMNOD     (1 << 12)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_OPEN     (1 << 13)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_CLOSE    (1 << 14)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_READ     (1 << 15)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_WRITE    (1 << 16)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_LSEEK    (1 << 17)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_FTRUNC   (1 << 18)
+#define RTEMS_RFS_RTEMS_DEBUG_RENAME        (1 << 12)
+#define RTEMS_RFS_RTEMS_DEBUG_DIR_RMNOD     (1 << 13)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_OPEN     (1 << 14)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_CLOSE    (1 << 15)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_READ     (1 << 16)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_WRITE    (1 << 17)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_LSEEK    (1 << 18)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_FTRUNC   (1 << 19)

 /**
 * Call to check if this part is bring traced. If RTEMS_RFS_RTEMS_TRACE is
--- a/cpukit/libfs/src/rfs/rtems-rfs-trace.c
+++ b/cpukit/libfs/src/rfs/rtems-rfs-trace.c
@@ -92,7 +92,8 @@ rtems_rfs_trace_shell_command (int argc, char *argv[])
    "symlink-read",
    "file-open",
    "file-close",
-    "file-io"
+    "file-io",
+    "file-set"
  };

  rtems_rfs_trace_mask set_value = 0;
@@ -140,9 +141,9 @@ rtems_rfs_trace_shell_command (int argc, char *argv[])
          if (strcmp (argv[arg], table[t]) == 0)
          {
            if (set)
-              set_value = 1 << t;
+              set_value = 1ULL << t;
            else
-              clear_value = 1 << t;
+              clear_value = 1ULL << t;
            break;
          }
        }
--- a/cpukit/libmisc/serdbg/serdbg.h
+++ b/cpukit/libmisc/serdbg/serdbg.h
@@ -139,42 +139,6 @@ int serdbg_open
 |    0 on success, -1 and errno otherwise                                   |
 \*=========================================================================*/

-/*=========================================================================*\
-| Function:                                                                 |
-\*-------------------------------------------------------------------------*/
-void putDebugChar
-/*-------------------------------------------------------------------------*\
-| Purpose:                                                                  |
-|    send one character to serial port                                      |
-+---------------------------------------------------------------------------+
-| Input Parameters:                                                         |
-\*-------------------------------------------------------------------------*/
-(
- char c  /* character to print */
- );
-/*-------------------------------------------------------------------------*\
-| Return Value:                                                             |
-|    <none>                                                                 |
-\*=========================================================================*/
-
-/*=========================================================================*\
-| Function:                                                                 |
-\*-------------------------------------------------------------------------*/
-int getDebugChar
-/*-------------------------------------------------------------------------*\
-| Purpose:                                                                  |
-|    wait for one character from serial port                                |
-+---------------------------------------------------------------------------+
-| Input Parameters:                                                         |
-\*-------------------------------------------------------------------------*/
-(
- void  /* none */
- );
-/*-------------------------------------------------------------------------*\
-| Return Value:                                                             |
-|    received character                                                     |
-\*=========================================================================*/
-
 /*
 * Assumed to be provided by the BSP
 */
--- a/cpukit/libmisc/untar/untar.c
+++ b/cpukit/libmisc/untar/untar.c
@@ -205,6 +205,7 @@ Untar_FromMemory(
               if (n != len)
               {
                  printk("untar: Error during write\n");
+                  retval  = UNTAR_FAIL;
                  break;
               }
               ptr += 512;
--- a/cpukit/libnetworking/libc/gethostbyht.c
+++ b/cpukit/libnetworking/libc/gethostbyht.c
@@ -223,7 +223,7 @@ struct hostent* gethostent_r(char* buf, int len)
  int    curlen;
  
   
-  if (hostf<0) return 0;
+  if (!hostf) return 0;
  fseek(hostf,0,SEEK_END);
  curlen=ftell(hostf);
  fseek(hostf,0,SEEK_SET);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joel Sherrill	0ae9ee1da4	Upgrade to 4.10.2	2011-12-13 14:34:19 +00:00
Joel Sherrill	a9069337a5	2011-12-09 Joel Sherrill <joel.sherrilL@OARcorp.com> * math/init.c, mathf/init.c: Use DEVFS since we do have devices.	2011-12-09 19:19:28 +00:00
Chris Johns	afaa753b5a	2011-12-09 Chris Johns <chrisj@rtems.org> PR 1968/filesystem * libfs/src/rfs/rtems-rfs-file.c: Fix to the seek bug where a seek to 0 after reading the end of the file did not point to the correct block. * libfs/src/rfs/rtems-rfs-rtems.h, libfs/src/rfs/rtems-rfs-trace.c: Fix the trace flags. Used to fix the bug.	2011-12-09 07:12:27 +00:00
Joel Sherrill	10fa27d64d	2011-12-07 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1984/doc * user/conf.t: Change CONFIGURE_MINIMUM_STACK_SIZE to CONFIGURE_MINIMUM_TASK_STACK_SIZE.	2011-12-07 20:08:49 +00:00
Ralf Corsepius	d1cbfaa89e	2011-12-07 Ralf Corsépius <ralf.corsepius@rtems.org> PR 1983/networking * libnetworking/libc/gethostbyht.c (gethostent_r): Abort if (!hostf).	2011-12-07 06:51:43 +00:00
Ralf Corsepius	2fc9706a56	2011-11-30 Ralf Corsépius <ralf.corsepius@rtems.org> * librpc/src/rpc/clnt_udp.c (struct cu_data): Introduce unions _cu_inbuf, _cu_outbuf to avoid aliasing.	2011-11-30 07:00:47 +00:00
Joel Sherrill	3d83ae583c	2011-11-28 Werner Almesberger <werner@almesberger.net> PR 1961/cpukit * score/src/coremsgsubmit.c: Close window caused by using message pending count rather than directly obtaining unused buffer.	2011-11-28 16:36:31 +00:00
Ralf Corsepius	9981ef0e6b	Housekeeping.	2011-11-16 03:22:10 +00:00
Ralf Corsepius	5c872dee16	Regenerate.	2011-11-16 03:20:24 +00:00
Ralf Corsepius	e2292101d8	Bump GCC_RPMREL.	2011-11-16 03:19:29 +00:00
Ralf Corsepius	09b41d2262	Back port from CVS-HEAD.	2011-11-16 03:18:43 +00:00
Joel Sherrill	5b6f5447c5	2011-11-09 Jennifer Averett <jennifer.averett@oarcorp.com> PR 1934/bsps * libchip/serial/ns16550.c: Change to unsigned variable.	2011-11-09 20:51:08 +00:00
Joel Sherrill	8d4d978d67	Move entries to correct file.	2011-11-09 18:52:25 +00:00
Joel Sherrill	294a609e9f	2011-11-09 Werner Almesberger <werner@almesberger.net> PR 1954/cpukit * rtems/score/lm32.h: Protect against macro expansion.	2011-11-09 18:51:29 +00:00
Joel Sherrill	e3fbffb712	2011-11-09 Werner Almesberger <werner@almesberger.net> PR 1957/cpukit * score/include/rtems/score/coremutex.h, score/inline/rtems/score/threadmp.inl: Add parentheses to protect macro arguments.	2011-11-09 18:44:01 +00:00
Joel Sherrill	c937e8fc18	2011-11-09 Werner Almesberger <werner@almesberger.net> PR 1955/cpukit * rtems/score/cpu.h: Convert CPU_swap_u16 into a static inline.	2011-11-09 15:15:40 +00:00
Joel Sherrill	41fb7c43f3	2011-11-07 Ralf Corsepius <ralf.corsepius@rtems.org> PR 1952/cpukit * libmisc/untar/untar.c: Add return code for failure when unable to write file.	2011-11-07 21:42:37 +00:00
Chris Johns	4c5e2fcf7e	2011-11-03 Chris Johns <chrisj@rtems.org> PR 1948/filesystem * libfs/src/rfs/rtems-rfs-file-system.c, libfs/src/rfs/rtems-rfs-file-system.h, libfs/src/rfs/rtems-rfs-format.c, libfs/src/rfs/rtems-rfs-rtems.c: Add support for mount passing an ASCIIZ string containing configuration options. * libblock/src/bdbuf.c: Fix state labels in trace output.	2011-11-03 04:23:07 +00:00
Ralf Corsepius	478fb7eb99	GDB_RPMREL = 2.	2011-10-31 08:08:47 +00:00
Ralf Corsepius	424b1bddeb	2011-10-09 Ralf Corsépius <ralf.corsepius@rtems.org> * libmisc/serdbg/serdbg.h (putDebugChar, getDebugChar): Remove duplicate decls.	2011-10-09 04:48:19 +00:00
Ralf Corsepius	981a831e72	Regenerate.	2011-09-19 22:45:55 +00:00
Ralf Corsepius	9b0be4d6d7	Bump GDB_RPMREL.	2011-09-19 22:45:24 +00:00
Ralf Corsepius	234e280605	Renamer from CVS-HEAD.	2011-09-19 22:44:36 +00:00
Ralf Corsepius	224463dd16	Upgrade to gdb-7.3.1	2011-09-19 22:43:38 +00:00
Ralf Corsepius	84019c592b	Sync with CVS-HEAD.	2011-09-19 22:42:33 +00:00
Joel Sherrill	a1bfb335c0	2011-09-01 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1895/cpukit * posix/src/mqueuerecvsupp.c, posix/src/pthreadjoin.c, score/src/coretodmsecstoticks.c, score/src/coretodusectoticks.c, score/src/timespectoticks.c: Ensure time conversions to ticks do not ignore partial tick and return 1 less than desired.	2011-09-01 18:24:57 +00:00
Ralf Corsepius	bebd101268	Remove.	2011-08-29 09:49:06 +00:00
Ralf Corsepius	1d204aed83	Cleanup.	2011-08-29 07:28:29 +00:00
Ralf Corsepius	1ea6e6ecc5	Regenerate.	2011-08-29 05:40:15 +00:00
Ralf Corsepius	b1e0b6a787	GCC_RPMREL = 3.	2011-08-29 05:38:47 +00:00
Ralf Corsepius	1b818282a9	Abandon gcc-4.4.5. gcc-core-4.4.6-rtems4.10-20110829.diff. gcc-g++-4.4.6-rtems4.10-20110829.diff.	2011-08-29 05:36:02 +00:00
Ralf Corsepius	089ab39484	New (Address OS X 10.7.1 build breakdowns).	2011-08-29 05:32:49 +00:00
Joel Sherrill	0b10f44e2d	2011-08-21 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1890/cpukit * psxmsgq01/init.c: POSIX says msg_prio is allowed to be NULL.	2011-08-21 19:59:56 +00:00
Sebastian Huber	391f35c8ff	2011-08-15 Julien Delange <julien.delange@gmail.com> * irq/irq.c: Removed printk() before the interrupt initialization because it somehow destroys the interrupt context. * make/custom/nds.cfg: Enable Thumb interwork. * startup/bspstart.c: Set default exception handler.	2011-08-15 08:14:31 +00:00
Ralf Corsepius	ded0bfa42b	Abandon fedora-13.	2011-08-04 04:57:46 +00:00
Joel Sherrill	eaad7ce078	2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1855/cpukit * Makefile.am, configure.ac: Correct signal processing during pthread_join. We are supposed to unblock the thread waiting on a pthread_join(), dispatch the signal handler, account for it potentially overwriting errno, and then have the thread return to blocking within pthread_join(). * psxeintr_join/.cvsignore, psxeintr_join/Makefile.am, psxeintr_join/init.c, psxeintr_join/psxeintr_join.doc, psxeintr_join/psxeintr_join.scn: New files.	2011-07-31 22:40:53 +00:00
Joel Sherrill	426eb35f03	2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1855/cpukit * posix/src/psignal.c, posix/src/psignalunblockthread.c, posix/src/pthread.c, posix/src/pthreadjoin.c: Correct signal processing during pthread_join. We are supposed to unblock the thread waiting on a pthread_join(), dispatch the signal handler, account for it potentially overwriting errno, and then have the thread return to blocking within pthread_join().	2011-07-31 22:40:43 +00:00
Joel Sherrill	0126591e0a	2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1867/cpukit * Makefile.am, configure.ac, psx12/task.c, psxkey03/init.c, psxrwlock01/test.c: Correct implementation of pthread_exit() and pthread_join() to support the case where a thread is joinable but calls pthread_exit() before a thread has attempted to join. * psx16/.cvsignore, psx16/Makefile.am, psx16/init.c, psx16/psx16.doc, psx16/psx16.scn: New files.	2011-07-31 16:16:43 +00:00
Joel Sherrill	1389334318	2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1867/cpukit * posix/src/pthreadexit.c, posix/src/pthreadjoin.c: Correct implementation of pthread_exit() and pthread_join() to support the case where a thread is joinable but calls pthread_exit() before a thread has attempted to join.	2011-07-31 16:16:30 +00:00
Joel Sherrill	a9ed9230c6	2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1839/filesystem * libcsupport/include/rtems/libio_.h, libcsupport/src/fchdir.c, libcsupport/src/fdatasync.c, libcsupport/src/fpathconf.c, libcsupport/src/fsync.c, libcsupport/src/ftruncate.c, libcsupport/src/read.c, libcsupport/src/readv.c, libcsupport/src/write.c, libcsupport/src/writev.c: Some calls did not return proper status for permission errors or incorrectly permissions at all.	2011-07-31 14:12:29 +00:00
Joel Sherrill	5691dc6d5d	2011-07-29 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1864/doc * user/conf.t: Add missing documentation for CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUE_DESCRIPTORS, CONFIGURE_MAXIMUM_POSIX_BARRIERS , CONFIGURE_MAXIMUM_POSIX_SPINLOCKS, CONFIGURE_MAXIMUM_POSIX_RWLOCKS.	2011-07-29 19:50:32 +00:00
Joel Sherrill	c2f26f0d5e	2011-07-26 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1851/doc * user/conf.t: Fix typo in CONFIGURE_MESSAGE_BUFFER_MEMORY example.	2011-07-26 14:13:33 +00:00
Joel Sherrill	ca356b5d3a	2011-07-22 Joel Sherrill <joel.sherrilL@OARcorp.com> PR 1845/bsps * make/custom/rtl22xx_t.cfg: Remove unused line with what is now invalid syntax.	2011-07-22 13:12:26 +00:00
Joel Sherrill	395fd11d2e	2011-07-21 Jorge Lopez <jorge.lopez.trescastro@esa.int> PR 1766/bsps * clock/ckinit.c: Add missing read of Timer_Counter_1.	2011-07-21 20:52:27 +00:00