[gcc-7] 344/354: * Add support for a plethora of mips r6 packages (YunQiang Su). Closes: #881729.

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:51:41 UTC 2017


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

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

commit 6909cefee402fd6c9ed1b953a11456fa53154e3e
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Nov 15 06:05:55 2017 +0000

      * Add support for a plethora of mips r6 packages (YunQiang Su).
        Closes: #881729.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9826 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  |   2 +
 debian/control    | 190 +++++++++++++++++++++++++++---------------------------
 debian/rules.conf |  27 ++++++--
 debian/rules.defs |  52 ++++++++++++++-
 debian/rules2     |  65 +++++++++++++++++++
 5 files changed, 234 insertions(+), 102 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 19f3380..feea3e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ gcc-7 (7.2.0-15) UNRELEASED; urgency=medium
   * Compress debug symbols for compiler binaries with dwz.
   * Fix PR other/82880, gcc --help=target hangs on mips (James Cowgill).
     Closes: #880962.
+  * Add support for a plethora of mips r6 packages (YunQiang Su).
+    Closes: #881729.
 
  -- Matthias Klose <doko at debian.org>  Mon, 13 Nov 2017 22:47:12 +0100
 
diff --git a/debian/control b/debian/control
index 4424318..775b57a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>
 Standards-Version: 4.1.1
 Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), 
-  g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32] <!cross>, 
-  libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mi [...]
+  g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32] <!cross>, 
+  libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mi [...]
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k], 
   m4, libtool, autoconf2.64, 
   dwz, libunwind8-dev [ia64], libatomic-ops-dev [ia64], 
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14),
   libisl-dev (>= 0.14), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), lib32z1-dev [amd64 kfreebsd-amd64], lib64z1-dev [i386], 
   dejagnu [!m68k !hurd-amd64 !hurd-i386 !hurd-alpha !kfreebsd-amd64 !kfreebsd-i386 !kfreebsd-alpha], coreutils (>= 2.26) | realpath (>= 1.9.12), chrpath, lsb-release, quilt, 
   pkg-config, libgc-dev, 
-   g++-7-alpha-linux-gnu [alpha] <cross>, gobjc-7-alpha-linux-gnu [alpha] <cross>, gfortran-7-alpha-linux-gnu [alpha] <cross>, gdc-7-alpha-linux-gnu [alpha] <cross>, gccgo-7-alpha-linux-gnu [alpha] <cross>, gnat-7-alpha-linux-gnu [alpha] <cross>, g++-7-x86-64-linux-gnu [amd64] <cross>, gobjc-7-x86-64-linux-gnu [amd64] <cross>, gfortran-7-x86-64-linux-gnu [amd64] <cross>, gdc-7-x86-64-linux-gnu [amd64] <cross>, gccgo-7-x86-64-linux-gnu [amd64] <cross>, gnat-7-x86-64-linux-gnu [amd64] <cro [...]
+   g++-7-alpha-linux-gnu [alpha] <cross>, gobjc-7-alpha-linux-gnu [alpha] <cross>, gfortran-7-alpha-linux-gnu [alpha] <cross>, gdc-7-alpha-linux-gnu [alpha] <cross>, gccgo-7-alpha-linux-gnu [alpha] <cross>, gnat-7-alpha-linux-gnu [alpha] <cross>, g++-7-x86-64-linux-gnu [amd64] <cross>, gobjc-7-x86-64-linux-gnu [amd64] <cross>, gfortran-7-x86-64-linux-gnu [amd64] <cross>, gdc-7-x86-64-linux-gnu [amd64] <cross>, gccgo-7-x86-64-linux-gnu [amd64] <cross>, gnat-7-x86-64-linux-gnu [amd64] <cro [...]
 Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns
 Homepage: http://gcc.gnu.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-7/
@@ -123,7 +123,7 @@ Description: GCC support library (debug symbols)
  Debug symbols for the GCC support library.
 
 Package: lib64gcc1
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: libs
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${misc:Depends}
@@ -134,7 +134,7 @@ Description: GCC support library (64bit)
  special needs for some languages.
 
 Package: lib64gcc1-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64gcc1 (= ${gcc:EpochVersion}), ${misc:Depends}
@@ -142,7 +142,7 @@ Description: GCC support library (debug symbols)
  Debug symbols for the GCC support library.
 
 Package: lib64gcc-7-dev
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: libdevel
 Priority: optional
 Recommends: ${dep:libcdev}
@@ -158,7 +158,7 @@ Description: GCC support library (64bit development files)
  building C programs which use libgcc, libgomp, libquadmath, libssp or libitm.
 
 Package: lib32gcc1
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: libs
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${misc:Depends}
@@ -169,7 +169,7 @@ Description: GCC support library (32 bit Version)
  special needs for some languages.
 
 Package: lib32gcc1-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32gcc1 (= ${gcc:EpochVersion}), ${misc:Depends}
@@ -177,7 +177,7 @@ Description: GCC support library (debug symbols)
  Debug symbols for the GCC support library.
 
 Package: lib32gcc-7-dev
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: libdevel
 Priority: optional
 Recommends: ${dep:libcdev}
