From: Eric Botcazou <ebotcazou@gcc.gnu.org>
Date: Mon, 29 Jan 2018 23:13:51 +0000 (+0100)
Subject: Fix PR gas/22738 (.dc.a directive has wrong size on SPARC 64-bit).
X-Git-Tag: users/ARM/embedded-binutils-2_30-branch-2018q2~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9224cc645045ee01787f05dd7d11c460b28b9966;p=thirdparty%2Fbinutils-gdb.git

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 d8a2c92e5cb..30fe747c3d9 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,14 @@
+2018-02-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	Backport from mainline
+	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-02-05  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 69a8e5204ac..c21192af96f 100644
--- 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 7ff7613517e..e3db1fb0ccb 100644
--- 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 5df49e8c0cf..a4b3639ce60 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-09  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* testsuite/ld-elf/pr22450.d: Remove reference to SPARC64.
+
 2018-02-07  Alan Modra  <amodra@gmail.com>
 
 	Revert 2018-01-17  Alan Modra  <amodra@gmail.com>
diff --git a/ld/testsuite/ld-elf/pr22450.d b/ld/testsuite/ld-elf/pr22450.d
index 26853bc9b8d..5b219b77951 100644
--- 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).
 
 #...