--- gcc/config/pa/pa-utahmach.h	2018/04/24 18:10:27	1.1.1.1
+++ gcc/config/pa/pa-utahmach.h	2018/04/24 18:17:26	1.1.1.2
@@ -18,16 +18,11 @@ You should have received a copy of the G
 along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* This is the same as pa-hpux.h, except that we generate snake code by
-   default and we have to deal with assembler weirdness. */
-
-#define HP_FP_ARG_DESCRIPTOR_REVERSED
-
-#define TARGET_DEFAULT 32	/* TARGET_DISABLE_INDEXING */
+#define TARGET_DEFAULT 128		/* TARGET_GAS */
 
 #include "pa/pa.h"
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dhppa -Dhp9000s800 -D__hp9000s800 -Dhp9k8 -Dunix -D_HPUX_SOURCE -Dhp9000 -Dhp800 -Dspectrum -DREVARGV -Dhp700 -DHP700 -Dparisc -D__pa_risc -DPARISC -DBYTE_MSF -DBIT_MSF"
+#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)"
 
 /* Don't default to pcc-struct-return, because gcc is the only compiler, and
    we want to retain compatibility with older gcc versions.  */