--- gcc/config/tahoe/tahoe.h	2018/04/24 18:10:25	1.1.1.1
+++ gcc/config/tahoe/tahoe.h	2018/04/24 18:16:08	1.1.1.2
@@ -44,7 +44,7 @@ the Free Software Foundation, 675 Mass A
 #define TARGET_VERSION printf (" (hcx)");
 #else
 /* we want "tahoe" and "unix" defined for all future compilations */
-#define CPP_PREDEFINES "-Dtahoe -Dunix"
+#define CPP_PREDEFINES "-Dtahoe -Dunix -Asystem(unix) -Acpu(tahoe) -Amachine(tahoe)"
 /* have cc1 print that this is the tahoe version */
 #define TARGET_VERSION printf (" (tahoe)");
 #endif
@@ -621,7 +621,7 @@ enum reg_class {NO_REGS,GENERAL_REGS,FPP
 /* any bits higher than the low 4 are ignored in the shift count */
 /* so don't bother zero extending or sign extending them         */
 
-#define SHIFT_COUNT_TRUNCATED
+#define SHIFT_COUNT_TRUNCATED 1
 
 /* we don't need to officially convert from one fixed type to another */
 /* in order to use it as that type. We can just assume it's the same  */