* config/obj-elf.h (LOCAL_LABEL_PREFIX): Conditionally define.

	* config/tc-s390.h (LOCAL_LABEL_PREFIX): Don't define.

testsuite/:
	* gas/mips/mips16-e.d: Adjust for change in LOCAL_LABEL_PREFIX.
	* gas/mips/mipsel16-e.d: Likewise.
	* gas/mips/tmips16-e.d: Likewise.
	* gas/mips/tmipsel16-e.d: Likewise.

8 files changed, 28 insertions, 14 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6525893..e9b4dba 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-23  Andreas Schwab  <schwab@suse.de>
+
+	* config/obj-elf.h (LOCAL_LABEL_PREFIX): Conditionally define.
+	* config/tc-s390.h (LOCAL_LABEL_PREFIX): Don't define.
+
 2009-01-19  Nick Clifton  <nickc@redhat.com>
 
 	* config/tc-arm.h (CONVERT_SYMBOLIC_ATTRIBUTE): Only define for
diff --git a/gas/config/obj-elf.h b/gas/config/obj-elf.h
index 95db355..e9a28c1 100644
--- a/gas/config/obj-elf.h
+++ b/gas/config/obj-elf.h
@@ -98,6 +98,10 @@ struct elf_obj_sy
 #endif
 extern void elf_begin (void);
 
+#ifndef LOCAL_LABEL_PREFIX
+#define LOCAL_LABEL_PREFIX '.'
+#endif
+
 /* should be conditional on address size! */
 #define elf_symbol(asymbol) ((elf_symbol_type *) (&(asymbol)->the_bfd))
 
diff --git a/gas/config/tc-s390.h b/gas/config/tc-s390.h
index 7ac135c..1636400 100644
--- a/gas/config/tc-s390.h
+++ b/gas/config/tc-s390.h
@@ -51,8 +51,6 @@ extern const char *s390_target_format (void);
 /* Whether or not the target is big endian */
 extern int target_big_endian;
 
-#define LOCAL_LABEL_PREFIX '.'
-
 /* Permit temporary numeric labels.  */
 #define LOCAL_LABELS_FB 1
 
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index fca8c1c..5e2bcd2 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-23  Andreas Schwab  <schwab@suse.de>
+
+	* gas/mips/mips16-e.d: Adjust for change in LOCAL_LABEL_PREFIX.
+	* gas/mips/mipsel16-e.d: Likewise.
+	* gas/mips/tmips16-e.d: Likewise.
+	* gas/mips/tmipsel16-e.d: Likewise.
+
 2009-01-19  Nick Clifton  <nickc@redhat.com>
 
 	* lib/gas-defs.exp (run_list_test): Fix typo in comment.
diff --git a/gas/testsuite/gas/mips/mips16-e.d b/gas/testsuite/gas/mips/mips16-e.d
index 553a6b3..b8134dc 100644
--- a/gas/testsuite/gas/mips/mips16-e.d
+++ b/gas/testsuite/gas/mips/mips16-e.d
@@ -14,7 +14,7 @@ SYMBOL TABLE:
 0+0000000 l    d  \.reginfo	0+0000000 (|\.reginfo)
 0+0000000 l    d  \.(mdebug|pdr)	0+0000000 (|\.mdebug|\.pdr)
 0+0000002 l       \.text	0+0000000 0xf0 l1
-0+0000004 l       \.text	0+0000000 0xf0 L1.1
+0+0000004 l       \.text	0+0000000 0xf0 \.L1.1
 0+0000000         \*UND\*	0+0000000 g1
 
 
@@ -22,8 +22,8 @@ RELOCATION RECORDS FOR \[foo\]:
 OFFSET [ ]+ TYPE              VALUE 
 0+0000000 R_MIPS_32         l1
 0+0000004 R_MIPS_32         l1
-0+0000008 R_MIPS_32         L1.1
-0+000000c R_MIPS_32         L1.1
+0+0000008 R_MIPS_32         \.L1.1
+0+000000c R_MIPS_32         \.L1.1
 0+0000010 R_MIPS_32         g1
 0+0000014 R_MIPS_32         g1
 
