Add rtems-4.11 support using gcc 4.6.3.

rtems/build-4.11-targets.sh

@@ -0,0 +1,25 @@
+#! /bin/sh
+
+if [ $# -ne 1 ]; then
+  echo "error: no prefix provided"
+  exit 1
+fi
+
+targets="arm avr bfin h8300 lm32 m32c m32r m68k mips powerpc sh sparc"
+
+log="rtems4.11-build-tools-results.txt"
+
+echo "RTEMS 4.11 Build Results $(date)" > ${log}
+
+for t in ${targets}
+do
+  ../source-builder/sb-set-builder --log=l-${t}.txt \
+                                   --prefix=$1 \
+                                   --target=${t}-rtems4.11 \
+                                   rtems-tools-4.11
+  if [ $? -eq 0 ]; then
+    echo "${t}-rtems4.11 passed" >> ${log}
+  else
+    echo "${t}-rtems4.11 FAILED" >> ${log}
+  fi
+done

rtems/config/rtems-binutils-2.22-1.cfg

@@ -0,0 +1,15 @@
+#
+# Binutils 2.22.
+#
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define binutils_version 2.22
+
+Patch0: binutils-2.22-rtems4.11-20120427.diff
+
+#
+# The binutils build instructions. We use 2.xx Release 1.
+#
+%include %{_configdir}/binutils-2-1.cfg

rtems/config/rtems-gcc-4.6.3-newlib-1.20.0-1.cfg

@@ -0,0 +1,47 @@
+#
+# GCC 4.6.3, Newlib 1.20.0
+#
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define gcc_version    4.6.3
+%define newlib_version 1.20.0
+%define mpfr_version   3.0.1
+%define mpc_version    0.8.2
+%define gmp_version    5.0.5
+
+%define with_threads 1
+%define with_plugin  0
+%define with_iconv   1
+
+#
+# AVR C++ does not work.
+#   configure: error: unable to detect exception model
+#
+%if %{_target} == xavr-rtems4.11
+%define enable_cxx 0
+%endif
+
+#
+# M32C C++ does not work.
+#   gcc-4.4.7/libstdc++-v3/src/mt_allocator.cc:76: error: cast from 'void*' to 'size_t' loses precision
+#
+%if %{_target} == xm32c-rtems4.11
+%define enable_cxx 0
+%endif
+
+%ifn %{defined enable_cxx}
+%define enable_cxx 1
+%endif
+
+#
+# The RTEMS 4.11 patches
+#
+Patch0:  gcc-core-4.6.3-rtems4.11-20120303.diff
+Patch10: newlib-1.20.0-rtems4.11-20121011.diff
+
+#
+# The gcc/newlib build instructions. We use 4.4 Release 1.
+#
+%include %{_configdir}/gcc-4.6-1.cfg

rtems/config/rtems-gdb-7.5-1.cfg

@@ -0,0 +1,15 @@
+#
+# GDB 7.5.
+#
+
+%include %{_configdir}/checks.cfg
+%include %{_configdir}/base.cfg
+
+%define gdb_version 7.5
+
+Patch0: gdb-7.5-rtems4.11-20121003.diff
+
+#
+# The gdb build instructions. We use 7.xx Release 1.
+#
+%include %{_configdir}/gdb-7-1.cfg

rtems/config/rtems-tools-4.11.bset

@@ -0,0 +1,22 @@
+#
+# Tools Set for RTEMS 4.11
+#
+
+%define rtems_version 4.11
+
+%define release 1
+
+package: rtems-%{rtems_version}-%{_target}-%{release}
+
+#
+# Project custom message
+#
+%define gcc_version_message RTEMS %{rtems_version}-%{release},gcc-%{gcc_version}/newlib-%{newlib_version}
+
+#
+# Tools configuration.
+#
+rtems-binutils-2.22-1
+rtems-gcc-4.6.3-newlib-1.20.0-1
+rtems-gdb-7.5-1
+

rtems/patches/binutils-2.22-rtems4.11-20120427.diff

@@ -0,0 +1,568 @@
+diff -Naur binutils-2.22.orig/bfd/ChangeLog binutils-2.22/bfd/ChangeLog
+--- binutils-2.22.orig/bfd/ChangeLog	2011-11-21 12:55:49.000000000 +0100
++++ binutils-2.22/bfd/ChangeLog	2012-04-27 06:43:05.275941484 +0200
+@@ -1,3 +1,14 @@
++2012-04-27  Ralf Corsépius  <ralf.corsepius@rtems.org>
++
++	Backport from mainline:
++
++	2012-04-24  Alan Modra  <amodra@gmail.com>
++	PR ld/13991
++	* bfd/elf-bfd.h (_bfd_elf_link_just_syms): Define as
++	_bfd_generic_link_just_syms.
++	* bfd/elflink.c (_bfd_elf_link_just_syms): Delete.
++	* bfd/linker.c (_bfd_generic_link_just_syms): Set sec_info_type.
++
+ 2011-11-21  Tristan Gingold  <gingold@adacore.com>
+ 
+ 	* configure.in: Bump version to 2.22
+diff -Naur binutils-2.22.orig/bfd/elf-bfd.h binutils-2.22/bfd/elf-bfd.h
+--- binutils-2.22.orig/bfd/elf-bfd.h	2011-08-17 02:39:38.000000000 +0200
++++ binutils-2.22/bfd/elf-bfd.h	2012-04-27 06:43:05.275941484 +0200
+@@ -1807,8 +1807,7 @@
+   (bfd *, asection *, void *);
+ extern asection *_bfd_elf_check_kept_section
+   (asection *, struct bfd_link_info *);
+-extern void _bfd_elf_link_just_syms
+-  (asection *, struct bfd_link_info *);
++#define _bfd_elf_link_just_syms _bfd_generic_link_just_syms
+ extern void _bfd_elf_copy_link_hash_symbol_type
+   (bfd *, struct bfd_link_hash_entry *, struct bfd_link_hash_entry *);
+ extern bfd_boolean _bfd_elf_size_group_sections
+diff -Naur binutils-2.22.orig/bfd/elflink.c binutils-2.22/bfd/elflink.c
+--- binutils-2.22.orig/bfd/elflink.c	2011-11-21 10:29:26.000000000 +0100
++++ binutils-2.22/bfd/elflink.c	2012-04-27 06:43:05.285941042 +0200
+@@ -1,6 +1,6 @@
+ /* ELF linking support for BFD.
+    Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-   2005, 2006, 2007, 2008, 2009, 2010, 2011
++   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+    Free Software Foundation, Inc.
+ 
+    This file is part of BFD, the Binary File Descriptor library.
+@@ -6644,17 +6644,6 @@
+   return TRUE;
+ }
+ 
+-/* Indicate that we are only retrieving symbol values from this
+-   section.  */
+-
+-void
+-_bfd_elf_link_just_syms (asection *sec, struct bfd_link_info *info)
+-{
+-  if (is_elf_hash_table (info->hash))
+-    sec->sec_info_type = ELF_INFO_TYPE_JUST_SYMS;
+-  _bfd_generic_link_just_syms (sec, info);
+-}
+-
+ /* Make sure sec_info_type is cleared if sec_info is cleared too.  */
+ 
+ static void
+diff -Naur binutils-2.22.orig/bfd/linker.c binutils-2.22/bfd/linker.c
+--- binutils-2.22.orig/bfd/linker.c	2011-09-16 03:15:19.000000000 +0200
++++ binutils-2.22/bfd/linker.c	2012-04-27 06:43:05.287940980 +0200
+@@ -1,6 +1,6 @@
+ /* linker.c -- BFD linker routines
+    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
++   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+    Free Software Foundation, Inc.
+    Written by Steve Chamberlain and Ian Lance Taylor, Cygnus Support
+ 
+@@ -810,6 +810,7 @@
+ _bfd_generic_link_just_syms (asection *sec,
+ 			     struct bfd_link_info *info ATTRIBUTE_UNUSED)
+ {
++  sec->sec_info_type = ELF_INFO_TYPE_JUST_SYMS;
+   sec->output_section = bfd_abs_section_ptr;
+   sec->output_offset = sec->vma;
+ }
+diff -Naur binutils-2.22.orig/binutils/ar.c binutils-2.22/binutils/ar.c
+--- binutils-2.22.orig/binutils/ar.c	2011-11-21 10:29:28.000000000 +0100
++++ binutils-2.22/binutils/ar.c	2012-04-27 06:43:05.288940951 +0200
+@@ -37,7 +37,6 @@
+ #include "filenames.h"
+ #include "binemul.h"
+ #include "plugin.h"
+-#include <sys/stat.h>
+ 
+ #ifdef __GO32___
+ #define EXT_NAME_LEN 3		/* Bufflen of addition to name if it's MS-DOS.  */
+diff -Naur binutils-2.22.orig/binutils/bucomm.c binutils-2.22/binutils/bucomm.c
+--- binutils-2.22.orig/binutils/bucomm.c	2011-03-25 18:51:10.000000000 +0100
++++ binutils-2.22/binutils/bucomm.c	2012-04-27 06:43:05.289940923 +0200
+@@ -1,6 +1,6 @@
+ /* bucomm.c -- Bin Utils COMmon code.
+    Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002,
+-   2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011
++   2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+    Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+@@ -29,7 +29,6 @@
+ #include "filenames.h"
+ #include "libbfd.h"
+ 
+-#include <sys/stat.h>
+ #include <time.h>		/* ctime, maybe time_t */
+ #include <assert.h>
+ #include "bucomm.h"
+diff -Naur binutils-2.22.orig/binutils/budbg.h binutils-2.22/binutils/budbg.h
+--- binutils-2.22.orig/binutils/budbg.h	2009-09-02 09:22:31.000000000 +0200
++++ binutils-2.22/binutils/budbg.h	2012-04-27 06:43:05.289940923 +0200
+@@ -1,5 +1,5 @@
+ /* budbg.c -- Interfaces to the generic debugging information routines.
+-   Copyright 1995, 1996, 2002, 2003, 2005, 2007, 2008
++   Copyright 1995, 1996, 2002, 2003, 2005, 2007, 2008, 2012
+    Free Software Foundation, Inc.
+    Written by Ian Lance Taylor <ian@cygnus.com>.
+ 
+@@ -23,8 +23,6 @@
+ #ifndef BUDBG_H
+ #define BUDBG_H
+ 
+-#include <stdio.h>
+-
+ /* Routine used to read generic debugging information.  */
+ 
+ extern void *read_debugging_info (bfd *, asymbol **, long, bfd_boolean);
+diff -Naur binutils-2.22.orig/binutils/ChangeLog binutils-2.22/binutils/ChangeLog
+--- binutils-2.22.orig/binutils/ChangeLog	2011-11-21 10:29:28.000000000 +0100
++++ binutils-2.22/binutils/ChangeLog	2012-04-27 06:43:05.287940980 +0200
+@@ -1,3 +1,25 @@
++2012-02-09  Alan Modra  <amodra@gmail.com>
++
++	* sysdep.h: Include sys/stat.h here.
++	* ar.c: Don't include headers already included by sysdep.h.
++	* bucomm.c: Likewise.
++	* budbg.h: Likewise.
++	* dlltool.h: Likewise.
++	* elfedit.c: Likewise.
++	* nlmconv.c: Likewise.
++	* objcopy.c: Likewise.
++	* objdump.c: Likewise.
++	* objdump.h: Likewise.
++	* readelf.c: Likewise.
++	* rename.c: Likewise.
++	* resrc.c: Likewise.
++	* strings.c: Likewise.
++	* windres.c: Likewise.
++	* od-xcoff.c: Likewise.
++	* dllwrap.c: Remove alloca pragma handled by sysdep.h, and
++	remove duplicate headers.
++	* dlltool.c: Likewise and ensure #include sysdep.h is first.
++
+ 2011-10-25  Alan Modra  <amodra@gmail.com>
+ 
+ 	Apply mainline patches
+diff -Naur binutils-2.22.orig/binutils/dlltool.c binutils-2.22/binutils/dlltool.c
+--- binutils-2.22.orig/binutils/dlltool.c	2010-12-01 15:15:06.000000000 +0100
++++ binutils-2.22/binutils/dlltool.c	2012-04-27 06:43:05.290940897 +0200
+@@ -1,6 +1,6 @@
+ /* dlltool.c -- tool to generate stuff for PE style DLLs
+    Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++   2005, 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+ 
+@@ -232,15 +232,6 @@
+ 
+    .idata$7 = dll name (eg: "kernel32.dll"). (.idata$6 for ppc).  */
+ 
+-/* AIX requires this to be the first thing in the file.  */
+-#ifndef __GNUC__
+-# ifdef _AIX
+- #pragma alloca
+-#endif
+-#endif
+-
+-#define show_allnames 0
+-
+ #include "sysdep.h"
+ #include "bfd.h"
+ #include "libiberty.h"
+@@ -252,8 +243,6 @@
+ #include "safe-ctype.h"
+ 
+ #include <time.h>
+-#include <sys/stat.h>
+-#include <stdarg.h>
+ #include <assert.h>
+ 
+ #ifdef DLLTOOL_ARM
+@@ -319,6 +308,8 @@
+ #endif /* defined (_WIN32) && ! defined (__CYGWIN32__) */
+ #endif /* ! HAVE_SYS_WAIT_H */
+ 
++#define show_allnames 0
++
+ /* ifunc and ihead data structures: ttk@cygnus.com 1997
+ 
+    When IMPORT declarations are encountered in a .def file the
+diff -Naur binutils-2.22.orig/binutils/dlltool.h binutils-2.22/binutils/dlltool.h
+--- binutils-2.22.orig/binutils/dlltool.h	2009-10-23 16:53:56.000000000 +0200
++++ binutils-2.22/binutils/dlltool.h	2012-04-27 06:43:05.291940872 +0200
+@@ -1,5 +1,6 @@
+ /* dlltool.h -- header file for dlltool
+-   Copyright 1997, 1998, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
++   Copyright 1997, 1998, 2003, 2004, 2005, 2007, 2009, 2012
++   Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+ 
+@@ -18,9 +19,6 @@
+    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+    02110-1301, USA.  */
+ 
+-#include "ansidecl.h"
+-#include <stdio.h>
+-
+ extern void def_code (int);
+ extern void def_data (int);
+ extern void def_description (const char *);
+diff -Naur binutils-2.22.orig/binutils/dllwrap.c binutils-2.22/binutils/dllwrap.c
+--- binutils-2.22.orig/binutils/dllwrap.c	2010-07-15 09:58:47.000000000 +0200
++++ binutils-2.22/binutils/dllwrap.c	2012-04-27 06:43:05.291940872 +0200
+@@ -1,6 +1,6 @@
+ /* dllwrap.c -- wrapper for DLLTOOL and GCC to generate PE style DLLs
+-   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009
+-   Free Software Foundation, Inc.
++   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009,
++   2011, 2012 Free Software Foundation, Inc.
+    Contributed by Mumit Khan (khan@xraylith.wisc.edu).
+ 
+    This file is part of GNU Binutils.
+@@ -20,13 +20,6 @@
+    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+    02110-1301, USA.  */
+ 
+-/* AIX requires this to be the first thing in the file.  */
+-#ifndef __GNUC__
+-# ifdef _AIX
+- #pragma alloca
+-#endif
+-#endif
+-
+ #include "sysdep.h"
+ #include "bfd.h"
+ #include "libiberty.h"
+@@ -35,7 +28,6 @@
+ #include "bucomm.h"
+ 
+ #include <time.h>
+-#include <sys/stat.h>
+ 
+ #ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+diff -Naur binutils-2.22.orig/binutils/elfedit.c binutils-2.22/binutils/elfedit.c
+--- binutils-2.22.orig/binutils/elfedit.c	2011-07-22 22:22:34.000000000 +0200
++++ binutils-2.22/binutils/elfedit.c	2012-04-27 06:43:05.292940848 +0200
+@@ -1,5 +1,5 @@
+ /* elfedit.c -- Update the ELF header of an ELF format file
+-   Copyright 2010
++   Copyright 2010, 2011, 2012
+    Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+@@ -19,10 +19,8 @@
+    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+    02110-1301, USA.  */
+ 
+-#include "config.h"
+ #include "sysdep.h"
+ #include <assert.h>
+-#include <sys/stat.h>
+ 
+ #if __GNUC__ >= 2
+ /* Define BFD64 here, even if our default architecture is 32 bit ELF
+diff -Naur binutils-2.22.orig/binutils/nlmconv.c binutils-2.22/binutils/nlmconv.c
+--- binutils-2.22.orig/binutils/nlmconv.c	2011-02-28 19:32:51.000000000 +0100
++++ binutils-2.22/binutils/nlmconv.c	2012-04-27 06:43:05.293940825 +0200
+@@ -1,6 +1,7 @@
+ /* nlmconv.c -- NLM conversion program
+    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
++   Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+ 
+@@ -42,8 +43,6 @@
+ 
+ #include "ansidecl.h"
+ #include <time.h>
+-#include <sys/stat.h>
+-#include <sys/file.h>
+ #include <assert.h>
+ #include "getopt.h"
+ 
+diff -Naur binutils-2.22.orig/binutils/objcopy.c binutils-2.22/binutils/objcopy.c
+--- binutils-2.22.orig/binutils/objcopy.c	2011-09-16 06:23:17.000000000 +0200
++++ binutils-2.22/binutils/objcopy.c	2012-04-27 06:43:05.294940804 +0200
+@@ -1,6 +1,6 @@
+ /* objcopy.c -- copy object file from input to output, optionally massaging it.
+    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
++   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+    Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+@@ -30,7 +30,6 @@
+ #include "filenames.h"
+ #include "fnmatch.h"
+ #include "elf-bfd.h"
+-#include <sys/stat.h>
+ #include "libbfd.h"
+ #include "coff/internal.h"
+ #include "libcoff.h"
+diff -Naur binutils-2.22.orig/binutils/objdump.c binutils-2.22/binutils/objdump.c
+--- binutils-2.22.orig/binutils/objdump.c	2011-05-16 14:22:12.000000000 +0200
++++ binutils-2.22/binutils/objdump.c	2012-04-27 06:43:05.295940784 +0200
+@@ -1,7 +1,7 @@
+ /* objdump.c -- dump information about an object file.
+    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+-   Free Software Foundation, Inc.
++   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
++   2012 Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+ 
+@@ -71,8 +71,6 @@
+ #include <sys/mman.h>
+ #endif
+ 
+-#include <sys/stat.h>
+-
+ /* Internal headers for the ELF .stab-dump code - sorry.  */
+ #define	BYTES_IN_WORD	32
+ #include "aout/aout64.h"
+diff -Naur binutils-2.22.orig/binutils/objdump.h binutils-2.22/binutils/objdump.h
+--- binutils-2.22.orig/binutils/objdump.h	2011-05-16 14:22:12.000000000 +0200
++++ binutils-2.22/binutils/objdump.h	2012-04-27 06:43:05.296940765 +0200
+@@ -1,5 +1,5 @@
+ /* objdump.h
+-   Copyright 2011 Free Software Foundation, Inc.
++   Copyright 2011, 2012 Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+ 
+@@ -18,8 +18,6 @@
+    Foundation, 51 Franklin Street - Fifth Floor, Boston,
+    MA 02110-1301, USA.  */
+ 
+-#include <stdio.h>
+-
+ struct objdump_private_option
+ {
+   /* Option name.  */
+diff -Naur binutils-2.22.orig/binutils/od-xcoff.c binutils-2.22/binutils/od-xcoff.c
+--- binutils-2.22.orig/binutils/od-xcoff.c	2011-06-09 17:29:05.000000000 +0200
++++ binutils-2.22/binutils/od-xcoff.c	2012-04-27 06:43:05.297940754 +0200
+@@ -1,5 +1,5 @@
+ /* od-xcoff.c -- dump information about an xcoff object file.
+-   Copyright 2011 Free Software Foundation, Inc.
++   Copyright 2011, 2012 Free Software Foundation, Inc.
+    Written by Tristan Gingold, Adacore.
+ 
+    This file is part of GNU Binutils.
+@@ -19,9 +19,9 @@
+    Foundation, 51 Franklin Street - Fifth Floor, Boston,
+    MA 02110-1301, USA.  */
+ 
++#include "sysdep.h"
+ #include <stddef.h>
+ #include <time.h>
+-#include "sysdep.h"
+ #include "safe-ctype.h"
+ #include "bfd.h"
+ #include "objdump.h"
+diff -Naur binutils-2.22.orig/binutils/readelf.c binutils-2.22/binutils/readelf.c
+--- binutils-2.22.orig/binutils/readelf.c	2011-09-21 22:49:13.000000000 +0200
++++ binutils-2.22/binutils/readelf.c	2012-04-27 06:43:05.301940592 +0200
+@@ -42,10 +42,8 @@
+   ELF file than is provided by objdump.  In particular it can display DWARF
+   debugging information which (at the moment) objdump cannot.  */
+ 
+-#include "config.h"
+ #include "sysdep.h"
+ #include <assert.h>
+-#include <sys/stat.h>
+ #include <time.h>
+ #ifdef HAVE_ZLIB_H
+ #include <zlib.h>
+diff -Naur binutils-2.22.orig/binutils/rename.c binutils-2.22/binutils/rename.c
+--- binutils-2.22.orig/binutils/rename.c	2009-09-02 09:22:32.000000000 +0200
++++ binutils-2.22/binutils/rename.c	2012-04-27 06:43:05.302940554 +0200
+@@ -22,8 +22,6 @@
+ #include "bfd.h"
+ #include "bucomm.h"
+ 
+-#include <sys/stat.h>
+-
+ #ifdef HAVE_GOOD_UTIME_H
+ #include <utime.h>
+ #else /* ! HAVE_GOOD_UTIME_H */
+diff -Naur binutils-2.22.orig/binutils/resrc.c binutils-2.22/binutils/resrc.c
+--- binutils-2.22.orig/binutils/resrc.c	2010-11-17 04:35:50.000000000 +0100
++++ binutils-2.22/binutils/resrc.c	2012-04-27 06:43:05.303940522 +0200
+@@ -32,11 +32,6 @@
+ #include "windres.h"
+ 
+ #include <assert.h>
+-#include <errno.h>
+-#include <sys/stat.h>
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+ 
+ #ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+diff -Naur binutils-2.22.orig/binutils/strings.c binutils-2.22/binutils/strings.c
+--- binutils-2.22.orig/binutils/strings.c	2011-03-25 18:09:08.000000000 +0100
++++ binutils-2.22/binutils/strings.c	2012-04-27 06:43:05.303940522 +0200
+@@ -1,6 +1,6 @@
+ /* strings -- print the strings of printable characters in files
+    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
++   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
+    Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+@@ -65,7 +65,6 @@
+ #include "getopt.h"
+ #include "libiberty.h"
+ #include "safe-ctype.h"
+-#include <sys/stat.h>
+ #include "bucomm.h"
+ 
+ #define STRING_ISGRAPHIC(c) \
+diff -Naur binutils-2.22.orig/binutils/sysdep.h binutils-2.22/binutils/sysdep.h
+--- binutils-2.22.orig/binutils/sysdep.h	2009-03-18 12:27:17.000000000 +0100
++++ binutils-2.22/binutils/sysdep.h	2012-04-27 06:43:05.304940492 +0200
+@@ -1,6 +1,6 @@
+ /* sysdep.h -- handle host dependencies for binutils
+    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-   2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009
++   2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2012
+    Free Software Foundation, Inc.
+ 
+    This file is part of GNU Binutils.
+@@ -69,6 +69,10 @@
+ #endif
+ #endif
+ 
++#ifdef HAVE_SYS_STAT_H
++#include <sys/stat.h>
++#endif
++
+ #include "binary-io.h"
+ 
+ #if !HAVE_DECL_STPCPY
+diff -Naur binutils-2.22.orig/binutils/windres.c binutils-2.22/binutils/windres.c
+--- binutils-2.22.orig/binutils/windres.c	2011-06-02 15:43:18.000000000 +0200
++++ binutils-2.22/binutils/windres.c	2012-04-27 06:43:05.304940492 +0200
+@@ -1,6 +1,6 @@
+ /* windres.c -- a program to manipulate Windows resources
+    Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
+-   2009, 2011 Free Software Foundation, Inc.
++   2009, 2011, 2012 Free Software Foundation, Inc.
+    Written by Ian Lance Taylor, Cygnus Support.
+    Rewritten by Kai Tietz, Onevision.
+ 
+@@ -45,7 +45,6 @@
+ #include "safe-ctype.h"
+ #include "obstack.h"
+ #include "windres.h"
+-#include <sys/stat.h>
+ 
+ /* Used by resrc.c at least.  */
+ 
+diff -Naur binutils-2.22.orig/gas/testsuite/ChangeLog binutils-2.22/gas/testsuite/ChangeLog
+--- binutils-2.22.orig/gas/testsuite/ChangeLog	2011-11-21 10:29:32.000000000 +0100
++++ binutils-2.22/gas/testsuite/ChangeLog	2012-04-27 06:43:05.305940465 +0200
+@@ -8,6 +8,12 @@
+ 	* gas/mips/relax-swap3.s: New test source.
+ 	* gas/mips/mips.exp: Run the new tests.
+ 
++2011-10-24  Julian Brown  <julian@codesourcery.com>
++
++	* gas/m68k/all.exp (movem-offset): Add test.
++	* gas/m68k/movem-offset.s: New test.
++	* gas/m68k/movem-offset.d: New.
++
+ 2011-10-25  Alan Modra  <amodra@gmail.com>
+ 
+ 	Apply mainline patches
+diff -Naur binutils-2.22.orig/gas/testsuite/gas/m68k/all.exp binutils-2.22/gas/testsuite/gas/m68k/all.exp
+--- binutils-2.22.orig/gas/testsuite/gas/m68k/all.exp	2011-09-07 22:56:09.000000000 +0200
++++ binutils-2.22/gas/testsuite/gas/m68k/all.exp	2012-04-27 06:43:05.305940465 +0200
+@@ -52,6 +52,8 @@
+     run_dump_test mcf-movsr
+     run_dump_test mode5
+     run_dump_test mode5 "{name {cf}} {as {-mcpu=5200}}"
++    run_dump_test movem-offset
++    run_dump_test movem-offset "{name {cf}} {as {-mcpu=5485}}"
+     run_dump_test mcf-mac
+     run_dump_test mcf-emac
+     run_dump_test mcf-coproc
+diff -Naur binutils-2.22.orig/gas/testsuite/gas/m68k/movem-offset.d binutils-2.22/gas/testsuite/gas/m68k/movem-offset.d
+--- binutils-2.22.orig/gas/testsuite/gas/m68k/movem-offset.d	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.22/gas/testsuite/gas/m68k/movem-offset.d	2012-04-27 06:43:05.306940440 +0200
+@@ -0,0 +1,14 @@
++#name: movem-offset
++#objdump: -d
++#as: 
++
++.*:     file format .*
++
++Disassembly of section \.text:
++
++0+ <.text>:
++   0:	4cee 047c ffe8 	moveml %fp@\(-24\),%d2-%d6/%a2
++   6:	48ee 047c 0010 	moveml %d2-%d6/%a2,%fp@\(16\)
++   c:	4cee 03ff ffe8 	moveml %fp@\(-24\),%d0-%a1
++  12:	48ee 03ff 0010 	moveml %d0-%a1,%fp@\(16\)
++	\.\.\.
+diff -Naur binutils-2.22.orig/gas/testsuite/gas/m68k/movem-offset.s binutils-2.22/gas/testsuite/gas/m68k/movem-offset.s
+--- binutils-2.22.orig/gas/testsuite/gas/m68k/movem-offset.s	1970-01-01 01:00:00.000000000 +0100
++++ binutils-2.22/gas/testsuite/gas/m68k/movem-offset.s	2012-04-27 06:43:05.306940440 +0200
+@@ -0,0 +1,8 @@
++
++	| Check that non-zero displacements work for movem.
++	.text
++	movem.l -24(%a6),#1148
++	movem.l #1148,16(%a6)
++	movem.l -24(%a6),%d0-%d7/%a0-%a1
++	movem.l %d0-%d7/%a0-%a1,16(%a6)
++	.p2align 4
+diff -Naur binutils-2.22.orig/opcodes/ChangeLog binutils-2.22/opcodes/ChangeLog
+--- binutils-2.22.orig/opcodes/ChangeLog	2011-11-21 10:29:39.000000000 +0100
++++ binutils-2.22/opcodes/ChangeLog	2012-04-27 06:43:05.306940440 +0200
+@@ -1,3 +1,7 @@
++2011-10-24  Julian Brown  <julian@codesourcery.com>
++
++	* m68k-opc.c (m68k_opcodes): Fix entries for ColdFire moveml.
++
+ 2011-10-27  Peter Bergner  <bergner@vnet.ibm.com>
+ 
+ 	* ppc-opc.c (powerpc_opcodes) <drrndq, drrndq., dtstexq, dctqpq,
+diff -Naur binutils-2.22.orig/opcodes/m68k-opc.c binutils-2.22/opcodes/m68k-opc.c
+--- binutils-2.22.orig/opcodes/m68k-opc.c	2011-09-07 22:56:09.000000000 +0200
++++ binutils-2.22/opcodes/m68k-opc.c	2012-04-27 06:43:05.307940418 +0200
+@@ -1553,10 +1553,10 @@
+ {"moveml", 4,	one(0044300),	one(0177700), "#w>s", m68000up },
+ {"moveml", 4,	one(0046300),	one(0177700), "<sLw", m68000up },
+ {"moveml", 4,	one(0046300),	one(0177700), "<s#w", m68000up },
+-{"moveml", 4,	one(0044320),	one(0177770), "Lwys", mcfisa_a },
+-{"moveml", 4,	one(0044320),	one(0177770), "#wys", mcfisa_a },
+-{"moveml", 4,	one(0046320),	one(0177770), "ysLw", mcfisa_a },
+-{"moveml", 4,	one(0046320),	one(0177770), "ys#w", mcfisa_a },
++{"moveml", 4,	one(0044300),	one(0177700), "Lwys", mcfisa_a },
++{"moveml", 4,	one(0044300),	one(0177700), "#wys", mcfisa_a },
++{"moveml", 4,	one(0046300),	one(0177700), "ysLw", mcfisa_a },
++{"moveml", 4,	one(0046300),	one(0177700), "ys#w", mcfisa_a },
+ 
+ {"movepw", 2,	one(0000410),	one(0170770), "dsDd", m68000up },
+ {"movepw", 2,	one(0000610),	one(0170770), "Ddds", m68000up },

rtems/patches/gcc-core-4.6.3-rtems4.11-20120303.diff

@@ -0,0 +1,575 @@
+diff -Naur gcc-4.6.3.orig/gcc/ChangeLog.rtems gcc-4.6.3/gcc/ChangeLog.rtems
+--- gcc-4.6.3.orig/gcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.6.3/gcc/ChangeLog.rtems	2012-03-03 05:24:15.031387570 +0100
+@@ -0,0 +1,94 @@
++2012-01-10	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config/h8300/h8300.h: Apply DJ Delorie's patch from 
++	http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48231#c1.
++
++2011-10-28	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config/avr/rtems.h: Remove __USE_INIT_FINI__.
++
++2011-09-05	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config/lm32/t-rtems: New.
++	* config.gcc (lm32-*-rtems*): Add t-rtems.
++
++2011-07-15	Peter Dufault <dufault@hda.com>,
++		Sebastian Huber <sebastian.huber@embedded-brains.de>
++
++	* config/rs6000/rtems.h (SUBSUBTARGET_OVERRIDE_OPTIONS):
++	Extend rs6000_spe handling.
++
++2011-06-20	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* sparc/t-rtems: Reflect introduction of sparc/t-crtin.
++
++2011-05-20	Sebastian Huber <sebastian.huber@embedded-brains.de>
++
++	* config.gcc (arm*-*-rtemseabi*): New target.
++	* config/arm/rtems-eabi.h: New.
++	* config/arm/t-rtems-eabi: New.
++
++2011-03-23	Joel Sherrill <joel.sherrill@oarcorp.com>
++
++	* config.gcc (sparc-*-rtems*, sparc64-*-rtems*):
++	Add sparc/t-rtems, crti.o crtn.o.
++	* config/sparc/t-rtems: New.
++
++2011-03-22	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config.gcc (sparc64-rtems*): Remove sysv.h from tm_file.
++
++2011-02-20	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config/rs6000/t-rtems: Add -mcpu=8540/-mfloat-gprs=double multilib.
++
++2011-02-20	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config/rs6000/t-rtems: Remove -mcpu=601 multilib.
++	* config/rs6000/t-rtems: Remove -Dmpc8260 multilib.
++	* config/rs6000/rtems.h: Allow --float-gprs=... to override grps on
++	E500 targets.
++
++2010-05-19  Joel Sherrill <joel.sherrill@oarcorp.com>
++
++    	* config.gcc (sparc64-*-rtems*): New target.
++	* config/sparc/sp64-rtemself.h: New file.
++
++2010-04-19	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _X86_64_ANSI_H_ is 
++	defined (Used by amd64-*-netbsdelf5.*).
++
++2010-04-18	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* ginclude/stddef.h: Define _MACHINE_ANSI_H_ if _I386_ANSI_H_ is 
++	defined (Used by i386-*-netbsdelf5.*).
++
++2010-03-15	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	Patch from Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>:
++	* config/arm/rtems-elf.h, config/arm/t-rtems: Add optional support
++	for vfp FPU model
++
++2009-11-04	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config/m32c/rtems.h, config/m68k/rtemself.h,
++	config/m68k/rtemself.h, config/sh/rtemself.h,
++	config/sparc/rtemself.h: Undef WCHAR_TYPE_SIZE, WCHAR_TYPE. 
++	(Resets WCHAR_TYPE's to defaults. Prevents broken GCC tm_files 
++	to interfere and cause wchar_t/wint_t incompatibilities).
++
++2009-10-15	Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config/avr/t-rtems: Don't build _exit.
++
++		Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config/rs6000/rtems.h: Support for custom RTEMS multilibs.
++	Support TARGET_E500.
++	* config/rs6000/t-rtems: Custom RTEMS multilibs. 
++
++		Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	* config/mips/elf.h: Remove NO_IMPLICIT_EXTERN_C.
++	
+diff -Naur gcc-4.6.3.orig/gcc/config/arm/rtems-eabi.h gcc-4.6.3/gcc/config/arm/rtems-eabi.h
+--- gcc-4.6.3.orig/gcc/config/arm/rtems-eabi.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.6.3/gcc/config/arm/rtems-eabi.h	2012-03-03 05:20:50.021229856 +0100
+@@ -0,0 +1,33 @@
++/* Definitions for RTEMS based ARM systems using EABI
++   Copyright (C) 2011 Free Software Foundation, Inc.
++ 
++   This file is part of GCC.
++ 
++   GCC is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published
++   by the Free Software Foundation; either version 3, or (at your
++   option) any later version.
++ 
++   GCC is distributed in the hope that it will be useful, but WITHOUT
++   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
++   License for more details.
++ 
++   You should have received a copy of the GNU General Public License
++   along with GCC; see the file COPYING3.  If not see
++   <http://www.gnu.org/licenses/>.  */
++
++/* Run-time Target Specification.  */
++#undef TARGET_VERSION
++#define TARGET_VERSION  fputs (" (ARM/EABI RTEMS)", stderr);
++
++#define HAS_INIT_SECTION
++
++#undef TARGET_OS_CPP_BUILTINS
++#define TARGET_OS_CPP_BUILTINS()		\
++    do {					\
++	builtin_define ("__rtems__");		\
++	builtin_define ("__USE_INIT_FINI__");	\
++	builtin_assert ("system=rtems");	\
++	TARGET_BPABI_CPP_BUILTINS();    	\
++    } while (0)
+diff -Naur gcc-4.6.3.orig/gcc/config/arm/rtems-elf.h gcc-4.6.3/gcc/config/arm/rtems-elf.h
+--- gcc-4.6.3.orig/gcc/config/arm/rtems-elf.h	2009-03-25 13:54:16.000000000 +0100
++++ gcc-4.6.3/gcc/config/arm/rtems-elf.h	2012-03-03 05:20:35.110998213 +0100
+@@ -36,7 +36,7 @@
+  */
+ #undef SUBTARGET_EXTRA_ASM_SPEC
+ #define SUBTARGET_EXTRA_ASM_SPEC "\
+-  %{!mhard-float: %{!msoft-float:-mfpu=softfpa}}"
++  %{!mhard-float: %{!mfpu=vfp: %{!msoft-float:-mfpu=softfpa}}}"
+ 
+ /*
+  *  The default includes --start-group and --end-group which conflicts
+diff -Naur gcc-4.6.3.orig/gcc/config/arm/t-rtems gcc-4.6.3/gcc/config/arm/t-rtems
+--- gcc-4.6.3.orig/gcc/config/arm/t-rtems	2004-11-23 06:30:32.000000000 +0100
++++ gcc-4.6.3/gcc/config/arm/t-rtems	2012-03-03 05:20:35.110998213 +0100
+@@ -5,6 +5,41 @@
+ MULTILIB_EXCEPTIONS  = 
+ MULTILIB_MATCHES     = marm=mno-thumb
+ 
+-MULTILIB_OPTIONS    += msoft-float/mhard-float
+-MULTILIB_DIRNAMES   += soft fpu
+-MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
++MULTILIB_OPTIONS    += mhard-float/mfloat-abi=softfp
++MULTILIB_DIRNAMES   += fpu softfp
++MULTILIB_EXCEPTIONS += *mthumb*/*mhard-float* *mthumb*/*mfloat-abi=softfp*
++MULTILIB_MATCHES     =
++
++MULTILIB_OPTIONS    += mfpu=vfp
++MULTILIB_DIRNAMES   += vfp
++MULTILIB_EXCEPTIONS += *mhard-float*/*mfpu=vfp* *marm*/*mfloat-abi=softfp*/*mfpu=fpa*
++MULTILIB_EXCLUSIONS += !mthumb/mfloat-abi=softfp/!mfpu=vfp
++
++# default float model is fpa, so don't create a explicit copy of it
++MULTILIB_EXCEPTIONS += *marm*/*mfpa*
++
++# permutations of the options which are useful (+) or make no sense (-),
++# defaults are in brackets:
++# + (arm/soft/fpa)
++# + (arm/soft)/vfp
++# - (arm)/softfp(/fpa)
++# + (arm)/softfp/vfp
++# + (arm)/hard-float(/fpa)
++# - (arm)/hard-float/vfp
++# + thumb/(soft/fpa)
++# + thumb/(soft/)vfp
++# - thumb/softfp/fpa
++# - thumb/softfp/vfp
++# - thumb/hard-float/fpa
++# - thumb/hard-float/vfp
++
++# subdirs to be used for multilibs and their respective options:
++#/thumb/vfp  -> thumb/soft/vfp
++#/thumb/fpa  -> thumb/soft/fpa
++#/thumb      -> thumb/soft/fpa
++#/vfp        -> arm/soft/vfp
++#/softfp/vfp -> arm/softfp/cfp
++#/fpu/fpa    -> arm/hard/fpa
++#/fpu        -> arm/hard/fpa
++#/fpa        -> arm/soft/fpa
++#.           -> arm/soft/fpa
+diff -Naur gcc-4.6.3.orig/gcc/config/arm/t-rtems-eabi gcc-4.6.3/gcc/config/arm/t-rtems-eabi
+--- gcc-4.6.3.orig/gcc/config/arm/t-rtems-eabi	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.6.3/gcc/config/arm/t-rtems-eabi	2012-03-03 05:20:35.112998362 +0100
+@@ -0,0 +1,6 @@
++# Custom RTEMS EABI multilibs
++
++MULTILIB_OPTIONS    = mthumb march=armv6-m/march=armv7/march=armv7-m
++MULTILIB_DIRNAMES   = thumb armv6-m armv7 armv7-m
++MULTILIB_EXCEPTIONS = march=armv6-m march=armv7 march=armv7-m
++MULTILIB_MATCHES    = marm=mno-thumb
+diff -Naur gcc-4.6.3.orig/gcc/config/avr/rtems.h gcc-4.6.3/gcc/config/avr/rtems.h
+--- gcc-4.6.3.orig/gcc/config/avr/rtems.h	2007-08-02 12:49:31.000000000 +0200
++++ gcc-4.6.3/gcc/config/avr/rtems.h	2012-03-03 05:20:35.112998362 +0100
+@@ -23,6 +23,5 @@
+ #define TARGET_OS_CPP_BUILTINS()	\
+ do {					\
+   builtin_define ("__rtems__");		\
+-  builtin_define ("__USE_INIT_FINI__");	\
+   builtin_assert ("system=rtems");	\
+ } while (0)
+diff -Naur gcc-4.6.3.orig/gcc/config/avr/t-rtems gcc-4.6.3/gcc/config/avr/t-rtems
+--- gcc-4.6.3.orig/gcc/config/avr/t-rtems	2004-11-23 04:44:03.000000000 +0100
++++ gcc-4.6.3/gcc/config/avr/t-rtems	2012-03-03 05:20:35.112998362 +0100
+@@ -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.6.3.orig/gcc/config/h8300/h8300.h gcc-4.6.3/gcc/config/h8300/h8300.h
+--- gcc-4.6.3.orig/gcc/config/h8300/h8300.h	2010-11-25 00:37:33.000000000 +0100
++++ gcc-4.6.3/gcc/config/h8300/h8300.h	2012-03-03 05:20:17.752732636 +0100
+@@ -133,6 +133,7 @@
+ #define INCOMING_FRAME_SP_OFFSET   (POINTER_SIZE / 8)
+ 
+ #define DWARF_CIE_DATA_ALIGNMENT	2
++#define DWARF2_ADDR_SIZE		4
+ 
+ /* Define this if addresses of constant functions
+    shouldn't be put through pseudo regs where they can be cse'd.
+diff -Naur gcc-4.6.3.orig/gcc/config/lm32/t-rtems gcc-4.6.3/gcc/config/lm32/t-rtems
+--- gcc-4.6.3.orig/gcc/config/lm32/t-rtems	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.6.3/gcc/config/lm32/t-rtems	2012-03-03 05:20:17.753732670 +0100
+@@ -0,0 +1,21 @@
++# for multilib
++MULTILIB_OPTIONS = mmultiply-enabled mbarrel-shift-enabled
++MULTILIB_OPTIONS += mdivide-enabled msign-extend-enabled
++
++MULTILIB_EXCEPTIONS =
++# MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/mdivide-enabled/msign-extend-enabled
++MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/mdivide-enabled
++MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled/msign-extend-enabled
++#MULTILIB_EXCEPTIONS += mmultiply-enabled/mbarrel-shift-enabled
++MULTILIB_EXCEPTIONS += mmultiply-enabled/mdivide-enabled/msign-extend-enabled
++MULTILIB_EXCEPTIONS += mmultiply-enabled/mdivide-enabled
++MULTILIB_EXCEPTIONS += mmultiply-enabled/msign-extend-enabled
++# MULTILIB_EXCEPTIONS += mmultiply-enabled
++MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/mdivide-enabled/msign-extend-enabled
++MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/mdivide-enabled
++MULTILIB_EXCEPTIONS += mbarrel-shift-enabled/msign-extend-enabled
++# MULTILIB_EXCEPTIONS += mbarrel-shift-enabled
++MULTILIB_EXCEPTIONS += mdivide-enabled/msign-extend-enabled
++MULTILIB_EXCEPTIONS += mdivide-enabled
++MULTILIB_EXCEPTIONS += msign-extend-enabled
++# MULTILIB_EXCEPTIONS += 
+diff -Naur gcc-4.6.3.orig/gcc/config/m32c/rtems.h gcc-4.6.3/gcc/config/m32c/rtems.h
+--- gcc-4.6.3.orig/gcc/config/m32c/rtems.h	2008-12-01 17:34:42.000000000 +0100
++++ gcc-4.6.3/gcc/config/m32c/rtems.h	2012-03-03 05:20:17.754732701 +0100
+@@ -29,5 +29,9 @@
+     }						\
+   while (0)
+ 
+-/* Use the default */
++/* Use the defaults */
+ #undef LINK_GCC_C_SEQUENCE_SPEC
++
++#undef WCHAR_TYPE
++
++#undef WCHAR_TYPE_SIZE
+diff -Naur gcc-4.6.3.orig/gcc/config/m68k/rtemself.h gcc-4.6.3/gcc/config/m68k/rtemself.h
+--- gcc-4.6.3.orig/gcc/config/m68k/rtemself.h	2007-08-02 12:49:31.000000000 +0200
++++ gcc-4.6.3/gcc/config/m68k/rtemself.h	2012-03-03 05:20:17.754732701 +0100
+@@ -31,3 +31,8 @@
+ 	builtin_assert ("system=rtems");	\
+     }						\
+   while (0)
++
++/* Use the defaults */
++#undef WCHAR_TYPE
++
++#undef WCHAR_TYPE_SIZE
+diff -Naur gcc-4.6.3.orig/gcc/config/mips/elf.h gcc-4.6.3/gcc/config/mips/elf.h
+--- gcc-4.6.3.orig/gcc/config/mips/elf.h	2010-11-21 01:54:14.000000000 +0100
++++ gcc-4.6.3/gcc/config/mips/elf.h	2012-03-03 05:20:02.669501121 +0100
+@@ -47,5 +47,3 @@
+ 
+ #undef  ENDFILE_SPEC
+ #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
+-
+-#define NO_IMPLICIT_EXTERN_C 1
+diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/rtems.h gcc-4.6.3/gcc/config/rs6000/rtems.h
+--- gcc-4.6.3.orig/gcc/config/rs6000/rtems.h	2007-08-02 12:49:31.000000000 +0200
++++ gcc-4.6.3/gcc/config/rs6000/rtems.h	2012-03-03 05:20:02.669501121 +0100
+@@ -49,8 +49,27 @@
+ %{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
+ %{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
+ %{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
+-%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }" 
++%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } } \
++%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540}  } }" 
+ 
+ #undef  SUBSUBTARGET_EXTRA_SPECS
+ #define SUBSUBTARGET_EXTRA_SPECS \
+   { "cpp_os_rtems",		CPP_OS_RTEMS_SPEC }
++
++#undef SUBSUBTARGET_OVERRIDE_OPTIONS
++#define SUBSUBTARGET_OVERRIDE_OPTIONS					\
++  do {									\
++    if (TARGET_E500)							\
++      {									\
++        if (TARGET_HARD_FLOAT && !rs6000_explicit_options.float_gprs)	\
++          rs6000_float_gprs = 1; 					\
++        if (rs6000_float_gprs != 0 && !rs6000_explicit_options.spe)	\
++          rs6000_spe = 1;						\
++        if (rs6000_spe && !rs6000_explicit_options.spe_abi)		\
++          rs6000_spe_abi = 1;						\
++      }									\
++  } while(0)
++
++#undef WCHAR_TYPE
++
++#undef WCHAR_TYPE_SIZE
+diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/t-rtems gcc-4.6.3/gcc/config/rs6000/t-rtems
+--- gcc-4.6.3.orig/gcc/config/rs6000/t-rtems	2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.6.3/gcc/config/rs6000/t-rtems	2012-03-03 05:20:02.670501093 +0100
+@@ -19,14 +19,12 @@
+ # <http://www.gnu.org/licenses/>.
+ 
+ MULTILIB_OPTIONS	= \
+-mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
+-Dmpc8260 \
+-msoft-float
++mcpu=403/mcpu=505/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
++msoft-float/mfloat-gprs=double
+ 
+ MULTILIB_DIRNAMES	= \
+-m403 m505 m601 m603e m604 m860 m7400 \
+-mpc8260 \
+-nof
++m403 m505 m603e m604 m860 m7400 m8540 \
++nof gprsdouble
+ 
+ # MULTILIB_MATCHES	= ${MULTILIB_MATCHES_FLOAT}
+ MULTILIB_MATCHES	=
+@@ -47,6 +45,13 @@
+ # Map 750 to .
+ MULTILIB_MATCHES	+= mcpu?750=
+ 
++# Map 8548 to 8540
++MULTILIB_MATCHES	+= mcpu?8540=mcpu?8548
++
++# Map -mcpu=8540 -mfloat-gprs=single to -mcpu=8540
++# (mfloat-gprs=single is implicit default)
++MULTILIB_MATCHES	+= mcpu?8540=mcpu?8540/mfloat-gprs?single
++
+ # Soft-float only, default implies msoft-float
+ # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES
+ MULTILIB_SOFTFLOAT_ONLY = \
+@@ -62,6 +67,16 @@
+ MULTILIB_HARDFLOAT_ONLY = \
+ *mcpu=505/*msoft-float*
+ 
++# Targets which do not support gprs
++MULTILIB_NOGPRS = \
++mfloat-gprs=* \
++*mcpu=403/*mfloat-gprs=* \
++*mcpu=505/*mfloat-gprs=* \
++*mcpu=603e/*mfloat-gprs=* \
++*mcpu=604/*mfloat-gprs=* \
++*mcpu=860/*mfloat-gprs=* \
++*mcpu=7400/*mfloat-gprs=*
++
+ MULTILIB_EXCEPTIONS =
+ 
+ # Disallow -Dppc and -Dmpc without other options
+@@ -69,14 +84,8 @@
+ 
+ MULTILIB_EXCEPTIONS	+= \
+ ${MULTILIB_SOFTFLOAT_ONLY} \
+-${MULTILIB_HARDFLOAT_ONLY}
++${MULTILIB_HARDFLOAT_ONLY} \
++${MULTILIB_NOGPRS}
+ 
+ # Special rules
+ # Take out all variants we don't want
+-MULTILIB_EXCEPTIONS += *mcpu=403/Dmpc*
+-MULTILIB_EXCEPTIONS += *mcpu=505/Dmpc*
+-MULTILIB_EXCEPTIONS += *mcpu=601/Dmpc*
+-MULTILIB_EXCEPTIONS += *mcpu=604/Dmpc*
+-MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
+-MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
+-MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
+diff -Naur gcc-4.6.3.orig/gcc/config/sh/rtemself.h gcc-4.6.3/gcc/config/sh/rtemself.h
+--- gcc-4.6.3.orig/gcc/config/sh/rtemself.h	2007-08-02 12:49:31.000000000 +0200
++++ gcc-4.6.3/gcc/config/sh/rtemself.h	2012-03-03 05:19:46.591252722 +0100
+@@ -24,3 +24,8 @@
+   builtin_define( "__rtems__" );		\
+   builtin_assert( "system=rtems" );		\
+ } while (0)
++
++/* Use the defaults */
++#undef WCHAR_TYPE
++
++#undef WCHAR_TYPE_SIZE
+diff -Naur gcc-4.6.3.orig/gcc/config/sparc/rtemself.h gcc-4.6.3/gcc/config/sparc/rtemself.h
+--- gcc-4.6.3.orig/gcc/config/sparc/rtemself.h	2007-08-02 12:49:31.000000000 +0200
++++ gcc-4.6.3/gcc/config/sparc/rtemself.h	2012-03-03 05:19:32.784040118 +0100
+@@ -29,5 +29,9 @@
+     }						\
+   while (0)
+ 
+-/* Use the default */
++/* Use the defaults */
+ #undef LINK_GCC_C_SEQUENCE_SPEC
++
++#undef WCHAR_TYPE
++
++#undef WCHAR_TYPE_SIZE
+diff -Naur gcc-4.6.3.orig/gcc/config/sparc/sp64-rtemself.h gcc-4.6.3/gcc/config/sparc/sp64-rtemself.h
+--- gcc-4.6.3.orig/gcc/config/sparc/sp64-rtemself.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.6.3/gcc/config/sparc/sp64-rtemself.h	2012-03-03 05:19:32.784040118 +0100
+@@ -0,0 +1,37 @@
++/* Definitions for rtems targeting a SPARC64 using ELF.
++   Copyright (C) 2010 Free Software Foundation, Inc.
++   Contributed by Joel Sherrill (joel@OARcorp.com).
++
++This file is part of GCC.
++
++GCC is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 3, or (at your option)
++any later version.
++
++GCC is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with GCC; see the file COPYING3.  If not see
++<http://www.gnu.org/licenses/>.  */
++
++/* Target OS builtins.  */
++#undef TARGET_OS_CPP_BUILTINS
++#define TARGET_OS_CPP_BUILTINS()		\
++  do						\
++    {						\
++	builtin_define ("__rtems__");		\
++	builtin_define ("__USE_INIT_FINI__");	\
++	builtin_assert ("system=rtems");	\
++    }						\
++  while (0)
++
++/* Use the default */
++#undef LINK_GCC_C_SEQUENCE_SPEC
++
++/* we are not svr4 */
++#undef CPP_SUBTARGET_SPEC
++#define CPP_SUBTARGET_SPEC ""
+diff -Naur gcc-4.6.3.orig/gcc/config/sparc/t-rtems gcc-4.6.3/gcc/config/sparc/t-rtems
+--- gcc-4.6.3.orig/gcc/config/sparc/t-rtems	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.6.3/gcc/config/sparc/t-rtems	2012-03-03 05:17:40.846315822 +0100
+@@ -0,0 +1,18 @@
++# Copyright (C) 2011 Free Software Foundation, Inc.
++#
++# This file is part of GCC.
++#
++# GCC is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3, or (at your option)
++# any later version.
++#
++# GCC is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with GCC; see the file COPYING3.  If not see
++# <http://www.gnu.org/licenses/>.
++#
+diff -Naur gcc-4.6.3.orig/gcc/config.gcc gcc-4.6.3/gcc/config.gcc
+--- gcc-4.6.3.orig/gcc/config.gcc	2011-07-22 18:44:50.000000000 +0200
++++ gcc-4.6.3/gcc/config.gcc	2012-03-03 05:17:40.847315868 +0100
+@@ -895,6 +895,17 @@
+ 	tm_file="${tm_file} arm/aout.h arm/arm.h"
+ 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
+ 	;;
++arm*-*-rtemseabi*)
++	need_64bit_hwint=yes
++	default_use_cxa_atexit=yes
++	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
++	tm_file="${tm_file} ../../libgcc/config/arm/bpabi-lib.h"
++	tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
++	tm_file="${tm_file} arm/aout.h arm/arm.h"
++	tmake_file="arm/t-arm arm/t-arm-elf"
++	tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"
++ 	tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
++ 	;;
+ arm*-*-rtems*)
+ 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h newlib-stdint.h"
+ 	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
+@@ -1666,6 +1677,7 @@
+ 	tm_file="dbxelf.h elfos.h ${tm_file} lm32/rtems.h rtems.h newlib-stdint.h"
+ 	tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
+ 	tmake_file="${tmake_file} t-rtems"
++	tmake_file="${tmake_file} lm32/t-rtems"
+          ;;
+ lm32-*-uclinux*)
+         tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h linux.h lm32/uclinux-elf.h"
+@@ -2540,8 +2552,8 @@
+ 	;;
+ sparc-*-rtems*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
+-	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm t-rtems"
+-	extra_parts="crtbegin.o crtend.o"
++	tmake_file="sparc/t-elf sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
++	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
+ 	;;
+ sparc-*-linux*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h"
+@@ -2634,8 +2646,8 @@
+ sparc64-*-rtems*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
+ 	extra_options="${extra_options} sparc/little-endian.opt"
+-	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm t-rtems"
+-	extra_parts="crtbegin.o crtend.o"
++	tmake_file="${tmake_file} sparc/t-crtin sparc/t-crtfm sparc/t-rtems t-rtems"
++	extra_parts="crtbegin.o crtend.o crtbegin.o crtend.o"
+ 	;;
+ sparc64-*-linux*)
+ 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/linux64.h"
+diff -Naur gcc-4.6.3.orig/gcc/ginclude/stddef.h gcc-4.6.3/gcc/ginclude/stddef.h
+--- gcc-4.6.3.orig/gcc/ginclude/stddef.h	2011-01-29 23:15:52.000000000 +0100
++++ gcc-4.6.3/gcc/ginclude/stddef.h	2012-03-03 05:17:21.301015027 +0100
+@@ -53,7 +53,13 @@
+    one less case to deal with in the following.  */
+ #if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
+ #include <machine/ansi.h>
++#if !defined(_MACHINE_ANSI_H_)
++#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_)
++#define _MACHINE_ANSI_H_
+ #endif
++#endif
++#endif
++
+ /* On FreeBSD 5, machine/ansi.h does not exist anymore... */
+ #if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
+ #include <sys/_types.h>
+diff -Naur gcc-4.6.3.orig/libgcc/ChangeLog.rtems gcc-4.6.3/libgcc/ChangeLog.rtems
+--- gcc-4.6.3.orig/libgcc/ChangeLog.rtems	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.6.3/libgcc/ChangeLog.rtems	2012-03-03 05:17:01.297706638 +0100
+@@ -0,0 +1,5 @@
++2010-08-17  Ralf Corsépius <ralf.corsepius@rtems.org>
++
++	1669/Tools, GCC-BZ 44793
++	* config.host (powerpc-*-rtems*): Add tmake_file.
++	Add extra_parts.
+diff -Naur gcc-4.6.3.orig/libgcc/config.host gcc-4.6.3/libgcc/config.host
+--- gcc-4.6.3.orig/libgcc/config.host	2011-11-23 23:15:54.000000000 +0100
++++ gcc-4.6.3/libgcc/config.host	2012-03-03 05:17:01.297706638 +0100
+@@ -474,6 +474,8 @@
+ 	tmake_file="${tmake_file} rs6000/t-ppccomm"
+ 	;;
+ powerpc-*-rtems*)
++	tmake_file="${tmake_file} rs6000/t-ppccomm t-softfp"
++	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
+ 	;;
+ powerpc-*-linux* | powerpc64-*-linux*)
+ 	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ldbl128 t-softfp"

