[gcc-7] 178/354: * Fix gdc build on sh4 (sh5 support was removed upstream).

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit da63c555fc1c06661b983a10f9f0876dec4736a7
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri May 5 09:20:04 2017 +0000

      * Fix gdc build on sh4 (sh5 support was removed upstream).
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9438 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                   | 1 +
 debian/patches/gdc-versym-cpu.diff | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2dd55a6..dc2db56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gcc-7 (7.1.0-4) UNRELEASED; urgency=medium
 
   * Add sh3 support to gcc-multiarch patch. Closes: #861760.
   * Remove libquadmath/gdtoa license from debian/copyright (files removed).
+  * Fix gdc build on sh4 (sh5 support was removed upstream).
 
  -- Matthias Klose <doko at debian.org>  Thu, 04 May 2017 09:01:29 +0200
 
diff --git a/debian/patches/gdc-versym-cpu.diff b/debian/patches/gdc-versym-cpu.diff
index 6db40bf..911c8a1 100644
--- a/debian/patches/gdc-versym-cpu.diff
+++ b/debian/patches/gdc-versym-cpu.diff
@@ -321,7 +321,7 @@ Index: b/src/gcc/config/sh/sh.h
 ===================================================================
 --- a/src/gcc/config/sh/sh.h
 +++ b/src/gcc/config/sh/sh.h
-@@ -31,6 +31,22 @@ extern int code_for_indirect_jump_scratc
+@@ -31,6 +31,19 @@ extern int code_for_indirect_jump_scratc
  
  #define TARGET_CPU_CPP_BUILTINS() sh_cpu_cpp_builtins (pfile)
  
@@ -329,10 +329,7 @@ Index: b/src/gcc/config/sh/sh.h
 +#define TARGET_CPU_D_BUILTINS()			\
 +  do						\
 +    {						\
-+      if (TARGET_SHMEDIA64)			\
-+	builtin_define ("SH64");		\
-+      else					\
-+	builtin_define ("SH");			\
++      builtin_define ("SH");			\
 +						\
 +      if (TARGET_FPU_ANY)			\
 +	builtin_define ("D_HardFloat");		\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git