--- gcc/config/pa/pa-hpux7.h	2018/04/24 18:10:27	1.1
+++ gcc/config/pa/pa-hpux7.h	2018/04/24 18:17:22	1.1.1.2
@@ -21,6 +21,9 @@ the Free Software Foundation, 675 Mass A
 #define TARGET_DEFAULT 0
 #endif
 
+/* HPUX 7 has the old assembler.  */
+#define HP_FP_ARG_DESCRIPTOR_REVERSED
+
 #include "pa/pa.h"
 
 /* Make GCC agree with types.h.  */
@@ -36,9 +39,11 @@ the Free Software Foundation, 675 Mass A
 
 /* HPUX doesn't use any debugging format that GCC knows about.  */
 #undef DBX_DEBUGGING_INFO
+#undef DEFAULT_GDB_EXTENSIONS
+#define DEFAULT_GDB_EXTENSIONS 0
 
 /* Like the default, except no -lg.  */
-#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-L/lib/libp/ -lc}%{pg:-L/lib/libp/ -lc}"
+#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p: -L/lib/libp/ -lc}%{pg: -L/lib/libp/ -lc}"
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -DPWB -Dhpux -Dunix -D_HPUX_SOURCE"
+#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -DPWB -Dhpux -Dunix -D_HPUX_SOURCE -Asystem(unix) -Asystem(hpux) -Acpu(hppa) -Amachine(hppa)"