rtems/patches/gdb-7.5-rtems4.11-20121003.diff

@@ -0,0 +1,833 @@
+diff -Naur gdb-7.5.orig/gdb/ChangeLog gdb-7.5/gdb/ChangeLog
+--- gdb-7.5.orig/gdb/ChangeLog	2012-08-17 19:21:44.000000000 +0200
++++ gdb-7.5/gdb/ChangeLog	2012-10-03 05:13:35.925579962 +0200
+@@ -1,3 +1,9 @@
++2012-08-21  Pierre Muller  <muller@ics.u-strasbg.fr>
++
++	* symfile.c (allocate_symtab): Use host_address_to_string
++	function instead of cast of pointer to long which is not
++	compatible with x86_64-w64-mingw32 build.
++
+ 2012-08-17  Joel Brobecker  <brobecker@adacore.com>
+ 
+ 	* version.in: Update GDB version number to 7.5.
+diff -Naur gdb-7.5.orig/gdb/symfile.c gdb-7.5/gdb/symfile.c
+--- gdb-7.5.orig/gdb/symfile.c	2012-06-26 22:14:02.000000000 +0200
++++ gdb-7.5/gdb/symfile.c	2012-10-03 05:13:35.926579978 +0200
+@@ -2889,8 +2889,8 @@
+ 			      last_objfile_name);
+ 	}
+       fprintf_unfiltered (gdb_stdlog,
+-			  "Created symtab 0x%lx for module %s.\n",
+-			  (long) symtab, filename);
++			  "Created symtab %s for module %s.\n",
++			  host_address_to_string (symtab), filename);
+     }
+ 
+   return (symtab);
+diff -Naur gdb-7.5.orig/libiberty/ChangeLog gdb-7.5/libiberty/ChangeLog
+--- gdb-7.5.orig/libiberty/ChangeLog	2012-07-14 01:39:45.000000000 +0200
++++ gdb-7.5/libiberty/ChangeLog	2012-10-03 05:13:35.932580071 +0200
+@@ -1,3 +1,8 @@
++2012-07-31  Mike Frysinger  <vapier@gentoo.org>
++
++	* md5.c (md5_finish_ctx): Declare swap_bytes.  Assign SWAP() output
++	to swap_bytes, and then call memcpy to move it to ctx->buffer.
++
+ 2012-07-13  Doug Evans  <dje@google.com>
+ 
+ 	* filename_cmp.c (filename_hash, filename_eq): New functions.
+diff -Naur gdb-7.5.orig/libiberty/md5.c gdb-7.5/libiberty/md5.c
+--- gdb-7.5.orig/libiberty/md5.c	2011-09-23 22:01:11.000000000 +0200
++++ gdb-7.5/libiberty/md5.c	2012-10-03 05:13:35.933580087 +0200
+@@ -103,6 +103,7 @@
+ {
+   /* Take yet unprocessed bytes into account.  */
+   md5_uint32 bytes = ctx->buflen;
++  md5_uint32 swap_bytes;
+   size_t pad;
+ 
+   /* Now count remaining bytes.  */
+@@ -113,10 +114,13 @@
+   pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
+   memcpy (&ctx->buffer[bytes], fillbuf, pad);
+ 
+-  /* Put the 64-bit file length in *bits* at the end of the buffer.  */
+-  *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
+-  *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
+-							(ctx->total[0] >> 29));
++  /* Put the 64-bit file length in *bits* at the end of the buffer.
++     Use memcpy to avoid aliasing problems.  On most systems, this
++     will be optimized away to the same code.  */
++  swap_bytes = SWAP (ctx->total[0] << 3);
++  memcpy (&ctx->buffer[bytes + pad], &swap_bytes, sizeof (swap_bytes));
++  swap_bytes = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
++  memcpy (&ctx->buffer[bytes + pad + 4], &swap_bytes, sizeof (swap_bytes));
+ 
+   /* Process last bytes.  */
+   md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
+diff -Naur gdb-7.5.orig/sim/ChangeLog gdb-7.5/sim/ChangeLog
+--- gdb-7.5.orig/sim/ChangeLog	2012-06-15 19:19:56.000000000 +0200
++++ gdb-7.5/sim/ChangeLog	2012-10-03 05:13:35.934580102 +0200
+@@ -1,3 +1,8 @@
++2012-07-19  Ralf Corsépius  <ralf.corsepius@rtems.org>
++
++	* common/sim-events.c: Include <inttypes.h>.
++	Avoid bogus pointer to int casts.
++
+ 2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+ 
+ 	* configure: Regenerate.
+diff -Naur gdb-7.5.orig/sim/common/sim-events.c gdb-7.5/sim/common/sim-events.c
+--- gdb-7.5.orig/sim/common/sim-events.c	2012-01-04 09:28:06.000000000 +0100
++++ gdb-7.5/sim/common/sim-events.c	2012-10-03 05:13:35.935580117 +0200
+@@ -38,6 +38,8 @@
+ #include <stdlib.h>
+ #endif
+ 
++#include <inttypes.h>
++
+ #include <signal.h> /* For SIGPROCMASK et al. */
+ 
+ typedef enum {
+@@ -418,14 +420,14 @@
+ 	   event = event->next, i++)
+ 	{
+ 	  ETRACE ((_ETRACE,
+-		   "event time-from-event - time %ld, delta %ld - event %d, tag 0x%lx, time %ld, handler 0x%lx, data 0x%lx%s%s\n",
+-		   (long)current_time,
+-		   (long)events->time_from_event,
++		   "event time-from-event - time %" PRId64 ", delta %" PRId64 " - event %d, tag 0x%p, time %" PRId64 ", handler 0x%p, data 0x%p%s%s\n",
++		   current_time,
++		   events->time_from_event,
+ 		   i,
+-		   (long)event,
+-		   (long)event->time_of_event,
+-		   (long)event->handler,
+-		   (long)event->data,
++		   event,
++		   event->time_of_event,
++		   event->handler,
++		   event->data,
+ 		   (event->trace != NULL) ? ", " : "",
+ 		   (event->trace != NULL) ? event->trace : ""));
+ 	}
+@@ -525,12 +527,12 @@
+     new_event->trace = NULL;
+   insert_sim_event (sd, new_event, delta_time);
+   ETRACE ((_ETRACE,
+-	   "event scheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx%s%s\n",
++	   "event scheduled at %ld - tag 0x%p - time %ld, handler 0x%p, data 0x%p%s%s\n",
+ 	   (long)sim_events_time (sd),
+-	   (long)new_event,
++	   new_event,
+ 	   (long)new_event->time_of_event,
+-	   (long)new_event->handler,
+-	   (long)new_event->data,
++	   new_event->handler,
++	   new_event->data,
+ 	   (new_event->trace != NULL) ? ", " : "",
+ 	   (new_event->trace != NULL) ? new_event->trace : ""));
+   return new_event;
+@@ -577,12 +579,12 @@
+ #endif
+ 
+   ETRACE ((_ETRACE,
+-	   "signal scheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx\n",
+-	   (long)sim_events_time (sd),
+-	   (long)new_event,
+-	   (long)new_event->time_of_event,
+-	   (long)new_event->handler,
+-	   (long)new_event->data));
++	   "signal scheduled at %" PRId64 " - tag 0x%p - time %" PRId64 ", handler 0x%p, data 0x%p\n",
++	   sim_events_time (sd),
++	   new_event,
++	   new_event->time_of_event,
++	   new_event->handler,
++	   new_event->data));
+ }
+ #endif
+ 
+@@ -613,12 +615,12 @@
+   events->watchpoints = new_event;
+   events->work_pending = 1;
+   ETRACE ((_ETRACE,
+-	  "event watching clock at %ld - tag 0x%lx - wallclock %ld, handler 0x%lx, data 0x%lx\n",
+-	   (long)sim_events_time (sd),
+-	   (long)new_event,
+-	   (long)new_event->wallclock,
+-	   (long)new_event->handler,
+-	   (long)new_event->data));
++	  "event watching clock at %" PRId64 " - tag 0x%p - wallclock %d, handler 0x%p, data 0x%p\n",
++	   sim_events_time (sd),
++	   new_event,
++	   new_event->wallclock,
++	   new_event->handler,
++	   new_event->data));
+   return new_event;
+ }
+ #endif
+@@ -689,14 +691,14 @@
+   events->watchpoints = new_event;
+   events->work_pending = 1;
+   ETRACE ((_ETRACE,
+-	   "event watching host at %ld - tag 0x%lx - host-addr 0x%lx, 0x%lx..0x%lx, handler 0x%lx, data 0x%lx\n",
+-	   (long)sim_events_time (sd),
+-	   (long)new_event,
+-	   (long)new_event->host_addr,
+-	   (long)new_event->lb,
+-	   (long)new_event->ub,
+-	   (long)new_event->handler,
+-	   (long)new_event->data));
++	   "event watching host at %" PRId64 " - tag 0x%p - host-addr 0x%p, 0x%x..0x%x, handler 0x%p, data 0x%p\n",
++	   sim_events_time (sd),
++	   new_event,
++	   new_event->host_addr,
++	   new_event->lb,
++	   new_event->ub,
++	   new_event->handler,
++	   new_event->data));
+   return new_event;
+ }
+ #endif
+@@ -769,14 +771,14 @@
+   events->watchpoints = new_event;
+   events->work_pending = 1;
+   ETRACE ((_ETRACE,
+-	   "event watching host at %ld - tag 0x%lx - host-addr 0x%lx, 0x%lx..0x%lx, handler 0x%lx, data 0x%lx\n",
+-	   (long)sim_events_time (sd),
+-	   (long)new_event,
+-	   (long)new_event->host_addr,
+-	   (long)new_event->lb,
+-	   (long)new_event->ub,
+-	   (long)new_event->handler,
+-	   (long)new_event->data));
++	   "event watching host at %" PRId64 " - tag 0x%p - host-addr 0x%p, 0x%x..0x%x, handler 0x%p, data 0x%p\n",
++	   sim_events_time (sd),
++	   new_event,
++	   new_event->host_addr,
++	   new_event->lb,
++	   new_event->ub,
++	   new_event->handler,
++	   new_event->data));
+   return new_event;
+ }
+ #endif
+@@ -803,12 +805,12 @@
+ 	      sim_event *dead = *ptr_to_current;
+ 	      *ptr_to_current = dead->next;
+ 	      ETRACE ((_ETRACE,
+-		       "event/watch descheduled at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx%s%s\n",
+-		       (long) sim_events_time (sd),
+-		       (long) event_to_remove,
+-		       (long) dead->time_of_event,
+-		       (long) dead->handler,
+-		       (long) dead->data,
++		       "event/watch descheduled at %" PRId64 " - tag 0x%p - time %" PRId64 ", handler 0x%p, data 0x%p%s%s\n",
++		       sim_events_time (sd),
++		       event_to_remove,
++		       dead->time_of_event,
++		       dead->handler,
++		       dead->data,
+ 		       (dead->trace != NULL) ? ", " : "",
+ 		       (dead->trace != NULL) ? dead->trace : ""));
+ 	      sim_events_free (sd, dead);
+@@ -819,9 +821,9 @@
+ 	}
+     }
+   ETRACE ((_ETRACE,
+-	   "event/watch descheduled at %ld - tag 0x%lx - not found\n",
+-	   (long) sim_events_time (sd),
+-	   (long) event_to_remove));
++	   "event/watch descheduled at %" PRId64 " - tag 0x%p - not found\n",
++	   sim_events_time (sd),
++	   event_to_remove));
+ }
+ #endif
+ 
+@@ -1146,11 +1148,11 @@
+ 	  sim_event_handler *handler = to_do->handler;
+ 	  void *data = to_do->data;
+ 	  ETRACE ((_ETRACE,
+-		   "event issued at %ld - tag 0x%lx - handler 0x%lx, data 0x%lx%s%s\n",
+-		   (long) event_time,
+-		   (long) to_do,
+-		   (long) handler,
+-		   (long) data,
++		   "event issued at %" PRId64 " - tag 0x%p - handler 0x%p, data 0x%p%s%s\n",
++		   event_time,
++		   to_do,
++		   handler,
++		   data,
+ 		   (to_do->trace != NULL) ? ", " : "",
+ 		   (to_do->trace != NULL) ? to_do->trace : ""));
+ 	  sim_events_free (sd, to_do);
+@@ -1174,11 +1176,11 @@
+       events->queue = to_do->next;
+       update_time_from_event (sd);
+       ETRACE ((_ETRACE,
+-	       "event issued at %ld - tag 0x%lx - handler 0x%lx, data 0x%lx%s%s\n",
+-	       (long) event_time,
+-	       (long) to_do,
+-	       (long) handler,
+-	       (long) data,
++	       "event issued at %" PRId64 " - tag 0x%p - handler 0x%p, data 0x%p%s%s\n",
++	       event_time,
++	       to_do,
++	       handler,
++	       data,
+ 	       (to_do->trace != NULL) ? ", " : "",
+ 	       (to_do->trace != NULL) ? to_do->trace : ""));
+       sim_events_free (sd, to_do);
+diff -Naur gdb-7.5.orig/sim/erc32/ChangeLog gdb-7.5/sim/erc32/ChangeLog
+--- gdb-7.5.orig/sim/erc32/ChangeLog	2012-06-15 19:20:30.000000000 +0200
++++ gdb-7.5/sim/erc32/ChangeLog	2012-10-03 05:13:35.935580117 +0200
+@@ -1,3 +1,18 @@
++2012-08-16  Ralf Corsépius  <ralf.corsepius@rtems.org>
++
++	* func.c, sis.c: Include <inttypes.h>.
++	Apply PRI* macros to print 64 bit types.
++	* sis.h: Include <stdint.h>.
++	Derive 64 bit types from POSIX 64 types.
++	Don't define UINT64_MAX if already defined.
++
++2012-07-20  Ralf Corsépius  <ralf.corsepius@rtems.org>
++
++	* Makefile.in, configure.ac: Backport from rtems-4.11-gdb-7.4.1.
++	Use system-readline. Fix EXEEXT handling.
++	* erc32.c: Backport from rtems-4.11-gdb-7.4.1.
++	* configure: Regenerate.
++
+ 2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+ 
+ 	* sys.h: Include "config.h".
+diff -Naur gdb-7.5.orig/sim/erc32/configure gdb-7.5/sim/erc32/configure
+--- gdb-7.5.orig/sim/erc32/configure	2012-06-15 19:20:00.000000000 +0200
++++ gdb-7.5/sim/erc32/configure	2012-10-03 05:13:35.938580164 +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
+@@ -723,6 +724,7 @@
+ enable_sim_profile
+ with_pkgversion
+ with_bugurl
++with_system_readline
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -1365,6 +1367,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
+@@ -4811,42 +4814,19 @@
+ 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
+-  # Keep in sync with gdb's configure.ac list.
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+-$as_echo_n "checking for library containing tgetent... " >&6; }
+-if test "${ac_cv_search_tgetent+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$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.
+@@ -4855,65 +4835,20 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char tgetent ();
++char add_history ();
+ int
+ main ()
+ {
+-return tgetent ();
++return add_history ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' termcap tinfo curses ncurses; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_tgetent=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if test "${ac_cv_search_tgetent+set}" = set; then :
+-  break
+-fi
+-done
+-if test "${ac_cv_search_tgetent+set}" = set; then :
+-
+-else
+-  ac_cv_search_tgetent=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tgetent" >&5
+-$as_echo "$ac_cv_search_tgetent" >&6; }
+-ac_res=$ac_cv_search_tgetent
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-  TERMCAP=$ac_cv_search_tgetent
+-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
++if ac_fn_c_try_link "$LINENO"; then :
++  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.
+@@ -4922,33 +4857,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.5.orig/sim/erc32/configure.ac gdb-7.5/sim/erc32/configure.ac
+--- gdb-7.5.orig/sim/erc32/configure.ac	2011-12-31 08:06:47.000000000 +0100
++++ gdb-7.5/sim/erc32/configure.ac	2012-10-03 05:13:35.938580164 +0200
+@@ -7,29 +7,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
+-  # Keep in sync with gdb's configure.ac list.
+-  AC_SEARCH_LIBS(tgetent, [termcap tinfo curses ncurses],
+-    [TERMCAP=$ac_cv_search_tgetent], [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.5.orig/sim/erc32/erc32.c gdb-7.5/sim/erc32/erc32.c
+--- gdb-7.5.orig/sim/erc32/erc32.c	2010-05-11 16:18:20.000000000 +0200
++++ gdb-7.5/sim/erc32/erc32.c	2012-10-03 05:13:35.939580180 +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.5.orig/sim/erc32/func.c gdb-7.5/sim/erc32/func.c
+--- gdb-7.5.orig/sim/erc32/func.c	2010-05-11 16:18:20.000000000 +0200
++++ gdb-7.5/sim/erc32/func.c	2012-10-03 05:13:35.939580180 +0200
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <inttypes.h>
+ #include "sis.h"
+ #include "end.h"
+ #include <dis-asm.h>
+@@ -640,8 +641,8 @@
+ 	sregs->nbranch;
+ #endif
+ 
+-    printf("\n Cycles       : %9d\n\r", ebase.simtime - sregs->simstart);
+-    printf(" Instructions : %9d\n", sregs->ninst);
++    printf("\n Cycles       : %9" PRId64 "\n\r", ebase.simtime - sregs->simstart);
++    printf(" Instructions : %9" PRId64 "\n", sregs->ninst);
+ 
+ #ifdef STAT
+     printf("   integer    : %9.2f %%\n", 100.0 * (float) iinst / (float) sregs->ninst);
+@@ -671,8 +672,8 @@
+     printf(" Processor utilisation       : %5.2f %%\n", 100.0 * (1.0 - ((float) sregs->pwdtime / (float) stime)));
+     printf(" Real-time / simulator-time  : 1/%.2f \n",
+       ((float) sregs->tottime) / ((float) (stime) / (sregs->freq * 1.0E6)));
+-    printf(" Simulator performance       : %d KIPS\n",sregs->ninst/tottime/1000);
+-    printf(" Used time (sys + user)      : %3d s\n\n", sregs->tottime);
++    printf(" Simulator performance       : %" PRId64 " KIPS\n",sregs->ninst/tottime/1000);
++    printf(" Used time (sys + user)      : %3" PRId64 " s\n\n", sregs->tottime);
+ }
+ 
+ 
+diff -Naur gdb-7.5.orig/sim/erc32/Makefile.in gdb-7.5/sim/erc32/Makefile.in
+--- gdb-7.5.orig/sim/erc32/Makefile.in	2012-01-04 09:28:09.000000000 +0100
++++ gdb-7.5/sim/erc32/Makefile.in	2012-10-03 05:13:35.936580132 +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.5.orig/sim/erc32/sis.c gdb-7.5/sim/erc32/sis.c
+--- gdb-7.5.orig/sim/erc32/sis.c	2010-05-11 16:18:20.000000000 +0200
++++ gdb-7.5/sim/erc32/sis.c	2012-10-03 05:13:35.940580196 +0200
+@@ -28,6 +28,7 @@
+ #endif
+ #include <stdio.h>
+ #include <time.h>
++#include <inttypes.h>
+ #include <sys/fcntl.h>
+ #include "sis.h"
+ #include <dis-asm.h>
+@@ -124,7 +125,7 @@
+ 			        sregs->histind = 0;
+ 		        }
+ 		        if (dis) {
+-			    printf(" %8u ", ebase.simtime);
++			    printf(" %8" PRIu64, ebase.simtime);
+ 			    dis_mem(sregs->pc, 1, &dinfo);
+ 		        }
+ 		    }
+@@ -279,7 +280,7 @@
+ 	case CTRL_C:
+ 	    printf("\b\bInterrupt!\n");
+ 	case TIME_OUT:
+-	    printf(" Stopped at time %d (%.3f ms)\n", ebase.simtime, 
++	    printf(" Stopped at time %" PRId64 " (%.3f ms)\n", ebase.simtime,
+ 	      ((double) ebase.simtime / (double) sregs.freq) / 1000.0);
+ 	    break;
+ 	case BPT_HIT:
+@@ -289,7 +290,7 @@
+ 	case ERROR:
+ 	    printf("IU in error mode (%d)\n", sregs.trap);
+ 	    stat = 0;
+-	    printf(" %8d ", ebase.simtime);
++	    printf(" %8" PRId64, ebase.simtime);
+ 	    dis_mem(sregs.pc, 1, &dinfo);
+ 	    break;
+ 	default:
+diff -Naur gdb-7.5.orig/sim/erc32/sis.h gdb-7.5/sim/erc32/sis.h
+--- gdb-7.5.orig/sim/erc32/sis.h	2012-06-15 19:20:30.000000000 +0200
++++ gdb-7.5/sim/erc32/sis.h	2012-10-03 05:13:35.940580196 +0200
+@@ -22,6 +22,8 @@
+ 
+ #include "config.h"
+ #include "ansidecl.h"
++#include <stdint.h>
++
+ #include "gdb/callback.h"
+ #include "gdb/remote-sim.h"
+ 
+@@ -53,10 +55,12 @@
+ typedef double  float64;	/* 64-bit float */
+ 
+ /* FIXME: what about host compilers that don't support 64-bit ints? */
+-typedef unsigned long long uint64; /* 64-bit unsigned int */
+-typedef long long int64;	   /* 64-bit signed int */
++typedef uint64_t uint64; /* 64-bit unsigned int */
++typedef int64_t int64;	   /* 64-bit signed int */
+ 
++#ifndef UINT64_MAX
+ #define UINT64_MAX 18446744073709551615ULL
++#endif
+ 
+ struct pstate {
+ 
+diff -Naur gdb-7.5.orig/sim/microblaze/ChangeLog gdb-7.5/sim/microblaze/ChangeLog
+--- gdb-7.5.orig/sim/microblaze/ChangeLog	2012-06-15 19:20:04.000000000 +0200
++++ gdb-7.5/sim/microblaze/ChangeLog	2012-10-03 05:13:35.940580196 +0200
+@@ -1,3 +1,17 @@
++2012-10-02  Ralf Corsépius  <ralf.corsepius@rtems.org>
++
++	* interp.c: Define SIGBUS, SIGTRAP, SIGQUIT on mingw32.
++	Extend comment on _POSIX/__MINGW32__.
++
++2012-10-02  Ralf Corsépius  <ralf.corsepius@rtems.org>
++
++	Backport from rtems-4.11-gdb-7.4:
++
++	2012-04-29  Ralf Corsépius  <ralf.corsepius@rtems.org>
++
++	* interp.c: Don't include <sys/times.h>, <netinet/in.h>.
++	Define _POSIX on mingw32.
++
+ 2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+ 
+ 	* config.in, configure: Regenerate.
+diff -Naur gdb-7.5.orig/sim/microblaze/interp.c gdb-7.5/sim/microblaze/interp.c
+--- gdb-7.5.orig/sim/microblaze/interp.c	2012-06-06 23:50:03.000000000 +0200
++++ gdb-7.5/sim/microblaze/interp.c	2012-10-03 05:13:35.941580211 +0200
+@@ -19,11 +19,29 @@
+    02110-1301, USA.  */
+ 
+ #include "config.h"
++
++#ifdef __MINGW32__
++/* mingw-w64 defines the SIG* defines if _POSIX is defined */
++#define _POSIX
++#endif
++
+ #include <signal.h>
++
++#ifdef __MINGW32__
++#ifndef SIGTRAP
++#define SIGTRAP 5
++#endif
++#ifndef SIGBUS
++#define SIGBUS 10
++#endif
++#ifndef SIGQUIT
++#define SIGQUIT 3
++#endif
++#endif
++
+ #include "sysdep.h"
+-#include <sys/times.h>
+ #include <sys/param.h>
+-#include <netinet/in.h>	/* for byte ordering macros */
++
+ #include "bfd.h"
+ #include "gdb/callback.h"
+ #include "libiberty.h"
+diff -Naur gdb-7.5.orig/sim/ppc/ChangeLog gdb-7.5/sim/ppc/ChangeLog
+--- gdb-7.5.orig/sim/ppc/ChangeLog	2012-06-15 19:20:07.000000000 +0200
++++ gdb-7.5/sim/ppc/ChangeLog	2012-10-03 05:13:35.942580226 +0200
+@@ -1,3 +1,10 @@
++2012-09-28  Ralf Corsépius  <ralf.corsepius@rtems.org>
++
++	Backport from gcc-7.4-rtems4.11:
++
++	* device.c, device.h: Use (void) device_error.
++	* hw_glue.c: Use %zd to print sizes.
++
+ 2012-06-15  Joel Brobecker  <brobecker@adacore.com>
+ 
+ 	* configure: Regenerate.
+diff -Naur gdb-7.5.orig/sim/ppc/device.c gdb-7.5/sim/ppc/device.c
+--- gdb-7.5.orig/sim/ppc/device.c	2011-02-14 06:14:27.000000000 +0100
++++ gdb-7.5/sim/ppc/device.c	2012-10-03 05:13:35.943580241 +0200
+@@ -1816,7 +1816,7 @@
+ /* I/O */
+ 
+ EXTERN_DEVICE\
+-(void volatile)
++(void)
+ device_error(device *me,
+ 	     const char *fmt,
+ 	     ...)
+diff -Naur gdb-7.5.orig/sim/ppc/device.h gdb-7.5/sim/ppc/device.h
+--- gdb-7.5.orig/sim/ppc/device.h	2001-12-14 01:22:12.000000000 +0100
++++ gdb-7.5/sim/ppc/device.h	2012-10-03 05:13:35.944580256 +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.5.orig/sim/ppc/hw_glue.c gdb-7.5/sim/ppc/hw_glue.c
+--- gdb-7.5.orig/sim/ppc/hw_glue.c	1999-04-16 03:35:09.000000000 +0200
++++ gdb-7.5/sim/ppc/hw_glue.c	2012-10-03 05:13:35.944580256 +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);