@@ -193,7 +193,7 @@ Description: GCC support library (32 bit development files)
  building C programs which use libgcc, libgomp, libquadmath, libssp or libitm.
 
 Package: libn32gcc1
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: libs
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${misc:Depends}
@@ -204,7 +204,7 @@ Description: GCC support library (n32)
  special needs for some languages.
 
 Package: libn32gcc1-dbg
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32gcc1 (= ${gcc:EpochVersion}), ${misc:Depends}
@@ -212,7 +212,7 @@ Description: GCC support library (debug symbols)
  Debug symbols for the GCC support library.
 
 Package: libn32gcc-7-dev
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: libdevel
 Priority: optional
 Recommends: ${dep:libcdev}
@@ -289,7 +289,7 @@ Description: GNU C compiler
  This is the GNU C compiler, a fairly portable optimizing compiler for C.
 
 Package: gcc-7-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
 Section: devel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), gcc-7 (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarchdev}, ${shlibs:Depends}, ${misc:Depends}
@@ -368,7 +368,7 @@ Description: GNU C++ compiler
  This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
 
 Package: g++-7-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
 Section: devel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), g++-7 (= ${gcc:Version}), gcc-7-multilib (= ${gcc:Version}), ${dep:libcxxbiarchdev}, ${shlibs:Depends}, ${misc:Depends}
@@ -405,7 +405,7 @@ Description: GCC OpenMP (GOMP) support library (debug symbols)
 
 Package: lib32gomp1
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -414,7 +414,7 @@ Description: GCC OpenMP (GOMP) support library (32bit)
  in the GNU Compiler Collection.
 
 Package: lib32gomp1-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32gomp1 (= ${gcc:Version}), ${misc:Depends}
@@ -424,7 +424,7 @@ Description: GCC OpenMP (GOMP) support library (32 bit debug symbols)
 
 Package: lib64gomp1
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: GCC OpenMP (GOMP) support library (64bit)
@@ -432,7 +432,7 @@ Description: GCC OpenMP (GOMP) support library (64bit)
  in the GNU Compiler Collection.
 
 Package: lib64gomp1-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64gomp1 (= ${gcc:Version}), ${misc:Depends}
@@ -442,7 +442,7 @@ Description: GCC OpenMP (GOMP) support library (64bit debug symbols)
 
 Package: libn32gomp1
 Section: libs
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: GCC OpenMP (GOMP) support library (n32)
@@ -450,7 +450,7 @@ Description: GCC OpenMP (GOMP) support library (n32)
  in the GNU Compiler Collection.
 
 Package: libn32gomp1-dbg
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32gomp1 (= ${gcc:Version}), ${misc:Depends}
@@ -501,7 +501,7 @@ Description: GNU Transactional Memory Library (debug symbols)
 
 Package: lib32itm1
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -511,7 +511,7 @@ Description: GNU Transactional Memory Library (32bit)
  accesses to shared memory by several threads.
 
 Package: lib32itm1-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32itm1 (= ${gcc:Version}), ${misc:Depends}
@@ -522,7 +522,7 @@ Description: GNU Transactional Memory Library (32 bit debug symbols)
 
 Package: lib64itm1
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: GNU Transactional Memory Library (64bit)
@@ -531,7 +531,7 @@ Description: GNU Transactional Memory Library (64bit)
  accesses to shared memory by several threads.
 
 Package: lib64itm1-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64itm1 (= ${gcc:Version}), ${misc:Depends}
