--- gcc/config/tahoe.h	2018/04/24 17:54:24	1.1.1.2
+++ gcc/config/tahoe.h	2018/04/24 18:05:00	1.1.1.4
@@ -256,11 +256,11 @@ enum reg_class {NO_REGS,GENERAL_REGS,FPP
 
 #define REGNO_REG_CLASS(REGNO) (REGNO == 16 ? FPP_REG : GENERAL_REGS)
 
-/* only gereral registers can be used as a base reg */
+/* only general registers can be used as a base reg */
 
 #define BASE_REG_CLASS GENERAL_REGS
 
-/* only gereral registers can be used to index */
+/* only general registers can be used to index */
 
 #define INDEX_REG_CLASS GENERAL_REGS
 
@@ -513,7 +513,7 @@ enum reg_class {NO_REGS,GENERAL_REGS,FPP
 	      INDEX_TERM_P (xfooa, MODE)))				\
 	goto ADDR; } }
 
-/* Is the rtx X a valid memoy address for operand of mode MODE? */
+/* Is the rtx X a valid memory address for operand of mode MODE? */
 /* If it is, go to ADDR */
 
 #define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR)  \
@@ -647,7 +647,7 @@ enum reg_class {NO_REGS,GENERAL_REGS,FPP
 /* specify the costs of various sorts of constants,
    and also indicate that multiplication is cheap on this machine.  */
 
-#define CONST_COSTS(RTX,CODE) \
+#define CONST_COSTS(RTX,CODE,OUTER_CODE) \
   case CONST_INT:						\
     /* Constant zero is super cheap due to clr instruction.  */	\
     if (RTX == const0_rtx) return 0;				\