--- gcc/config/pa/pa-hpux.h	2018/04/24 18:10:27	1.1.1.1
+++ gcc/config/pa/pa-hpux.h	2018/04/24 18:17:24	1.1.1.2
@@ -36,12 +36,18 @@ 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)"
 
 #undef LINK_SPEC
-#define LINK_SPEC "-u main -a archive"
+#define LINK_SPEC "-u main %{static: -a archive}%{g: -a archive}"
+
+/* hpux8 and later have C++ compatable include files, so do not
+   pretend they are `extern "C"'.  */
+#define NO_IMPLICIT_EXTERN_C