This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] S/390: Define LOCAL_LABEL_PREFIX


Nick Clifton <nickc@redhat.com> writes:

> Hi Andreas,
>
>> --- gas/obj-elf.h	04 Jul 2007 11:53:27 +0200	1.33
>> +++ gas/obj-elf.h	15 Jan 2009 11:26:33 +0100	
>> @@ -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))
>
> Approved - but - you will need to update some of the MIPS gas tests in
> order to cope with the slightly changed output.  (eg mips16-e.d).  The
> good news though is that it appears that only MIPS test results are
> affected by the change.

This is what I have checked in, tested on ia64-linux, with
--enable-targets=all, --target=mips-elf and --target=mipsel-elf.

There was an unrelated testsuite failure (MIPS16 intermix), but that
appears to never have been working since the test was added.

Andreas.

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.

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.

--- config/tc-s390.h.~1.21.~	2009-01-15 12:02:15.000000000 +0100
+++ config/tc-s390.h	2009-01-23 13:37:33.000000000 +0100
@@ -51,8 +51,6 @@ extern const char *s390_target_format (v
 /* 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
 
--- testsuite/gas/mips/mips16-e.d.~1.7.~	2004-04-14 17:35:52.000000000 +0200
+++ testsuite/gas/mips/mips16-e.d	2009-01-23 14:00:24.000000000 +0100
@@ -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
 
--- testsuite/gas/mips/mipsel16-e.d.~1.4.~	2004-04-14 17:35:52.000000000 +0200
+++ testsuite/gas/mips/mipsel16-e.d	2009-01-23 14:22:09.000000000 +0100
@@ -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
 
--- testsuite/gas/mips/tmips16-e.d.~1.6.~	2004-12-13 11:39:28.000000000 +0100
+++ testsuite/gas/mips/tmips16-e.d	2009-01-23 14:22:26.000000000 +0100
@@ -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
 
--- testsuite/gas/mips/tmipsel16-e.d.~1.6.~	2005-02-01 12:00:12.000000000 +0100
+++ testsuite/gas/mips/tmipsel16-e.d	2009-01-23 14:22:37.000000000 +0100
@@ -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
 
Index: config/obj-elf.h
===================================================================
RCS file: /cvs/src/src/gas/config/obj-elf.h,v
retrieving revision 1.34
diff -u -a -p -u -p -a -r1.34 obj-elf.h
--- config/obj-elf.h	15 Jan 2009 12:42:52 -0000	1.34
+++ config/obj-elf.h	23 Jan 2009 14:42:21 -0000
@@ -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))
 

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]