source: rtems/contrib/crossrpms/patches/gcc-core-4.3.3-rtems4.10-20090125.diff @ b2b9ba12

configure

@@ -2185 +2185 @@
     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
     ;;
   *-*-rtems*)
+    skipdirs="$skipdirs target-libiberty"
     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
     ;;
     # The tpf target doesn't support gdb yet.
@@ -5829 +5830 @@
        # 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.
-       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include'
+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed'
 
        # Someone might think of using the pre-installed headers on
        # Canadian crosses, in case the installed compiler is not fully

configure.ac

@@ -462 +462 @@
     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
     ;;
   *-*-rtems*)
+    skipdirs="$skipdirs target-libiberty"
     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
     ;;
     # The tpf target doesn't support gdb yet.
@@ -2340 +2341 @@
        # 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.
-       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include'
+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed'
 
        # Someone might think of using the pre-installed headers on
        # Canadian crosses, in case the installed compiler is not fully

gcc/config/arm/rtems-elf.h

@@ -43 +43 @@
  *  with how this used to be defined.
  */
 #undef LINK_GCC_C_SEQUENCE_SPEC
-#define LINK_GCC_C_SEQUENCE_SPEC "%G %L"

gcc/config/m32c/rtems.h

@@ +1 @@
+/* Definitions for rtems targeting a M32C using ELF.
+   Copyright (C) 2008, 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

gcc/config/m32r/rtems.h

@@ +1 @@
+/* Definitions for rtems targeting a M32R using ELF.
+   Copyright (C) 2008, 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

gcc/config/m68k/t-rtems

@@ -4 +4 @@
                      || MLIB == "5206" \
                      || MLIB == "5208" \
                      || MLIB == "5307" \
+                     || MLIB == "5329" \
                      || MLIB == "5407" \
                      || MLIB == "5475")

gcc/config/mips/elf.h

@@ -48 +48 @@
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
 
-#define NO_IMPLICIT_EXTERN_C 1
-
 #define HANDLE_PRAGMA_PACK_PUSH_POP 1

gcc/config/rs6000/rtems.h

@@ -49 +49 @@
 %{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)                            \
+      {                                         \
+        rs6000_float_gprs = 1;                  \
+      }                                         \
+  } while(0)

gcc/config/rs6000/t-rtems

@@ -1 +1 @@
 # Multilibs for powerpc RTEMS targets.
 
 MULTILIB_OPTIONS        = \
-mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \
+mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \
 Dmpc8260 \
 msoft-float
 
 MULTILIB_DIRNAMES       = \
-m403 m505 m601 m603e m604 m860 m7400 \
+m403 m505 m601 m603e m604 m860 m7400 m8540 \
 mpc8260 \
 nof
 
-MULTILIB_EXTRA_OPTS     = mrelocatable-lib mno-eabi mstrict-align
-
 # MULTILIB_MATCHES      = ${MULTILIB_MATCHES_FLOAT}
 MULTILIB_MATCHES        =
 MULTILIB_MATCHES        += ${MULTILIB_MATCHES_ENDIAN}
@@ -31 +29 @@
 # Map 750 to .
 MULTILIB_MATCHES        += mcpu?750=
 
+# Map e500, 8548 to 8540
+MULTILIB_MATCHES        += mcpu?8540=mcpu?e500
+MULTILIB_MATCHES        += mcpu?8540=mcpu?8548
+
 # Soft-float only, default implies msoft-float
 # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES
 MULTILIB_SOFTFLOAT_ONLY = \
@@ -64 +66 @@
 MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc*
 MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc*
 MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc*
+MULTILIB_EXCEPTIONS += *mcpu=8540/Dmpc*

gcc/config.gcc

@@ -1490 +1490 @@
         extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
         use_fixproto=yes
         ;;
+m32r-*-rtems*)
+        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} m32r/rtems.h rtems.h"
+        tmake_file="m32r/t-m32r t-rtems"
+        extra_parts="crtinit.o crtfini.o"
+        ;;
 m32r-*-linux*)
         tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} m32r/linux.h"
         # We override the tmake_file for linux -- why?
@@ -2636 +2641 @@
         extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
         use_collect2=no
         ;;
+m32c-*-rtems*)
+        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} m32c/rtems.h rtems.h"
+        tmake_file="${tmake_file} t-rtems"
+        c_target_objs="m32c-pragma.o"
+        cxx_target_objs="m32c-pragma.o"
+        ;;
 m32c-*-elf*)
         tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
         c_target_objs="m32c-pragma.o"

libgcc/config.host

@@ -403 +403 @@
         ;;
 m32rle-*-elf*)
         ;;
+m32r*-*-rtems*)
+        ;;
 m32r-*-linux*)
         ;;
 m32rle-*-linux*)
@@ -646 +648 @@
 am33_2.0-*-linux*)
         extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
         ;;
-m32c-*-elf*)
+m32c-*-elf*|m32c-*-rtems*)
         ;;
 *)
         echo "*** Configuration ${host} not supported" 1>&2