Made -pipe work for -msvr4. Added -D*_TARGET definitions.

From-SVN: r7903

diff --git a/gcc/config/m88k/dgux.h b/gcc/config/m88k/dgux.h
index 69db461788ae733a82d7b31461c44326c667eaa0..9765cbee771abbf534f094deeefbfd51c1a06000 100644 (file)
--- a/gcc/config/m88k/dgux.h
+++ b/gcc/config/m88k/dgux.h
@@ -31,7 +31,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
   (TARGET_SVR4 ? DWARF_DEBUG : SDB_DEBUG)
 
 #ifndef VERSION_INFO2
-#define VERSION_INFO2   "$Revision: 1.13 $"
+#define VERSION_INFO2   "$Revision: 1.14 $"
 #endif
 #ifndef NO_BUGS
 #define AS_BUG_IMMEDIATE_LABEL
@@ -85,13 +85,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef CPP_SPEC
 #define        CPP_SPEC "%{!m88000:%{!m88100:%{m88110:-D__m88110__}}} \
                  %{!m88000:%{!m88110:%{m88100:-D__m88100__}}} \
-                 %{!ansi:%{!traditional:-D__OPEN_NAMESPACE__}}"
+                 %{!ansi:%{!traditional:-D__OPEN_NAMESPACE__}} \
+                 %{msvr3:-D_M88KBCS_TARGET} %{!msvr3:-D_DGUX_TARGET}"
 
 /* Assembler support (-V, silicon filter, legends for mxdb).  */
 #undef ASM_SPEC
 #define ASM_SPEC "\
 %{V} %{v:%{!V:-V}} %{pipe:%{!.s: - }\
-%{!msvr3:%{mversion-03.00:-KV3}%{!mversion-03.00:%{mversion-*:-KV%*}}}}\
+%{!msvr3:%{!m88110:-KV3 }%{m88110:-KV04.00 }}}\
 %{!mlegend:%{mstandard:-Wc,off}}\
 %{mlegend:-Wc,-fix-bb,-h\"gcc-" VERSION_INFO2 "\",-s\"%i\"\
 %{traditional:,-lc}%{!traditional:,-lansi-c}\

diff --git a/gcc/config/m88k/dguxbcs.h b/gcc/config/m88k/dguxbcs.h
index acba809ad676604f95aaf2af69f6b461d3fccd14..57203b5c087ec3fafe5373e2c1f14c920df76d5a 100644 (file)
--- a/gcc/config/m88k/dguxbcs.h
+++ b/gcc/config/m88k/dguxbcs.h
@@ -39,7 +39,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef ASM_SPEC
 #define ASM_SPEC "\
 %{V} %{v:%{!V:-V}} %{pipe:%{!.s: - }\
-%{msvr4:%{mversion-03.00:-KV3}%{!mversion-03.00:%{mversion-*:-KV%*}}}}\
+%{msvr4:%{!m88110:-KV3 }%{m88110:-KV04.00 }}}\
 %{!mlegend:%{mstandard:-Wc,off}}\
 %{mlegend:-Wc,-fix-bb,-h\"gcc-" VERSION_INFO2 "\",-s\"%i\"\
 %{traditional:,-lc}%{!traditional:,-lansi-c}\
@@ -48,6 +48,16 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 %{mexternal-legend:,-external}\
 %{mocs-frame-position:,-ocs}}"
 
+/* If -m88100 is in effect, add -Dm88100; similarly for -m88110.
+   Here, the CPU_DEFAULT is assumed to be -m88000.  If not -ansi,
+   -traditional, or restricting include files to one specific source
+   target, specify full DG/UX features.  */
+#undef CPP_SPEC
+#define        CPP_SPEC "%{!m88000:%{!m88100:%{m88110:-D__m88110__}}} \
+                 %{!m88000:%{!m88110:%{m88100:-D__m88100__}}} \
+                 %{!ansi:%{!traditional:-D__OPEN_NAMESPACE__}} \
+                 %{!msvr4:-D_M88KBCS_TARGET} %{msvr4:-D_DGUX_TARGET}"
+
 /* Linker and library spec's.
    -msvr3 is the default if -msvr4 is not specified. */
 #undef LIB_SPEC