--- gcc/config/pyr/pyr.h	2018/04/24 18:10:26	1.1
+++ gcc/config/pyr/pyr.h	2018/04/24 18:16:21	1.1.1.2
@@ -41,7 +41,7 @@ the Free Software Foundation, 675 Mass A
 
 /* Names to predefine in the preprocessor for this target machine.  */
 
-#define CPP_PREDEFINES "-Dpyr -Dunix"
+#define CPP_PREDEFINES "-Dpyr -Dunix -Asystem(unix) -Acpu(pyr) -Amachine(pyr)"
 
 /* Print subsidiary information on the compiler version in use.  */
 
@@ -627,8 +627,9 @@ extern int inner_param_safe_helper();
    for a call to a function whose data type is FNTYPE.
    For a library call, FNTYPE is 0.   */
 
-#define INIT_CUMULATIVE_ARGS(CUM,FNTYPE,LIBNAME) \
-  ((CUM) = (FNTYPE && !flag_pcc_struct_return && aggregate_value_p (FNTYPE)))
+#define INIT_CUMULATIVE_ARGS(CUM,FNTYPE,LIBNAME)	\
+  ((CUM) = (FNTYPE && !flag_pcc_struct_return		\
+	    && aggregate_value_p (TREE_TYPE (FNTYPE))))
 
 /* Determine where to put an argument to a function.
    Value is zero to push the argument on the stack,
@@ -1028,10 +1029,9 @@ extern int current_function_calls_alloca
 /* 1 if byte access requires more than one instruction */
 #define SLOW_BYTE_ACCESS 0
 
-/* Define if shifts truncate the shift count
-   which implies one can omit a sign-extension or zero-extension
-   of a shift count.  */
-#define SHIFT_COUNT_TRUNCATED
+/* Define this to be nonzero if shift instructions ignore all but the low-order
+   few bits. */
+#define SHIFT_COUNT_TRUNCATED 1
 
 /* Value is 1 if truncating an integer of INPREC bits to OUTPREC bits
    is done just by pretending it is already truncated.  */