--- gcc/config/spur/spur.h	2018/04/24 18:10:26	1.1.1.1
+++ gcc/config/spur/spur.h	2018/04/24 18:16:24	1.1.1.2
@@ -24,7 +24,7 @@ the Free Software Foundation, 675 Mass A
 
 /* Names to predefine in the preprocessor for this target machine.  */
 
-#define CPP_PREDEFINES "-Dspur"
+#define CPP_PREDEFINES "-Dspur -Acpu(spur) -Amachine(spur)"
 
 /* Link with libg.a when debugging, for dbx's sake.  */
 
@@ -414,7 +414,7 @@ enum reg_class { NO_REGS, GENERAL_REGS,
    invisible first argument.  */
 
 #define INIT_CUMULATIVE_ARGS(CUM,FNTYPE,LIBNAME)	\
- ((CUM) = ((FNTYPE) != 0 && aggregate_value_p ((FNTYPE))))
+ ((CUM) = ((FNTYPE) != 0 && aggregate_value_p (TREE_TYPE ((FNTYPE)))))
 
 /* Update the data in CUM to advance over an argument
    of mode MODE and data type TYPE.