--- gcc/config/convex/convex.h	2018/04/24 18:10:25	1.1.1.1
+++ gcc/config/convex/convex.h	2018/04/24 18:15:22	1.1.1.2
@@ -94,7 +94,7 @@ extern int target_flags;
 
 /* Names to predefine in the preprocessor for this target machine.  */
 
-#define CPP_PREDEFINES "-Dconvex -Dunix"
+#define CPP_PREDEFINES "-Dconvex -Dunix -Asystem(unix) -Acpu(convex) -Amachine(convex)"
 
 /* Print subsidiary information on the compiler version in use.  */
 
@@ -497,6 +497,8 @@ extern int target_flags;
 #define FLOAT_TYPE_SIZE		32
 #define DOUBLE_TYPE_SIZE	64
 #define LONG_DOUBLE_TYPE_SIZE	64
+/* This prevents cexp.c from depending on LONG_TYPE_SIZE.  */
+#define MAX_LONG_TYPE_SIZE      64
 
 /* Declare the standard types used by builtins to match convex stddef.h --
    with int rather than long.  */