(PTRDIFF_TYPE): Delete.

(CPP_SPEC): Define, overriding ultrix.h version.

From-SVN: r7201

diff --git a/gcc/config/mips/dec-osf1.h b/gcc/config/mips/dec-osf1.h
index d40e5fed040c91bc7d15c58153e5086207970813..3c73477b0894e112544e8bb0cb1113990b2689db 100644 (file)
--- a/gcc/config/mips/dec-osf1.h
+++ b/gcc/config/mips/dec-osf1.h
@@ -32,17 +32,27 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "mips/ultrix.h"
 
-/* Specify size_t, ptrdiff_t, and wchar_t types.  */
+/* Specify size_t and wchar_t types.  */
 #undef SIZE_TYPE
-#undef PTRDIFF_TYPE
 #undef WCHAR_TYPE
 #undef WCHAR_TYPE_SIZE
 
 #define SIZE_TYPE      "long unsigned int"
-#define PTRDIFF_TYPE   "int"
 #define WCHAR_TYPE     "short unsigned int"
 #define WCHAR_TYPE_SIZE SHORT_TYPE_SIZE
 
+#undef CPP_SPEC
+#define CPP_SPEC "\
+%{.S:  -D__LANGUAGE_ASSEMBLY__ -D__LANGUAGE_ASSEMBLY %{!ansi:-DLANGUAGE_ASSEMBLY}} \
+%{.s:  -D__LANGUAGE_ASSEMBLY__ -D__LANGUAGE_ASSEMBLY %{!ansi:-DLANGUAGE_ASSEMBLY}} \
+%{.cc: -D__LANGUAGE_C_PLUS_PLUS__ -D__LANGUAGE_C_PLUS_PLUS} \
+%{.cxx:        -D__LANGUAGE_C_PLUS_PLUS__ -D__LANGUAGE_C_PLUS_PLUS} \
+%{.C:  -D__LANGUAGE_C_PLUS_PLUS__ -D__LANGUAGE_C_PLUS_PLUS} \
+%{.m:  -D__LANGUAGE_OBJECTIVE_C__ -D__LANGUAGE_OBJECTIVE_C} \
+%{!.S:%{!.s:   -D__LANGUAGE_C__  -D__LANGUAGE_C %{!ansi:-DLANGUAGE_C}}} \
+%{mlong64:-D__PTRDIFF_TYPE__=long\\ int} \
+%{!mlong64:-D__PTRDIFF_TYPE__=int}"
+
 /* turn off collect2 COFF support, since ldfcn now has elf declaration */
 #undef OBJECT_FORMAT_COFF