[gcc-6] 168/401: * cpp: Breaks libmagics++-dev (<< 2.28.0-4). Closes: #825278. * Optimize for mips32r2 for o32 (YunQiang Su). Closes: #827801.

[Ximin Luo]

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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit bd06b9f1d7f0795f6adc3555ad5c3474bcda3659
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Jun 29 13:46:42 2016 +0000

      * cpp: Breaks libmagics++-dev (<< 2.28.0-4). Closes: #825278.
      * Optimize for mips32r2 for o32 (YunQiang Su). Closes: #827801.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8899 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  |  2 ++
 debian/control    |  1 +
 debian/control.m4 |  1 +
 debian/rules2     | 12 ++++++------
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 354724e..eaa8460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ gcc-6 (6.1.1-8) UNRELEASED; urgency=medium
   [ Matthias Klose ]
   * Add AArch64 Vulcan cpu support (Dann Frazier). LP: #1594452.
   * gfortran: Suggest libcoarrays-dev. Closes: #827995.
+  * cpp: Breaks libmagics++-dev (<< 2.28.0-4). Closes: #825278.
+  * Optimize for mips32r2 for o32 (YunQiang Su). Closes: #827801.
 
  -- Matthias Klose <doko at debian.org>  Wed, 29 Jun 2016 15:14:24 +0200
 
diff --git a/debian/control b/debian/control
index 937bbfe..5cd7ad6 100644
--- a/debian/control
+++ b/debian/control
@@ -336,6 +336,7 @@ Priority: optional
 Depends: gcc-6-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: gcc-6-locales (>= ${gcc:SoftVersion})
 Replaces: gccgo-6 (<< ${gcc:Version})
+Breaks: libmagics++-dev (<< 2.28.0-4)
 Description: GNU C preprocessor
  A macro processor that is used automatically by the GNU C compiler
  to transform programs before actual compilation.
diff --git a/debian/control.m4 b/debian/control.m4
index accf943..42d9c65 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -815,6 +815,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 Suggests: gcc`'PV-locales (>= ${gcc:SoftVersion})
 Replaces: gccgo-6 (<< ${gcc:Version})
+Breaks: libmagics++-dev (<< 2.28.0-4)
 BUILT_USING`'dnl
 Description: GNU C preprocessor
  A macro processor that is used automatically by the GNU C compiler
diff --git a/debian/rules2 b/debian/rules2
index 0f3eddc..4753af2 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -633,11 +633,11 @@ ifneq (,$(findstring mips-linux,$(DEB_TARGET_GNU_TYPE)))
 endif
 
 ifneq (,$(findstring mipsel-linux,$(DEB_TARGET_GNU_TYPE)))
-  CONFARGS += --with-arch-32=mips2 --with-tune-32=mips32r2 --with-fp-32=xx
+  CONFARGS += --with-arch-32=mips32r2 --with-fp-32=xx
   ifeq ($(multilib),yes)
     ifeq ($(biarchn32)-$(biarch64),yes-yes)
       CONFARGS += --enable-targets=all
-      CONFARGS += --with-arch-64=mips3 --with-tune-64=mips64r2
+      CONFARGS += --with-arch-64=mips64r2
     endif
   endif
 endif
@@ -647,8 +647,8 @@ ifneq (,$(findstring mips64el-linux-gnuabin32,$(DEB_TARGET_GNU_TYPE)))
   ifeq ($(multilib),yes)
     ifeq ($(biarchn32)-$(biarch32),yes-yes)
       CONFARGS += --enable-targets=all
-      CONFARGS += --with-arch-64=mips3 --with-tune-64=mips64
-      CONFARGS += --with-arch-32=mips2 --with-tune-32=mips32 --with-fp-32=xx
+      CONFARGS += --with-arch-64=mips64r2
+      CONFARGS += --with-arch-32=mips32r2 --with-fp-32=xx
     endif
   endif
 endif
@@ -657,8 +657,8 @@ ifneq (,$(findstring mips64-linux-gnuabin32,$(DEB_TARGET_GNU_TYPE)))
   ifeq ($(multilib),yes)
     ifeq ($(biarchn32)-$(biarch32),yes-yes)
       CONFARGS += --enable-targets=all
-      CONFARGS += --with-arch-64=mips3 --with-tune-64=mips64
-      CONFARGS += --with-arch-32=mips2 --with-tune-32=mips32 --with-fp-32=xx
+      CONFARGS += --with-arch-64=mips64r2
+      CONFARGS += --with-arch-32=mips32r2 --with-fp-32=xx
     endif
   endif
 endif

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