Fix PR gas/22738 (.dc.a directive has wrong size on SPARC 64-bit).

The .dc.a directive has wrong size (32 bits) on SPARC 64-bit because
the assembler sets the correct BFD architecture only at the very end
of the processing and it's too late for the directive.  It's fixed by
defining TARGET_MACH and making it return a sensible default value.

gas/
	* config/tc-sparc.h (sparc_mach): Declare.
	(TARGET_MACH): Define to above.
	* config/tc-sparc.c (sparc_mach): New function.
	(sparc_md_end): Minor tweak.
ld/
	* testsuite/ld-elf/pr22450.d: Remove reference to SPARC64.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e7a288f1df77c07a0d2c0fab14f9c1b129d41ec4..4fc81fa387035ad48f9b8a2bfbf2456e04ae5552 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2018-01-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR gas/22738
+       * config/tc-sparc.h (sparc_mach): Declare.
+       (TARGET_MACH): Define to above.
+       * config/tc-sparc.c (sparc_mach): New function.
+       (sparc_md_end): Minor tweak.
+
 2018-01-29  Nick Clifton  <nickc@redhat.com>
 
        * po/ru.po: Updated Russian translation.

diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 69a8e5204ac717f5df86f30df975cabb4fc4887a..c21192af96fec80cf99817483078c92020c1e71b 100644 (file)
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -325,6 +325,19 @@ init_default_arch (void)
   default_arch_type = sa->arch_type;
 }
 
+/* Called by TARGET_MACH.  */
+
+unsigned long
+sparc_mach (void)
+{
+  /* We don't get a chance to initialize anything before we're called,
+     so handle that now.  */
+  if (! default_init_p)
+    init_default_arch ();
+
+  return sparc_arch_size == 64 ? bfd_mach_sparc_v9 : bfd_mach_sparc;
+}
+
 /* Called by TARGET_FORMAT.  */
 
 const char *
@@ -1148,7 +1161,7 @@ md_begin (void)
 void
 sparc_md_end (void)
 {
-  unsigned long mach = bfd_mach_sparc;
+  unsigned long mach;
 #if defined(OBJ_ELF) && !defined(TE_SOLARIS)
   int hwcaps, hwcaps2;
 #endif
@@ -1182,7 +1195,7 @@ sparc_md_end (void)
       /* The sparclite is treated like a normal sparc.  Perhaps it shouldn't
         be but for now it is (since that's the way it's always been
         treated).  */
-      default: break;
+      default: mach = bfd_mach_sparc; break;
       }
   bfd_set_arch_mach (stdoutput, bfd_arch_sparc, mach);
 

diff --git a/gas/config/tc-sparc.h b/gas/config/tc-sparc.h
index 7ff7613517ea8dd6ad7c378420c5c5ea1baa1796..e3db1fb0ccb319b79b15e089dc257dee4ce022f0 100644 (file)
--- a/gas/config/tc-sparc.h
+++ b/gas/config/tc-sparc.h
@@ -30,6 +30,9 @@ struct frag;
 
 #define TARGET_ARCH bfd_arch_sparc
 
+extern unsigned long sparc_mach (void);
+#define TARGET_MACH sparc_mach ()
+
 #ifdef TE_FreeBSD
 #define ELF_TARGET_FORMAT      "elf32-sparc"
 #define ELF64_TARGET_FORMAT    "elf64-sparc-freebsd"

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d9e0c4fd14532e45bd35c92b7c8ddf139bb39e5c..c806643033e3020479930662d5bb4936593496f5 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * testsuite/ld-elf/pr22450.d: Remove reference to SPARC64.
+
 2018-01-29  Maciej W. Rozycki  <macro@mips.com>
 
        * testsuite/ld-mips-elf/comm-data.exp: Correct support for

diff --git a/ld/testsuite/ld-elf/pr22450.d b/ld/testsuite/ld-elf/pr22450.d
index 26853bc9b8dc07606283553068d6c5b7e7fb0be5..5b219b779515e41a3e1253dd02678a03b7db0f7c 100644 (file)
--- a/ld/testsuite/ld-elf/pr22450.d
+++ b/ld/testsuite/ld-elf/pr22450.d
@@ -2,7 +2,7 @@
 #readelf: --notes --wide
 #ld: -r
 # Fails on H8300 because it does not generate the correct relocs for the size fields.
-# Fails on AVR, IP2K, M68HC11, SPARC64, XC16C because the assembler does not calculate the correct values for the differences of local symbols.
+# Fails on AVR, IP2K, M68HC11, XC16C because the assembler does not calculate the correct values for the differences of local symbols.
 # Fails on CRX because readelf does not know how to apply CRX reloc number 20 (R_CRX_SWITCH32).
 
 #...