From 186b123a5f7c3d91cd6329a14b36f336e28b49dc Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Jan 07 2015 17:09:36 +0000
Subject: SH/SH64: Set the --target(s) correctly


Pick only 32-bit targets for the SH compiler and only 64-bit targets for the
64-bit compiler.  Also set the SH64 target to something that actually builds
64-bits.

---

diff --git a/cross-binutils.spec b/cross-binutils.spec
index 94d1197..4e41426 100644
--- a/cross-binutils.spec
+++ b/cross-binutils.spec
@@ -48,7 +48,7 @@
 Summary: A GNU collection of cross-compilation binary utilities
 Name: %{cross}-binutils
 Version: 2.25
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -326,7 +326,7 @@ function config_target () {
 	openrisc-*)	target=or1k-linux-gnu;;
 	parisc-*)	target=hppa-linux;;
 	score-*)	target=score-elf;;
-	sh64-*)		target=sh64-linux;;
+	sh64-*)		target=sh64-linux-elf;;
 	tile-*)		target=tilegx-linux;;
 	v850-*)		target=v850e-linux;;
 	x86-*)		target=x86_64-linux;;
@@ -353,12 +353,7 @@ function config_target () {
     esac
 
     case $target in sh-*)
-	    CARGS="$CARGS --enable-targets=sh4-linux"
-	    ;;
-    esac
-
-    case $target in sh64*)
-	    CARGS="$CARGS --enable-targets=sh64-linux,sh-elf,sh-linux,sh4-linux"
+	    CARGS="$CARGS --enable-targets=sh4-linux,sh-elf,sh-linux"
 	    ;;
     esac
 
@@ -661,6 +656,9 @@ rm -rf %{buildroot}
 %do_files xtensa-linux-gnu	%{build_xtensa}
 
 %changelog
+* Wed Jan 7 2015 David Howells <dhowells@redhat.com> - 2.25-2
+- Fix up the target for SH64 and cease mixing 32-bit SH targets with SH64.
+
 * Mon Jan 5 2015 David Howells <dhowells@redhat.com> - 2.25-1
 - Sync with binutils-2.25 to pick up fixes.
   Resolves: BZ #1162577, #1162601, #1162611, #1162625