[gcc-7] 177/354: * Add sh3 support to gcc-multiarch patch. Closes: #861760. * Remove libquadmath/gdtoa license from debian/copyright (files removed).

[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 f221df1602d0673ac25f2e4acada5a754579a9df
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu May 4 09:12:49 2017 +0000

      * Add sh3 support to gcc-multiarch patch. Closes: #861760.
      * Remove libquadmath/gdtoa license from debian/copyright (files removed).
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9436 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                  |  7 +++++++
 debian/copyright                  | 26 --------------------------
 debian/copyright.in               | 26 --------------------------
 debian/patches/gcc-multiarch.diff |  7 ++++++-
 4 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b70846b..2dd55a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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).
+
+ -- Matthias Klose <doko at debian.org>  Thu, 04 May 2017 09:01:29 +0200
+
 gcc-7 (7.1.0-3) experimental; urgency=medium
 
   * Update to SVN 20170503 (r247549) from the gcc-7-branch.
diff --git a/debian/copyright b/debian/copyright
index 6f36204..c2fa12c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -328,32 +328,6 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Library General Public License for more details.
 
-libquadmath/gdtoa:
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999, 2000, 2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
 libquadmath/math:
 
 atanq.c, expm1q.c, j0q.c, j1q.c, log1pq.c, logq.c:
diff --git a/debian/copyright.in b/debian/copyright.in
index 7b59e33..66320ff 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -328,32 +328,6 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Library General Public License for more details.
 
-libquadmath/gdtoa:
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999, 2000, 2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
 libquadmath/math:
 
 atanq.c, expm1q.c, j0q.c, j1q.c, log1pq.c, logq.c:
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index 8fdf473..472f080 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -19,12 +19,17 @@ Index: b/src/gcc/config/sh/t-linux
 ===================================================================
 --- a/src/gcc/config/sh/t-linux
 +++ b/src/gcc/config/sh/t-linux
-@@ -1,2 +1,5 @@
+@@ -1,2 +1,10 @@
  MULTILIB_DIRNAMES= 
  MULTILIB_MATCHES = 
 +
++ifneq (,$(findstring sh4,$(target)))
 +MULTILIB_OSDIRNAMES = .:sh4-linux-gnu sh4_nofpu-linux-gnu:sh4-linux-gnu
 +MULTIARCH_DIRNAME = $(call if_multiarch,sh4-linux-gnu)
++else
++MULTILIB_OSDIRNAMES = .:sh3-linux-gnu sh3_nofpu-linux-gnu:sh3-linux-gnu
++MULTIARCH_DIRNAME = $(call if_multiarch,sh3-linux-gnu)
++endif
 Index: b/src/gcc/config/sparc/t-linux64
 ===================================================================
 --- a/src/gcc/config/sparc/t-linux64

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