Merged in changes made in armT-970328-branch

4 files changed, 41 insertions, 9 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 810032b..72d0685 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jun  3 16:57:45 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* bfd-in2.h: Add Thumb relocations.
+
+	* libbfd.h: Add Thumb relocations.
+
+Mon Jun  2 10:41:52 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* cpu-m68k.c (arch_info_struct): Fix 68060 cpu name.
+
 Fri May 30 12:46:27 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Set dynindx
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index bcead95..f9b5bce 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -309,6 +309,7 @@ typedef struct sec *sec_ptr;
 #define bfd_section_name(bfd, ptr) ((ptr)->name)
 #define bfd_section_size(bfd, ptr) (bfd_get_section_size_before_reloc(ptr))
 #define bfd_section_vma(bfd, ptr) ((ptr)->vma)
+#define bfd_section_lma(bfd, ptr) ((ptr)->lma)
 #define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power)
 #define bfd_get_section_flags(bfd, ptr) ((ptr)->flags + 0)
 #define bfd_get_section_userdata(bfd, ptr) ((ptr)->userdata)
@@ -632,6 +633,8 @@ extern boolean bfd_i386linux_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 extern boolean bfd_m68klinux_size_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
+extern boolean bfd_sparclinux_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
 
 /* mmap hacks */
 
@@ -699,7 +702,7 @@ bfd *
 bfd_fdopenr PARAMS ((CONST char *filename, CONST char *target, int fd));
 
 bfd *
-bfd_openstreamr PARAMS (());
+bfd_openstreamr PARAMS ((const char *, const char *, PTR));
 
 bfd *
 bfd_openw PARAMS ((CONST char *filename, CONST char *target));
@@ -1221,6 +1224,12 @@ enum bfd_architecture
   bfd_arch_sh,         /* Hitachi SH */
   bfd_arch_alpha,      /* Dec Alpha */
   bfd_arch_arm,        /* Advanced Risc Machines ARM */
+#define bfd_mach_arm_2		1
+#define bfd_mach_arm_2a		2
+#define bfd_mach_arm_3		3
+#define bfd_mach_arm_3M 	4
+#define bfd_mach_arm_4 		5
+#define bfd_mach_arm_4T 	6
   bfd_arch_ns32k,      /* National Semiconductors ns32000 */
   bfd_arch_w65,        /* WDC 65816 */
   /* start-sanitize-tic80 */
@@ -1236,9 +1245,7 @@ enum bfd_architecture
 #define bfd_mach_arc_graphics 2
 #define bfd_mach_arc_audio 3
   /* end-sanitize-arc */
-  /* start-sanitize-m32r */
-  bfd_arch_m32r,       /* Mitsubishi M32R */
-  /* end-sanitize-m32r */
+  bfd_arch_m32r,       /* Mitsubishi M32R/D */
   bfd_arch_mn10200,    /* Matsushita MN10200 */
   bfd_arch_mn10300,    /* Matsushita MN10300 */
   bfd_arch_last
@@ -1839,6 +1846,11 @@ through 0. */
   BFD_RELOC_ARC_B26,
 /* end-sanitize-arc */
 
+/* Thumb 23-, 12- and 9-bit pc-relative branches.  The lowest bit must
+   be zero and is not stored in the instruction. */
+  BFD_RELOC_THUMB_PCREL_BRANCH9,
+  BFD_RELOC_THUMB_PCREL_BRANCH12,
+  BFD_RELOC_THUMB_PCREL_BRANCH23,
 
 /* Mitsubishi D10V relocs.
 This is a 10-bit reloc with the right 2 bits
@@ -1891,7 +1903,6 @@ the right 3 bits assumed to be 0. */
   BFD_RELOC_D30V_32_PCREL,
 /* end-sanitize-d30v */
 
-/* start-sanitize-m32r */
 
 /* Mitsubishi M32R relocs.
 This is a 24 bit absolute address. */
@@ -1920,8 +1931,6 @@ used when the lower 16 bits are treated as signed. */
 /* This is a 16-bit reloc containing the small data area offset for use in
 add3, load, and store instructions. */
   BFD_RELOC_M32R_SDA16,
-/* end-sanitize-m32r */
-
 /* start-sanitize-v850 */
 
 /* This is a 9-bit reloc */
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index d550099..0904293 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -435,6 +435,12 @@ extern boolean _bfd_write_section_stabs
 
 extern boolean _bfd_write_stab_strings PARAMS ((bfd *, PTR *));
 
+/* Find an offset within a .stab section when linking stabs in
+   sections.  */
+
+extern bfd_vma _bfd_stab_section_offset
+  PARAMS ((bfd *, PTR *, asection *, PTR *, bfd_vma));
+
 /* Create a string table.  */
 extern struct bfd_strtab_hash *_bfd_stringtab_init PARAMS ((void));
 
@@ -739,6 +745,10 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_ARC_B26",
 /* end-sanitize-arc */
 
+  "BFD_RELOC_THUMB_PCREL_BRANCH9",
+  "BFD_RELOC_THUMB_PCREL_BRANCH12",
+  "BFD_RELOC_THUMB_PCREL_BRANCH23",
+							 
   "BFD_RELOC_D10V_10_PCREL_R",
   "BFD_RELOC_D10V_10_PCREL_L",
   "BFD_RELOC_D10V_18",
diff --git a/gas/ChangeLog b/gas/ChangeLog
index f04f27c..fd436d3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,8 +1,11 @@
 Tue Jun  3 16:15:13 1997  Nick Clifton  <nickc@cygnus.com>
 
-	* config/tc-arm.h: Merged in changes from armT-970328-branch.
+	* config/tc-arm.c (md_parse_option): Merge in changes from
+	armT-970328-branch.
 
-	* configure.in (emulations): Added Thumb architecture support from
+	* config/tc-arm.h: Merge in changes from armT-970328-branch.
+
+	* configure.in (emulations): Add Thumb architecture support from
 	armT-9703-28-branch.
 
 Mon Jun  2 16:25:07 1997  Nick Clifton  <nickc@cygnus.com>