@@ -607,7 +607,7 @@ Description: support library providing __atomic built-in functions (debug symbol
 
 Package: lib32atomic1
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -616,7 +616,7 @@ Description: support library providing __atomic built-in functions (32bit)
  be turned into lock-free instructions, GCC will make calls into this library.
 
 Package: lib32atomic1-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32atomic1 (= ${gcc:Version}), ${misc:Depends}
@@ -626,7 +626,7 @@ Description: support library providing __atomic built-in functions (32 bit debug
 
 Package: lib64atomic1
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: support library providing __atomic built-in functions (64bit)
@@ -634,7 +634,7 @@ Description: support library providing __atomic built-in functions (64bit)
  be turned into lock-free instructions, GCC will make calls into this library.
 
 Package: lib64atomic1-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64atomic1 (= ${gcc:Version}), ${misc:Depends}
@@ -644,7 +644,7 @@ Description: support library providing __atomic built-in functions (64bit debug
 
 Package: libn32atomic1
 Section: libs
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: support library providing __atomic built-in functions (n32)
@@ -652,7 +652,7 @@ Description: support library providing __atomic built-in functions (n32)
  be turned into lock-free instructions, GCC will make calls into this library.
 
 Package: libn32atomic1-dbg
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32atomic1 (= ${gcc:Version}), ${misc:Depends}
@@ -703,7 +703,7 @@ Description: AddressSanitizer -- a fast memory error detector (debug symbols)
 
 Package: lib32asan4
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -712,7 +712,7 @@ Description: AddressSanitizer -- a fast memory error detector (32bit)
  use-after-free and {heap,stack,global}-buffer overflow bugs in C/C++ programs.
 
 Package: lib32asan4-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32asan4 (= ${gcc:Version}), ${misc:Depends}
@@ -722,7 +722,7 @@ Description: AddressSanitizer -- a fast memory error detector (32 bit debug symb
 
 Package: lib64asan4
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: AddressSanitizer -- a fast memory error detector (64bit)
@@ -730,7 +730,7 @@ Description: AddressSanitizer -- a fast memory error detector (64bit)
  use-after-free and {heap,stack,global}-buffer overflow bugs in C/C++ programs.
 
 Package: lib64asan4-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64asan4 (= ${gcc:Version}), ${misc:Depends}
@@ -799,7 +799,7 @@ Description: LeakSanitizer -- a memory leak detector (debug symbols)
 
 Package: lib32lsan0
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -808,7 +808,7 @@ Description: LeakSanitizer -- a memory leak detector (32bit)
  into AddressSanitizer (empty package).
 
 Package: lib32lsan0-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32lsan0 (= ${gcc:Version}), ${misc:Depends}
@@ -924,7 +924,7 @@ Description: UBSan -- undefined behaviour sanitizer (debug symbols)
 
 Package: lib32ubsan0
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -934,7 +934,7 @@ Description: UBSan -- undefined behaviour sanitizer (32bit)
  at runtime. Available for C and C++.
 
 Package: lib32ubsan0-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32ubsan0 (= ${gcc:Version}), ${misc:Depends}
@@ -945,7 +945,7 @@ Description: UBSan -- undefined behaviour sanitizer (32 bit debug symbols)
 
 Package: lib64ubsan0
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: UBSan -- undefined behaviour sanitizer (64bit)
@@ -954,7 +954,7 @@ Description: UBSan -- undefined behaviour sanitizer (64bit)
  at runtime. Available for C and C++.
 
 Package: lib64ubsan0-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64ubsan0 (= ${gcc:Version}), ${misc:Depends}
@@ -1030,7 +1030,7 @@ Description: Intel Cilk Plus language extensions (debug symbols)
 
 Package: lib32cilkrts5
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -1039,7 +1039,7 @@ Description: Intel Cilk Plus language extensions (32bit)
  data and task parallelism.
 
 Package: lib32cilkrts5-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32cilkrts5 (= ${gcc:Version}), ${misc:Depends}
@@ -1049,7 +1049,7 @@ Description: Intel Cilk Plus language extensions (32 bit debug symbols)
 
 Package: lib64cilkrts5
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: Intel Cilk Plus language extensions (64bit)
@@ -1057,7 +1057,7 @@ Description: Intel Cilk Plus language extensions (64bit)
  data and task parallelism.
 
 Package: lib64cilkrts5-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64cilkrts5 (= ${gcc:Version}), ${misc:Depends}
@@ -1113,7 +1113,7 @@ Description: Intel memory protection extensions (debug symbols)
 
 Package: lib32mpx2
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -1125,7 +1125,7 @@ Description: Intel memory protection extensions (32bit)
  intentions are usurped at runtime due to buffer overflow.
 
 Package: lib32mpx2-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32mpx2 (= ${gcc:Version}), ${misc:Depends}
@@ -1137,7 +1137,7 @@ Description: Intel memory protection extensions (32 bit debug symbols)
 
 Package: lib64mpx2
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Replaces: lib64mpx0 (<< 6-20160120-1)
@@ -1148,7 +1148,7 @@ Description: Intel memory protection extensions (64bit)
  intentions are usurped at runtime due to buffer overflow.
 
 Package: lib64mpx2-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64mpx2 (= ${gcc:Version}), ${misc:Depends}
@@ -1182,7 +1182,7 @@ Description: GCC Quad-Precision Math Library (debug symbols)
 
 Package: lib32quadmath0
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -1192,7 +1192,7 @@ Description: GCC Quad-Precision Math Library (32bit)
  targets the REAL(16) type in the GNU Fortran compiler.
 
 Package: lib32quadmath0-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32quadmath0 (= ${gcc:Version}), ${misc:Depends}
@@ -1202,7 +1202,7 @@ Description: GCC Quad-Precision Math Library (32 bit debug symbols)
 
 Package: lib64quadmath0
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: GCC Quad-Precision Math Library  (64bit)
@@ -1211,7 +1211,7 @@ Description: GCC Quad-Precision Math Library  (64bit)
  targets the REAL(16) type in the GNU Fortran compiler.
 
 Package: lib64quadmath0-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64quadmath0 (= ${gcc:Version}), ${misc:Depends}
@@ -1330,7 +1330,7 @@ Description: GNU Objective-C++ compiler
  gcc backend to generate optimized code.
 
 Package: gobjc++-7-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
 Section: devel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), gobjc++-7 (= ${gcc:Version}), g++-7-multilib (= ${gcc:Version}), gobjc-7-multilib (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1353,7 +1353,7 @@ Description: GNU Objective-C compiler
  gcc backend to generate optimized code.
 
 Package: gobjc-7-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
 Section: devel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), gobjc-7 (= ${gcc:Version}), gcc-7-multilib (= ${gcc:Version}), ${dep:libobjcbiarchdev}, ${shlibs:Depends}, ${misc:Depends}
@@ -1375,7 +1375,7 @@ Description: Runtime library for GNU Objective-C applications (development files
  GNU ObjC applications.
 
 Package: lib64objc-7-dev
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64gcc-7-dev (= ${gcc:Version}), lib64objc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1384,7 +1384,7 @@ Description: Runtime library for GNU Objective-C applications (64bit development
  GNU ObjC applications.
 
 Package: lib32objc-7-dev
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32gcc-7-dev (= ${gcc:Version}), lib32objc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1393,7 +1393,7 @@ Description: Runtime library for GNU Objective-C applications (32bit development
  GNU ObjC applications.
 
 Package: libn32objc-7-dev
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32gcc-7-dev (= ${gcc:Version}), libn32objc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1433,7 +1433,7 @@ Description: Runtime library for GNU Objective-C applications (debug symbols)
 
 Package: lib64objc4
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: Runtime library for GNU Objective-C applications (64bit)
@@ -1441,7 +1441,7 @@ Description: Runtime library for GNU Objective-C applications (64bit)
 
 Package: lib64objc4-dbg
 Section: debug
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64objc4 (= ${gcc:Version}), lib64gcc1-dbg (>= ${gcc:EpochVersion}), ${misc:Depends}
 Description: Runtime library for GNU Objective-C applications (64 bit debug symbols)
@@ -1449,7 +1449,7 @@ Description: Runtime library for GNU Objective-C applications (64 bit debug symb
 
 Package: lib32objc4
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -1458,7 +1458,7 @@ Description: Runtime library for GNU Objective-C applications (32bit)
 
 Package: lib32objc4-dbg
 Section: debug
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32objc4 (= ${gcc:Version}), lib32gcc1-dbg (>= ${gcc:EpochVersion}), ${misc:Depends}
 Description: Runtime library for GNU Objective-C applications (32 bit debug symbols)
@@ -1466,7 +1466,7 @@ Description: Runtime library for GNU Objective-C applications (32 bit debug symb
 
 Package: libn32objc4
 Section: libs
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: Runtime library for GNU Objective-C applications (n32)
@@ -1474,7 +1474,7 @@ Description: Runtime library for GNU Objective-C applications (n32)
 
 Package: libn32objc4-dbg
 Section: debug
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32objc4 (= ${gcc:Version}), libn32gcc1-dbg (>= ${gcc:EpochVersion}), ${misc:Depends}
 Description: Runtime library for GNU Objective-C applications (n32 debug symbols)
@@ -1510,7 +1510,7 @@ Description: GNU Fortran compiler
  gcc backend to generate optimized code.
 
 Package: gfortran-7-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
 Section: devel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), gfortran-7 (= ${gcc:Version}), gcc-7-multilib (= ${gcc:Version}), ${dep:libgfortranbiarchdev}, ${shlibs:Depends}, ${misc:Depends}
@@ -1532,7 +1532,7 @@ Description: Runtime library for GNU Fortran applications (development files)
  GNU Fortran applications.
 
 Package: lib64gfortran-7-dev
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64gcc-7-dev (= ${gcc:Version}), lib64gfortran4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1541,7 +1541,7 @@ Description: Runtime library for GNU Fortran applications (64bit development fil
  GNU Fortran applications.
 
 Package: lib32gfortran-7-dev
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32gcc-7-dev (= ${gcc:Version}), lib32gfortran4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1550,7 +1550,7 @@ Description: Runtime library for GNU Fortran applications (32bit development fil
  GNU Fortran applications.
 
 Package: libn32gfortran-7-dev
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32gcc-7-dev (= ${gcc:Version}), libn32gfortran4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1593,7 +1593,7 @@ Description: Runtime library for GNU Fortran applications (debug symbols)
 
 Package: lib64gfortran4
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: Runtime library for GNU Fortran applications (64bit)
@@ -1602,7 +1602,7 @@ Description: Runtime library for GNU Fortran applications (64bit)
 
 Package: lib64gfortran4-dbg
 Section: debug
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64gfortran4 (= ${gcc:Version}), ${misc:Depends}
 Description: Runtime library for GNU Fortran applications (64bit debug symbols)
@@ -1611,7 +1611,7 @@ Description: Runtime library for GNU Fortran applications (64bit debug symbols)
 
 Package: lib32gfortran4
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -1621,7 +1621,7 @@ Description: Runtime library for GNU Fortran applications (32bit)
 
 Package: lib32gfortran4-dbg
 Section: debug
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32gfortran4 (= ${gcc:Version}), ${misc:Depends}
 Description: Runtime library for GNU Fortran applications (32 bit debug symbols)
@@ -1630,7 +1630,7 @@ Description: Runtime library for GNU Fortran applications (32 bit debug symbols)
 
 Package: libn32gfortran4
 Section: libs
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Description: Runtime library for GNU Fortran applications (n32)
@@ -1639,7 +1639,7 @@ Description: Runtime library for GNU Fortran applications (n32)
 
 Package: libn32gfortran4-dbg
 Section: debug
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32gfortran4 (= ${gcc:Version}), ${misc:Depends}
 Description: Runtime library for GNU Fortran applications (n32 debug symbols)
@@ -1676,7 +1676,7 @@ Description: GNU Go compiler
  by the gcc compiler. It uses the gcc backend to generate optimized code.
 
 Package: gccgo-7-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
 Section: devel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), gccgo-7 (= ${gcc:Version}), gcc-7-multilib (= ${gcc:Version}), ${dep:libgobiarch}, ${shlibs:Depends}, ${misc:Depends}
@@ -1715,7 +1715,7 @@ Description: Runtime library for GNU Go applications (debug symbols)
 
 Package: lib64go11
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Replaces: lib64go3, lib64go8
@@ -1725,7 +1725,7 @@ Description: Runtime library for GNU Go applications (64bit)
 
 Package: lib64go11-dbg
 Section: debug
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64go11 (= ${gcc:Version}), ${misc:Depends}
 Description: Runtime library for GNU Go applications (64bit debug symbols)
@@ -1735,7 +1735,7 @@ Description: Runtime library for GNU Go applications (64bit debug symbols)
 
 Package: lib32go11
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: ${confl:lib32}
@@ -1746,7 +1746,7 @@ Description: Runtime library for GNU Go applications (32bit)
 
 Package: lib32go11-dbg
 Section: debug
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32go11 (= ${gcc:Version}), ${misc:Depends}
 Description: Runtime library for GNU Go applications (32 bit debug symbols)
@@ -1756,7 +1756,7 @@ Description: Runtime library for GNU Go applications (32 bit debug symbols)
 
 Package: libn32go11
 Section: libs
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libn32go3, libn32go8
@@ -1766,7 +1766,7 @@ Description: Runtime library for GNU Go applications (n32)
 
 Package: libn32go11-dbg
 Section: debug
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32go11 (= ${gcc:Version}), ${misc:Depends}
 Description: Runtime library for GNU Go applications (n32 debug symbols)
@@ -1814,7 +1814,7 @@ Description: GNU Standard C++ Library v3
  in g++-3.0.
 
 Package: lib32stdc++6
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: libs
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32gcc1 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1824,7 +1824,7 @@ Description: GNU Standard C++ Library v3 (32 bit Version)
  built with the GNU compiler.
 
 Package: lib64stdc++6
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: libs
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64gcc1 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1837,7 +1837,7 @@ Description: GNU Standard C++ Library v3 (64bit)
  in g++-3.0.
 
 Package: libn32stdc++6
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: libs
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32gcc1 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1914,7 +1914,7 @@ Description: GNU Standard C++ Library v3 (debugging files)
  debugging symbols.
 
 Package: lib32stdc++-7-dev
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32gcc-7-dev (= ${gcc:Version}),
@@ -1928,7 +1928,7 @@ Description: GNU Standard C++ Library v3 (development files)
  in g++-3.0.
 
 Package: lib32stdc++6-7-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32stdc++6 (>= ${gcc:Version}),
@@ -1944,7 +1944,7 @@ Description: GNU Standard C++ Library v3 (debugging files)
  debugging symbols.
 
 Package: lib64stdc++-7-dev
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64gcc-7-dev (= ${gcc:Version}),
@@ -1958,7 +1958,7 @@ Description: GNU Standard C++ Library v3 (development files)
  in g++-3.0.
 
 Package: lib64stdc++6-7-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64stdc++6 (>= ${gcc:Version}),
@@ -1974,7 +1974,7 @@ Description: GNU Standard C++ Library v3 (debugging files)
  debugging symbols.
 
 Package: libn32stdc++-7-dev
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32gcc-7-dev (= ${gcc:Version}),
@@ -1988,7 +1988,7 @@ Description: GNU Standard C++ Library v3 (development files)
  in g++-3.0.
 
 Package: libn32stdc++6-7-dbg
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
 Section: debug
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), libn32stdc++6 (>= ${gcc:Version}),
@@ -2235,7 +2235,7 @@ Description: Phobos D standard library (debug symbols)
  For more information check http://www.dlang.org/phobos/
 
 Package: lib64gphobos-7-dev
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64gphobos71 (>= ${gdc:Version}),
@@ -2247,7 +2247,7 @@ Description: Phobos D standard library (64bit development files)
 
 Package: lib64gphobos71
 Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: lib64gphobos68
@@ -2258,7 +2258,7 @@ Description: Phobos D standard library (runtime library)
 
 Package: lib64gphobos71-dbg
 Section: debug
-Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el x32
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib64gphobos71 (= ${gdc:Version}), ${misc:Depends}
 Replaces: lib64gphobos68-dbg
@@ -2268,7 +2268,7 @@ Description: Phobos D standard library (debug symbols)
  For more information check http://www.dlang.org/phobos/
 
 Package: lib32gphobos-7-dev
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Section: libdevel
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32gphobos71 (>= ${gdc:Version}),
@@ -2280,7 +2280,7 @@ Description: Phobos D standard library (32bit development files)
 
 Package: lib32gphobos71
 Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: lib32gphobos68
@@ -2291,7 +2291,7 @@ Description: Phobos D standard library (runtime library)
 
 Package: lib32gphobos71-dbg
 Section: debug
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
 Priority: optional
 Depends: gcc-7-base (= ${gcc:Version}), lib32gphobos71 (= ${gdc:Version}), ${misc:Depends}
 Replaces: lib32gphobos68-dbg
diff --git a/debian/rules.conf b/debian/rules.conf
index c6c52df..803899c 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -280,7 +280,12 @@ LIBC_DEV_DEP := $(LIBC_DEP)-dev
 # this is about Debian archs name, *NOT* GNU target triplet
 biarch_deb_map := \
 	i386=amd64 amd64=i386 \
-	mips=mips64 mipsel=mips64 \
+	mips=mips64 mipsel=mips64el \
+	mipsn32=mips mipsn32el=mipsel \
+	mips64=mips mips64el=mipsel \
+	mipsr6=mips64r6 mipsr6el=mips64r6el \
+	mipsn32r6=mipsr6 mipsn32r6el=mipsr6el \
+	mips64r6=mipsr6 mips64r6el=mipsr6el \
 	powerpc=ppc64 ppc64=powerpc \
 	sparc=sparc64 sparc64=sparc\
 	s390=s390x s390x=s390 \
@@ -308,7 +313,7 @@ ifneq (,$(findstring yes,$(biarch64) $(biarch32) $(biarchn32) $(biarchx32)$(biar
   endif
   endif
   # mips*
-  ifneq (,$(findstring $(DEB_TARGET_ARCH),mips mipsel mipsn32 mipsn32el mips64 mips64el))
+  ifneq (,$(findstring $(DEB_TARGET_ARCH),mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el))
   ifeq ($(biarchn32)$(biarch32),yesyes)
       LIBC_BIARCH_DEV_DEP := libc6-dev-mips32$(LS)$(AQ) (>= $(libc_ver)), libc6-dev-mipsn32$(LS)$(AQ) (>= $(libc_ver))
   endif
@@ -349,7 +354,10 @@ ifneq ($(DEB_CROSS),yes)
     LIBC_BUILD_DEP += , libc6-dev (>= 2.13-31) [armel armhf]
   endif
   LIBC_BIARCH_BUILD_DEP = libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mipsn32el mips64 mips64el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el], lib64gcc1 [i386 mips mipsel mipsn32 mipsn32el powerpc sparc s390 x32], libc6-dev-mips [...]
-  ifneq (,$(findstring amd64,$(biarchx32archs)))
+  ifeq (yes,$(MIPS_R6_ENABLED))
+    LIBC_BIARCH_BUILD_DEP = libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el], lib64 [...]
+  endif
+ifneq (,$(findstring amd64,$(biarchx32archs)))
   LIBC_BIARCH_BUILD_DEP += libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386],
 endif
 ifneq (,$(findstring armel,$(biarchhfarchs)))
@@ -431,7 +439,10 @@ endif
 
 ifneq ($(DEB_CROSS),yes)
 # all archs for which to create b-d's
-any_archs = alpha amd64 armel armhf arm64 i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc64 s390x x32
+any_archs = alpha amd64 armel armhf arm64 i386 mips mipsel mips64 mips64el mipsn32 powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc64 s390x x32
+ifeq (yes,$(MIPS_R6_ENABLED))
+  any_archs +=  mipsn32el mipsr6 mipsr6el mips64r6 mips64r6el mipsn32r6 mipsn32r6el
+endif
 arch_gnutype_map = \
 	alpha=alpha-linux-gnu \
 	amd64=x86-64-linux-gnu \
@@ -441,8 +452,16 @@ arch_gnutype_map = \
 	i386=i686-linux-gnu \
 	mips=mips-linux-gnu \
 	mipsel=mipsel-linux-gnu \
+	mipsn32=mips64-linux-gnuabin32 \
+	mipsn32el=mips64el-linux-gnuabin32 \
 	mips64=mips64-linux-gnuabi64 \
 	mips64el=mips64el-linux-gnuabi64 \
+	mipsr6=mipsisa32r6-linux-gnu \
+	mipsr6el=mipsisa32r6el-linux-gnu \
+	mipsn32r6=mipsisa64r6-linux-gnuabin32 \
+	mipsn32r6el=mipsisa64r6el-linux-gnuabin32 \
+	mips64r6=mipsisa64r6-linux-gnuabi64 \
+	mips64r6el=mipsisa64r6el-linux-gnuabi64 \
 	powerpc=powerpc-linux-gnu \
 	powerpcspe=powerpc-linux-gnuspe \
 	ppc64=powerpc64-linux-gnu \
diff --git a/debian/rules.defs b/debian/rules.defs
index ca04995..cd93872 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -456,6 +456,11 @@ ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic luc
   multiarch_stage1 := yes
 endif
 
+MIPS_R6_ENABLED = no
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy jessie dapper hardy jaunty karmic lucid maverick natty oneiric precise quantal raring saucy trusty utopic vivid wily xenial yakkety zesty artful))
+  MIPS_R6_ENABLED = yes
+endif
+
 # mapping for the non-default biarch multilib / multiarch names
 multiarch_xarch_map = \
 	amd64=i386-linux-gnu,x86_64-linux-gnux32 \
@@ -474,6 +479,12 @@ multiarch_xarch_map = \
 	mipsn32el=mipsel-linux-gnu,mips64el-linux-gnuabi64 \
 	mips64=mips-linux-gnu,mips64-linux-gnuabin32 \
 	mips64el=mipsel-linux-gnu,mips64el-linux-gnuabin32 \
+	mipsr6=mipsisa64r6-linux-gnuabin32,mipsisa64r6-linux-gnuabi64 \
+	mipsr6el=mipsisa64r6el-linux-gnuabin32,mipsisa64r6el-linux-gnuabi64 \
+	mipsn32r6=mipsisa32r6-linux-gnu,mipsisa64r6-linux-gnuabi64 \
+	mipsn32r6el=mipsisa32r6el-linux-gnu,mipsisa64r6el-linux-gnuabi64 \
+	mips64r6=mipsisa32r6-linux-gnu,mipsisa64r6-linux-gnuabin32 \
+	mips64r6el=mipsisa32r6el-linux-gnu,mipsisa64r6el-linux-gnuabin32 \
 	x32=x86_64-linux-gnu,i386-linux-gnu \
 	kfreebsd-amd64=i386-kfreebsd-gnu
 xarch_multiarch_names = $(subst $(COMMA),$(SPACE),$(patsubst $(DEB_TARGET_ARCH)=%,%, \
@@ -505,6 +516,18 @@ multilib_multiarch_map = \
 	mips64/n32=mips64-linux-gnuabin32 \
 	mips64el/32=mipsel-linux-gnu \
 	mips64el/n32=mips64el-linux-gnuabin32 \
+	mipsr6/n32=mipsisa64r6-linux-gnuabin32 \
+	mipsr6/64=mipsisa64r6-linux-gnuabi64 \
+	mipsr6el/n32=mipsisa64r6el-linux-gnuabin32 \
+	mipsr6el/64=mipsisa64r6el-linux-gnuabi64 \
+	mipsn32r6/32=mipsisa32r6-linux-gnu \
+	mipsn32r6/64=mipsisa64r6-linux-gnuabi64 \
+	mipsn32r6el/32=mipsisa32r6el-linux-gnu \
+	mipsn32r6el/64=mipsisa64r6el-linux-gnuabi64 \
+	mips64r6/32=mipsisa32r6-linux-gnu \
+	mips64r6/n32=mipsisa64r6-linux-gnuabin32 \
+	mips64r6el/32=mipsisa32r6el-linux-gnu \
+	mips64r6el/n32=mipsisa64r6el-linux-gnuabin32 \
 	x32/32=i386-linux-gnu \
 	x32/64=x86_64-linux-gnu \
 	kfreebsd-amd64/32=i386-kfreebsd-gnu
@@ -538,6 +561,18 @@ multilib_arch_map = \
 	mips64/n32=mipsn32 \
 	mips64el/32=mipsel \
 	mips64el/n32=mipsn32el \
+	mipsr6/n32=mipsn32r6 \
+	mipsr6/64=mips64r6 \
+	mipsr6el/n32=mipsn32r6el \
+	mipsr6el/64=mips64r6el \
+	mipsn32r6/32=mipsr6 \
+	mipsn32r6/64=mips64r6 \
+	mipsn32r6el/32=mipsr6el \
+	mipsn32r6el/64=mips64r6el \
+	mips64r6/32=mipsr6 \
+	mips64r6/n32=mipsn32r6 \
+	mips64r6el/32=mipsr6el \
+	mips64r6el/n32=mipsn32r6el \
 	x32/32=i386 \
 	x32/64=amd64 \
 	kfreebsd-amd64/32=kfreebsd-i386
@@ -912,6 +947,7 @@ ifeq ($(with_d),yes)
 
   libphobos_no_cpus := alpha avr arm64 hppa ia64 m68k \
 	mips mipsel mips64 mips64el mipsn32 mipsn32el \
+	mipsr6 mipsr6el mips64r6 mips64r6el mipsn32r6 mipsn32r6el \
 	powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64
   libphobos_no_systems := gnu kfreebsd-gnu
   ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(libphobos_no_cpus)))
@@ -1179,7 +1215,9 @@ endif
 with_pie :=
 ifeq ($(distribution),Debian)
   ifeq (,$(filter $(distrelease),wheezy squeeze jessie))
-    pie_archs = amd64 arm64 armel armhf i386 mips mipsel mips64el \
+    pie_archs = amd64 arm64 armel armhf i386 \
+		mips mipsel mips64 mips64el mipsn32 mipsn32el \
+		mipsr6 mipsr6el mips64r6 mips64r6el mipsn32r6 mipsn32r6el \
 		ppc64el s390x sparc sparc64 kfreebsd-amd64 kfreebsd-i386
   endif
   ifeq (,$(filter $(distrelease),wheezy squeeze jessie stretch))
@@ -1443,7 +1481,9 @@ export debian_extra_langs
 # multilib
 biarch_map := i686=x86_64 powerpc=powerpc64 sparc=sparc64 sparc64=sparc s390=s390x s390x=s390 \
 		x86_64=i686 powerpc64=powerpc mips=mips64 mipsel=mips64el \
-		mips64=mips mips64el=mipsel mipsn32=mips mipsn32el=mipsel
+		mips64=mips mips64el=mipsel mipsn32=mips mipsn32el=mipsel \
+		mipsr6=mips64r6 mipsr6el=mips64r6el mips64r6=mipsr6 mips64r6el=mipsr6el \
+		mipsn32r6=mipsr6 mipsn32r6el=mipsr6el
 ifneq (,$(filter $(derivative),Ubuntu))
   ifeq (,$(filter $(distrelease),dapper hardy jaunty karmic lucid))
     biarch_map := $(subst i686=,i486=,$(biarch_map))
@@ -1600,8 +1640,14 @@ define gen_biarch
   endif
 endef
 biarch32archs := /amd64/ppc64/kfreebsd-amd64/s390x/sparc64/x32/mipsn32/mipsn32el/mips64/mips64el/
-biarch64archs := /i386/powerpc/sparc/s390/mips/mipsel/mipsn32/mipsn32el/x32/
+biarch64archs := /i386/powerpc/sparc/s390/mips/mipsel/mipsn32/mipsn32el/
 biarchn32archs := /mips/mipsel/mips64/mips64el/
+ifeq (yes,$(MIPS_R6_ENABLED))
+  biarch32archs += mipsn32r6/mipsn32r6el/mips64r6/mips64r6el/
+  biarch64archs += mipsr6/mipsr6el/mipsn32r6/mipsn32r6el/x32/
+  biarchn32archs += mipsr6/mipsr6el/mips64r6/mips64r6el/
+endif
+
 ifeq ($(derivative),Ubuntu)
   ifeq (,$(filter $(distrelease),dapper hardy jaunty karmic lucid maverick natty))
     biarchhfarchs := /armel/
diff --git a/debian/rules2 b/debian/rules2
index 2b2fad2..00fb2a7 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -630,6 +630,71 @@ ifneq (,$(findstring mips64-linux-gnuabi64,$(DEB_TARGET_GNU_TYPE)))
   endif
 endif
 
+ifneq (,$(findstring mipsisa32r6-linux,$(DEB_TARGET_GNU_TYPE)))
+  CONFARGS += --with-arch-32=mips32r6 --with-tune-32=mips32r6
+  ifeq ($(multilib),yes)
+    ifeq ($(biarchn32)-$(biarch64),yes-yes)
+      CONFARGS += --enable-targets=all
+      CONFARGS += --with-arch-64=mips64r6 --with-tune-64=mips64r6
+    endif
+  endif
+endif
+
+ifneq (,$(findstring mipsisa32r6el-linux,$(DEB_TARGET_GNU_TYPE)))
+  CONFARGS += --with-arch-32=mips32r6 --with-tune-32=mips32r6
+  ifeq ($(multilib),yes)
+    ifeq ($(biarchn32)-$(biarch64),yes-yes)
+      CONFARGS += --enable-targets=all
+      CONFARGS += --with-arch-64=mips64r6 --with-tune-64=mips64r6
+    endif
+  endif
+endif
+
+#FIXME: howto for mipsn32?
+ifneq (,$(findstring mipsisa64r6el-linux-gnuabin32,$(DEB_TARGET_GNU_TYPE)))
+  CONFARGS += --with-mips-plt
+  ifeq ($(multilib),yes)
+    ifeq ($(biarchn32)-$(biarch32),yes-yes)
+      CONFARGS += --enable-targets=all
+      CONFARGS += --with-arch-64=mips64r6 --with-tune-64=mips64r6
+      CONFARGS += --with-arch-32=mips32r6 --with-tune-32=mips32r6
+    endif
+  endif
+endif
+ 
+ifneq (,$(findstring mipsisa64r6-linux-gnuabin32,$(DEB_TARGET_GNU_TYPE)))
+  CONFARGS += --with-mips-plt
+  ifeq ($(multilib),yes)
+    ifeq ($(biarchn32)-$(biarch32),yes-yes)
+      CONFARGS += --enable-targets=all
+      CONFARGS += --with-arch-64=mips64r6 --with-tune-64=mips64r6
+      CONFARGS += --with-arch-32=mips32r6 --with-tune-32=mips32r6
+    endif
+  endif
+endif
+
+ifneq (,$(findstring mipsisa64r6el-linux-gnuabi64,$(DEB_TARGET_GNU_TYPE)))
+  CONFARGS += --with-mips-plt
+  CONFARGS += --with-arch-64=mips64r6 --with-tune-64=mips64r6
+  ifeq ($(multilib),yes)
+    ifeq ($(biarchn32)-$(biarch32),yes-yes)
+      CONFARGS += --enable-targets=all
+      CONFARGS += --with-arch-32=mips32r6 --with-tune-32=mips32r6
+    endif
+  endif
+endif
+
+ifneq (,$(findstring mipsisa64r6-linux-gnuabi64,$(DEB_TARGET_GNU_TYPE)))
+  CONFARGS += --with-mips-plt
+  CONFARGS += --with-arch-64=mips64r6 --with-tune-64=mips64r6
+  ifeq ($(multilib),yes)
+    ifeq ($(biarchn32)-$(biarch32),yes-yes)
+      CONFARGS += --enable-targets=all
+      CONFARGS += --with-arch-32=mips32r6 --with-tune-32=mips32r6
+    endif
+  endif
+endif
+
 ifneq (,$(findstring mips,$(DEB_TARGET_GNU_TYPE)))
   ifeq (,$(filter yes,$(biarch32) $(biarchn32) $(biarch64)))
       CONFARGS += --disable-multilib

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



More information about the Reproducible-commits mailing list