From f8a2144336ac5017ded4c1580e8f482e60232b66 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 3 Jun 1997 23:25:43 +0000
Subject: [PATCH] Merged in the changes from the armT-970328-branch.

---
 gas/ChangeLog       |  2 ++
 gas/config/tc-arm.h | 31 +++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8f1a87c38d..f04f27c66d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,7 @@
 Tue Jun  3 16:15:13 1997  Nick Clifton  <nickc@cygnus.com>
 
+	* config/tc-arm.h: Merged in changes from armT-970328-branch.
+
 	* configure.in (emulations): Added Thumb architecture support from
 	armT-9703-28-branch.
 
diff --git a/gas/config/tc-arm.h b/gas/config/tc-arm.h
index 0214d68f08..588d3f0caa 100644
--- a/gas/config/tc-arm.h
+++ b/gas/config/tc-arm.h
@@ -33,6 +33,13 @@
 
 #define DIFF_EXPR_OK
 
+#ifdef  LITTLE_ENDIAN
+#undef  LITTLE_ENDIAN
+#endif
+#ifdef  BIG_ENDIAN
+#undef  BIG_ENDIAN
+#endif
+
 #define LITTLE_ENDIAN 1234
 #define BIG_ENDIAN 4321
 
@@ -67,10 +74,21 @@
 
 #define md_after_pass_hook() arm_after_pass_hook ()
 #define md_start_line_hook() arm_start_line_hook ()
-#define tc_frob_label(S) arm_frob_label (S) 
+#define tc_frob_label(S) arm_frob_label (S)
+/* We also need to mark assembler created symbols:  */
+#define tc_frob_fake_label(S) arm_frob_label (S)
+/* NOTE: The fake label creation in stabs.c:s_stab_generic() has
+   deliberately not been updated to mark assembler created stabs
+   symbols as Thumb.  */
 
 #define obj_fix_adjustable(fixP) 0
 
+/* We need to keep some local information on symbols. At the moment
+   this is 0 for ARM symbols, non-zero for Thumb symbols.  */
+#define TC_SYMFIELD_TYPE unsigned int
+#define ARM_GET_TYPE(S)   ((S)->sy_tc)
+#define ARM_SET_TYPE(S,V) ((S)->sy_tc = (V))
+
 #define TC_FIX_TYPE PTR
 #define TC_INIT_FIX_DATA(FIXP) ((FIXP)->tc_fix_data = NULL)
 
@@ -91,6 +109,10 @@ char *arm_canonicalize_symbol_name PARAMS ((char *));
 	  }}
 #endif 
 
+/* Finish processing the entire symbol table:  */
+#define tc_adjust_symtab() arm_adjust_symtab ()
+extern void arm_adjust_symtab PARAMS ((void));
+
 #if 0
 #define tc_crawl_symbol_chain(a)	{;}	/* not used */
 #define tc_headers_hook(a)		{;}	/* not used */
@@ -110,11 +132,4 @@ char *arm_canonicalize_symbol_name PARAMS ((char *));
 
 #define LOCAL_LABELS_FB  1
 
-/* Use defaults for OBJ_AOUT.  */
-#ifndef BFD_ASSEMBLER
-#ifndef OBJ_AOUT
-#define LOCAL_LABEL(name)	((name)[0] == '.' && (name)[1] == 'L')
-#endif
-#endif
-
 /* end of tc-arm.h */