re PR target/19548 (RTEMS CPP specs not merged from 3.2/3.2 branches)

2005-01-22  Ralf Corsepius  <ralf.corsepius@rtems.org>

	PR target/19548
	* config/rs6000/rtems.h: Resurrect cpp_os_rtems_spec from gcc < 3.4.
	(CPP_OS_RTEMS_SPEC): New (From gcc-3.3's config/rs6000/sys4.h).
	(SUBSUBTARGET_EXTRA_SPECS): Use CPP_OS_RTEMS_SPEC.

From-SVN: r94056

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 239949552c56c1a7ba39af05a7b7c6b481d415a2..2ddbd652c372d1da267504df923a24e713a4004d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-22  Ralf Corsepius  <ralf.corsepius@rtems.org>
+
+       PR target/19548
+       * config/rs6000/rtems.h: Resurrect cpp_os_rtems_spec from gcc < 3.4.
+       (CPP_OS_RTEMS_SPEC): New (From gcc-3.3's config/rs6000/sys4.h).
+       (SUBSUBTARGET_EXTRA_SPECS): Use CPP_OS_RTEMS_SPEC.
+
 2005-01-22  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        PR c/18809

diff --git a/gcc/config/rs6000/rtems.h b/gcc/config/rs6000/rtems.h
index d70a78df9388259d07830ae1799cf209e7dc8f3c..bfa3a21998c9fca53c56d501c4c9137477120b23 100644 (file)
--- a/gcc/config/rs6000/rtems.h
+++ b/gcc/config/rs6000/rtems.h
@@ -38,3 +38,20 @@
 
 #undef CPP_OS_DEFAULT_SPEC
 #define CPP_OS_DEFAULT_SPEC "%(cpp_os_rtems)"
+
+#define CPP_OS_RTEMS_SPEC "\
+%{!mcpu*:  %{!Dppc*: %{!Dmpc*: -Dmpc750} } }\
+%{mcpu=403:  %{!Dppc*: %{!Dmpc*: -Dppc403}  } } \
+%{mcpu=505:  %{!Dppc*: %{!Dmpc*: -Dmpc505}  } } \
+%{mcpu=601:  %{!Dppc*: %{!Dmpc*: -Dppc601}  } } \
+%{mcpu=602:  %{!Dppc*: %{!Dmpc*: -Dppc602}  } } \
+%{mcpu=603:  %{!Dppc*: %{!Dmpc*: -Dppc603}  } } \
+%{mcpu=603e: %{!Dppc*: %{!Dmpc*: -Dppc603e} } } \
+%{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
+%{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
+%{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
+%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }" 
+
+#undef  SUBSUBTARGET_EXTRA_SPECS
+#define SUBSUBTARGET_EXTRA_SPECS \
+  { "cpp_os_rtems",            CPP_OS_RTEMS_SPEC }