Add a symbol's value to the computed frag offset, rather than overwriting it.

[deliverable/binutils-gdb.git] / gdb / arm-tdep.c

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 24f54667f2cbe430cc5007694f1973ea2f1614c5..edacf985ace3e401bb7e0becb53fc55d293ce585 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -27,19 +27,10 @@
 #include "symfile.h"
 #include "gdb_string.h"
 #include "coff/internal.h"     /* Internal format of COFF symbols in BFD */
+#include "dis-asm.h"           /* For register flavors. */
 
 extern void _initialize_arm_tdep (void);
 
-/* From opcodes/arm-dis.c */
-
-extern int get_arm_regname_num_options (void);
-
-extern int set_arm_regname_option (int option);
-
-extern int get_arm_regnames (int option, const char **setname,
-                            const char **setdescription,
-                            const char ***regnames);
-
 /* Number of different reg name sets (options). */
 static int num_flavor_options;