summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-07-04 13:27:15 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-07-04 13:27:15 +0000
commit9f66f085f9dd2742f017e716f8cd6605e51df6aa (patch)
tree3111cadb62d7cd68a7dd8b8a219dcc95606f6d19
parentef9e333b2ab325442baf2802de9745bc23b66b5d (diff)
downloadgcc-49-9f66f085f9dd2742f017e716f8cd6605e51df6aa.tar.gz
* Explicitly set cpu_32 to ultrasparc for sparc64 builds.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7493 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/sparc-force-cpu.diff11
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index dd2aef1..83b9e90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
gcc-4.9 (4.9.0-10) UNRELEASED; urgency=medium
+ * Explicitly set cpu_32 to ultrasparc for sparc64 builds.
* Fix --with-long-double-128 for sparc32 when defaulting to 64-bit.
-- Matthias Klose <doko@debian.org> Fri, 04 Jul 2014 15:08:08 +0200
diff --git a/debian/patches/sparc-force-cpu.diff b/debian/patches/sparc-force-cpu.diff
index 496ab22..850120e 100644
--- a/debian/patches/sparc-force-cpu.diff
+++ b/debian/patches/sparc-force-cpu.diff
@@ -4,15 +4,22 @@ Index: b/src/gcc/config.gcc
===================================================================
--- a/src/gcc/config.gcc
+++ b/src/gcc/config.gcc
-@@ -4200,6 +4200,13 @@ do
+@@ -4200,6 +4200,20 @@
;;
esac
+ # setting this directly fails to build a biarch defaulting to 32bit
-+ case "$target" in sparc*-*-linux*)
++ case "$target" in
++ sparc-*-linux*)
+ if test "$option" = cpu; then
+ val=ultrasparc
+ fi
++ ;;
++ sparc64-*-linux*)
++ if test "$option" = cpu_32; then
++ val=ultrasparc
++ fi
++ ;;
+ esac
+
if test "x$t" = x