--- gcc/config/pa/pa-hpux.h	2018/04/24 18:17:24	1.1.1.2
+++ gcc/config/pa/pa-hpux.h	2018/04/24 18:23:34	1.1.1.3
@@ -26,13 +26,9 @@ the Free Software Foundation, 675 Mass A
 /* Make GCC agree with types.h.  */
 #undef SIZE_TYPE
 #undef PTRDIFF_TYPE
-#undef WCHAR_TYPE
-#undef WCHAR_TYPE_SIZE
 
 #define SIZE_TYPE "unsigned int"
 #define PTRDIFF_TYPE "int"
-#define WCHAR_TYPE "unsigned int"
-#define WCHAR_TYPE_SIZE 32
 
 /* HPUX doesn't use any debugging format that GCC knows about.  */
 #undef DBX_DEBUGGING_INFO
@@ -46,7 +42,7 @@ the Free Software Foundation, 675 Mass A
 #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 %{static: -a archive}%{g: -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"'.  */