6 files changed, 8 insertions, 25 deletions
diff --git a/gcc/config/arm/lib1thumb.asm b/gcc/config/arm/lib1thumb.asm
index dcabcf4..e0ff746 100755
--- a/gcc/config/arm/lib1thumb.asm
+++ b/gcc/config/arm/lib1thumb.asm
@@ -34,10 +34,6 @@ Boston, MA 02111-1307, USA.  */
    the executable file might be covered by the GNU General Public License.  */
 
 	.code	 16
-	
-#ifndef __USER_LABEL_PREFIX__
-#error  __USER_LABEL_PREFIX__ not defined
-#endif
 
 #ifdef __elf__
 #define __PLT__ (PLT)
@@ -50,15 +46,8 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #define RET	mov	pc, lr
-	
-/* ANSI concatenation macros.  */
-
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-/* Use the right prefix for global labels.  */
 
-#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
+#define SYM(x) x
 
 work		.req	r4	@ XXXX is this safe ?
 
diff --git a/gcc/config/arm/t-thumb-elf b/gcc/config/arm/t-thumb-elf
index 2f5054d..da391b9 100755
--- a/gcc/config/arm/t-thumb-elf
+++ b/gcc/config/arm/t-thumb-elf
@@ -24,8 +24,8 @@ dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c >> dp-bit.c
 
 # Avoid building a duplicate set of libraries for the default endian-ness.
-MULTILIB_OPTIONS = mlittle-endian/mbig-endian mno-thumb-interwork/mthumb-interwork fno-leading-underscore/fleading-underscore
-MULTILIB_DIRNAMES = le be normal interwork elf under
+MULTILIB_OPTIONS = mlittle-endian/mbig-endian mno-thumb-interwork/mthumb-interwork
+MULTILIB_DIRNAMES = le be normal interwork
 MULTILIB_MATCHES = mbig-endian=mbe mlittle-endian=mle
 
 LIBGCC = stmp-multilib
diff --git a/gcc/config/arm/telf.h b/gcc/config/arm/telf.h
index 8c5d6e0..ca415ac 100755
--- a/gcc/config/arm/telf.h
+++ b/gcc/config/arm/telf.h
@@ -95,8 +95,6 @@ do {								  \
 #undef RDATA_SECTION_ASM_OP
 #define RDATA_SECTION_ASM_OP	"\t.section .rodata"
 
-#define USER_LABEL_PREFIX ""
-
 /* If defined, a C expression whose value is a string containing the
    assembler operation to identify the following data as
    uninitialized global data.  If not defined, and neither
diff --git a/gcc/config/arm/thumb.c b/gcc/config/arm/thumb.c
index 84b922a..e9ce13b 100755
--- a/gcc/config/arm/thumb.c
+++ b/gcc/config/arm/thumb.c
@@ -1325,10 +1325,6 @@ thumb_print_operand(FILE *f, rtx x, int code)
             fputs(ASM_COMMENT_START, f);
             return;
 
-        case '_':
-            fputs(user_label_prefix, f);
-            return;
-
         case 'D':
             if (x)
                 fputs(thumb_condition_code(x, 1), f);
diff --git a/gcc/config/arm/thumb.h b/gcc/config/arm/thumb.h
index 086ed52..ac94ac2 100755
--- a/gcc/config/arm/thumb.h
+++ b/gcc/config/arm/thumb.h
@@ -155,7 +155,7 @@ extern int target_flags;
 
 /* Output a reference to a label.  */
 #define ASM_OUTPUT_LABELREF(STREAM,NAME)  \
-  fprintf ((STREAM), "%s%s", user_label_prefix, (NAME))
+  fprintf ((STREAM), "%s", (NAME))
 
 /* This is how to output an assembler line for a numeric constant byte.  */
 #define ASM_OUTPUT_BYTE(STREAM,VALUE)					\
diff --git a/gcc/config/arm/thumb.md b/gcc/config/arm/thumb.md
index d37d677..a99917f 100755
--- a/gcc/config/arm/thumb.md
+++ b/gcc/config/arm/thumb.md
@@ -1009,7 +1009,7 @@
   [(call (mem:SI (match_operand:SI 0 "s_register_operand" "l*r"))
 	 (match_operand 1 "" ""))]
   "! TARGET_CALLER_INTERWORKING"
-  "bl\\t%__call_via_%0"
+  "bl\\t_call_via_%0"
 [(set_attr "length" "4")])
 ;; The non THUMB_INTERWORK, non TARGET_CALLER_INTERWORKING version
 ;; used to be: "mov\\tlr,pc\;bx\\t%0", but the mov does not set
@@ -1020,7 +1020,7 @@
   [(call (mem:SI (match_operand:SI 0 "s_register_operand" "l*r"))
 	 (match_operand 1 "" ""))]
   "TARGET_CALLER_INTERWORKING"
-  "bl\\t%__interwork_call_via_%0"
+  "bl\\t_interwork_call_via_%0"
 [(set_attr "length" "4")])
 
 (define_expand "call_value"
@@ -1039,7 +1039,7 @@
 	(call (mem:SI (match_operand:SI 1 "s_register_operand" "l*r"))
 	      (match_operand 2 "" "")))]
   "! TARGET_CALLER_INTERWORKING"
-  "bl\\t%__call_via_%1"
+  "bl\\t_call_via_%1"
 [(set_attr "length" "4")])
 ;; See comment for call_indirect pattern
 
@@ -1048,7 +1048,7 @@
 	(call (mem:SI (match_operand:SI 1 "s_register_operand" "l*r"))
 	      (match_operand 2 "" "")))]
   "TARGET_CALLER_INTERWORKING"
-  "bl\\t%__interwork_call_via_%1"
+  "bl\\t_interwork_call_via_%1"
 [(set_attr "length" "4")])