4 files changed, 30 insertions, 33 deletions
diff --git a/gcc/config/arm/telf.h b/gcc/config/arm/telf.h
index a956f48..9bd6bcf 100755
--- a/gcc/config/arm/telf.h
+++ b/gcc/config/arm/telf.h
@@ -42,7 +42,6 @@ extern int arm_structure_size_boundary;
 
 /* Debug */
 #define DWARF2_DEBUGGING_INFO
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 
 
 /* Note - it is important that these definitions match those in semi.h for the ARM port.  */
diff --git a/gcc/config/arm/thumb.c b/gcc/config/arm/thumb.c
index c5ff67c..0310a51 100755
--- a/gcc/config/arm/thumb.c
+++ b/gcc/config/arm/thumb.c
@@ -29,9 +29,12 @@
 #include "output.h"
 #include "insn-flags.h"
 #include "insn-attr.h"
+#include "insn-config.h"
 #include "flags.h"
 #include "tree.h"
 #include "expr.h"
+#include "toplev.h"
+#include "recog.h"
 
 int current_function_anonymous_args = 0;
 static int current_function_has_far_jump = 0;
@@ -41,16 +44,6 @@ char *structure_size_string = NULL;
 int arm_structure_size_boundary = 32;    /* Used to be 8 */
 
 /* Predicates */
-int
-reload_memory_operand(rtx op, enum machine_mode mode)
-{
-    int regno = true_regnum(op);
-
-    return (!CONSTANT_P(op)
-            && (regno == -1
-                || (GET_CODE(op) == REG
-                    && REGNO(op) >= FIRST_PSEUDO_REGISTER)));
-}
 
 /* Return nonzero if op is suitable for the RHS of a cmp instruction.  */
 int
@@ -1278,13 +1271,6 @@ output_move_mem_multiple(int n, rtx *operands)
     return "";
 }
 
-
-int
-thumb_epilogue_size()
-{
-    return 42; /* The answer to .... */
-}
-
 static char *conds[] =
 {
     "eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc",
@@ -1524,7 +1510,7 @@ arm_valid_machine_decl_attribute(tree decl, tree attributes, tree attr, tree arg
    reloading.  */
 
 int
-s_register_operand(register rtx op, enum machine_mode mode)
+s_register_operand(rtx op, enum machine_mode mode)
 {
     if (GET_MODE(op) != mode && mode != VOIDmode)
         return 0;
diff --git a/gcc/config/arm/thumb.h b/gcc/config/arm/thumb.h
index 7434831..e5918a1 100755
--- a/gcc/config/arm/thumb.h
+++ b/gcc/config/arm/thumb.h
@@ -1107,8 +1107,31 @@ int thumb_shiftable_const ();
    limited PC addressing range: */
 #define MACHINE_DEPENDENT_REORG(INSN) thumb_reorg ((INSN))
 
+#include <stdio.h>
+
+enum machine_mode;
+
+struct rtx_def;
+typedef struct rtx_def *rtx;
+
+union tree_node;
+typedef union tree_node *tree;
+
+extern int thumb_cmp_operand(rtx, enum machine_mode);
+extern void thumb_reorg(rtx first);
+extern void thumb_expand_movstrqi(rtx *);
+extern void thumb_reload_out_si(rtx);
+extern void final_prescan_insn(rtx);
+extern int far_jump_used_p();
+extern void thumb_function_prologue(FILE *, int);
+extern void thumb_expand_prologue();
+extern void thumb_function_epilogue(FILE *, int);
+extern void thumb_expand_epilogue();
 extern char *thumb_unexpanded_epilogue();
-extern char *output_move_mem_multiple();
 extern char *thumb_load_double_from_address();
-extern int   far_jump_used_p();
-extern void  thumb_override_options();
+extern char *output_move_mem_multiple();
+extern void thumb_print_operand(FILE *, rtx, int);
+extern int thumb_return_in_memory(tree);
+extern void thumb_override_options();
+extern int arm_valid_machine_decl_attribute(tree, tree, tree, tree);
+extern int s_register_operand(rtx, enum machine_mode);
diff --git a/gcc/config/arm/thumb.md b/gcc/config/arm/thumb.md
index ed37724..fe37c9c 100755
--- a/gcc/config/arm/thumb.md
+++ b/gcc/config/arm/thumb.md
@@ -95,17 +95,6 @@
   operands[1] = GEN_INT (- INTVAL (operands[1]));
 ")
 
-;;(define_expand "reload_outsi"
-;;  [(set (match_operand:SI 2 "register_operand" "=&l")
-;;	(match_operand:SI 1 "register_operand" "h"))
-;;   (set (match_operand:SI 0 "reload_memory_operand" "=o")
-;;	(match_dup 2))]
-;;  ""
-;;  "
-;;/*  thumb_reload_out_si (operands);
-;;  DONE; */
-;;")
-
 (define_expand "movhi"
   [(set (match_operand:HI 0 "general_operand" "")
 	(match_operand:HI 1 "general_operand" ""))]