-#ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 0x88 /* TARGET_GAS + TARGET_JUMP_IN_DELAY */
-#endif
-
-#include "pa/pa.h"
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -Dunix -Dhp9000 -Dhp800 -Dspectrum -DREVARGV -Dparisc -D__pa_risc -DPARISC -DBYTE_MSF -DBIT_MSF -Asystem(unix) -Asystem(mach) -Acpu(hppa) -Amachine(hppa)"
+#undef TARGET_OS_CPP_BUILTINS
+#define TARGET_OS_CPP_BUILTINS() \
+ do \
+ { \
+ if (TARGET_PA_11) \
+ { \
+ builtin_define_std ("hp700"); \
+ builtin_define_std ("HP700"); \
+ } \
+ else \
+ { \
+ builtin_define_std ("hp800"); \
+ builtin_define_std ("hp9k8"); \
+ builtin_define_std ("hp9000s800"); \
+ } \
+ builtin_define_std ("BIT_MSF"); \
+ builtin_define_std ("BYTE_MSF"); \
+ builtin_define_std ("PARISC"); \
+ builtin_define_std ("REVARGV"); \
+ builtin_define_std ("hp9000"); \
+ builtin_define ("__pa_risc"); \
+ builtin_define_std ("parisc"); \
+ builtin_define_std ("spectrum"); \
+ builtin_define_std ("unix"); \
+ builtin_assert ("system=mach"); \
+ builtin_assert ("system=unix"); \
+ } \
+ while (0)