diff --git a/gas/testsuite/gas/mips/mipsel16-e.d b/gas/testsuite/gas/mips/mipsel16-e.d
index 2e20a1a..be84fe3 100644
--- a/gas/testsuite/gas/mips/mipsel16-e.d
+++ b/gas/testsuite/gas/mips/mipsel16-e.d
@@ -15,7 +15,7 @@ SYMBOL TABLE:
 0+0000000 l    d  \.reginfo	0+0000000 (|\.reginfo)
 0+0000000 l    d  \.(mdebug|pdr)	0+0000000 (|\.mdebug|\.pdr)
 0+0000002 l       \.text	0+0000000 0xf0 l1
-0+0000004 l       \.text	0+0000000 0xf0 L1.1
+0+0000004 l       \.text	0+0000000 0xf0 \.L1.1
 0+0000000         \*UND\*	0+0000000 g1
 
 
@@ -23,8 +23,8 @@ RELOCATION RECORDS FOR \[foo\]:
 OFFSET [ ]+ TYPE              VALUE 
 0+0000000 R_MIPS_32         l1
 0+0000004 R_MIPS_32         l1
-0+0000008 R_MIPS_32         L1.1
-0+000000c R_MIPS_32         L1.1
+0+0000008 R_MIPS_32         \.L1.1
+0+000000c R_MIPS_32         \.L1.1
 0+0000010 R_MIPS_32         g1
 0+0000014 R_MIPS_32         g1
 
diff --git a/gas/testsuite/gas/mips/tmips16-e.d b/gas/testsuite/gas/mips/tmips16-e.d
index b03c6bb..a610dc7 100644
--- a/gas/testsuite/gas/mips/tmips16-e.d
+++ b/gas/testsuite/gas/mips/tmips16-e.d
@@ -12,7 +12,7 @@ SYMBOL TABLE:
 0+0000000 l    d  \.data	0+0000000 (|\.data)
 0+0000000 l    d  \.bss	0+0000000 (|\.bss)
 0+0000002 l       \.text	0+0000000 0xf0 l1
-0+0000004 l       \.text	0+0000000 0xf0 L1.1
+0+0000004 l       \.text	0+0000000 0xf0 \.L1.1
 0+0000000 l    d  foo	0+0000000 (|foo)
 0+0000000 l    d  \.reginfo	0+0000000 (|\.reginfo)
 0+0000000 l    d  \.(mdebug|pdr)	0+0000000 (|\.mdebug|\.pdr)
@@ -23,8 +23,8 @@ RELOCATION RECORDS FOR \[foo\]:
 OFFSET [ ]+ TYPE              VALUE 
 0+0000000 R_MIPS_32         l1
 0+0000004 R_MIPS_32         l1
-0+0000008 R_MIPS_32         L1.1
-0+000000c R_MIPS_32         L1.1
+0+0000008 R_MIPS_32         \.L1.1
+0+000000c R_MIPS_32         \.L1.1
 0+0000010 R_MIPS_32         g1
 0+0000014 R_MIPS_32         g1
 
diff --git a/gas/testsuite/gas/mips/tmipsel16-e.d b/gas/testsuite/gas/mips/tmipsel16-e.d
index 089b27e..ecaa8bd 100644
--- a/gas/testsuite/gas/mips/tmipsel16-e.d
+++ b/gas/testsuite/gas/mips/tmipsel16-e.d
@@ -12,7 +12,7 @@ SYMBOL TABLE:
 0+0000000 l    d  \.data	0+0000000 (|\.data)
 0+0000000 l    d  \.bss	0+0000000 (|\.bss)
 0+0000002 l       \.text	0+0000000 0xf0 l1
-0+0000004 l       \.text	0+0000000 0xf0 L1.1
+0+0000004 l       \.text	0+0000000 0xf0 \.L1.1
 0+0000000 l    d  foo	0+0000000 (|foo)
 0+0000000 l    d  \.reginfo	0+0000000 (|\.reginfo)
 0+0000000 l    d  \.(mdebug|pdr)	0+0000000 (|\.mdebug|\.pdr)
@@ -23,8 +23,8 @@ RELOCATION RECORDS FOR \[foo\]:
 OFFSET [ ]+ TYPE              VALUE 
 0+0000000 R_MIPS_32         l1
 0+0000004 R_MIPS_32         l1
-0+0000008 R_MIPS_32         L1.1
-0+000000c R_MIPS_32         L1.1
+0+0000008 R_MIPS_32         \.L1.1
+0+000000c R_MIPS_32         \.L1.1
 0+0000010 R_MIPS_32         g1
 0+0000014 R_MIPS_32         g1