--- gcc/config/pa/pa-ghiux.h	2018/04/24 18:17:28	1.1
+++ gcc/config/pa/pa-ghiux.h	2018/04/24 18:31:19	1.1.1.3
@@ -1,4 +1,4 @@
-/* Definitions of target machine for GNU compiler, for HI-UX using GNU as.
+/* Definitions of target machine for GNU compiler, for HI-UX.
    Copyright (C) 1993 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
@@ -15,41 +15,13 @@ GNU General Public License for more deta
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
-#ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT 0
-#endif
-
-#include "pa/pa.h"
-
-/* 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
-
-/* Like the default, except no -lg.  */
-#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-L/lib/libp/ -lc}%{pg:-L/lib/libp/ -lc}"
-
-#undef CPP_SPEC
-#if (TARGET_DEFAULT & 1) == 0
-#define CPP_SPEC "%{msnake:-D_PA_RISC1_1}\
- %{mpa-risc-1-1:-D_PA_RISC1_1}"
-#else
-#define CPP_SPEC "%{!mpa-risc-1-0:%{!mnosnake:-D_PA_RISC1_1}}"
-#endif
-
-#undef CC1_SPEC
-#define CC1_SPEC "-fwritable-strings %{pg:} %{p:}"
+/* HIUX is just a HPUX variant.  We can simply use the HPUX configuration
+   for just about everything.  */
+#include "pa/pa-ghpux.h"
 
+/* Predefines are the one noteworthy difference between HPUX and HIUX.  */
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dhppa -DPWB -Dunix -D_HIUX_SOURCE -D__H3050R -D__H3050RX"
-
-#undef LINK_SPEC
-#define LINK_SPEC "-u main -a archive"
+#define CPP_PREDEFINES "-Dhppa -DPWB -Dunix -D_HIUX_SOURCE -D__H3050R -D__H3050RX -Asystem(unix) -Asystem(hiux) -Acpu(hppa) -Amachine(hppa)"