[Reproducible-commits] [dpkg] 10/63: Add MIPS R6 architectures to arch tables

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/buildinfo
in repository dpkg.

commit 8adc184ffabb309894345185704eab54a75874d0
Author: YunQiang Su <wzssyqa at gmail.com>
Date:   Sat Feb 6 02:26:48 2016 +0100

    Add MIPS R6 architectures to arch tables
    
    MIPS R6 is a new release of MIPS32 and MIPS64. R6 is not fully compatible
    with R5-, as it adds and *removes* some instructions, and adds emulation
    of the removed instructions in the kernel, so old binaries can still run
    on new R6 CPUs, but at a significant performance cost.
    
    Closes: #807340
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 cputable              | 4 ++++
 debian/changelog      | 2 ++
 scripts/t/Dpkg_Arch.t | 2 +-
 triplettable          | 4 ++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cputable b/cputable
index 9c24003..d595256 100644
--- a/cputable
+++ b/cputable
@@ -27,8 +27,12 @@ m32r		m32r		m32r			32	big
 m68k		m68k		m68k			32	big
 mips		mips		mips(eb)?		32	big
 mipsel		mipsel		mipsel			32	little
+mips32r6	mipsisa32r6	mipsisa32r6		32	big
+mips32r6el	mipsisa32r6el	mipsisa32r6el		32	little
 mips64		mips64		mips64			64	big
 mips64el	mips64el	mips64el		64	little
+mips64r6	mipsisa64r6	mipsisa64r6		64	big
+mips64r6el	mipsisa64r6el	mipsisa64r6el		64	little
 nios2		nios2		nios2			32	little
 or1k		or1k		or1k			32	big
 powerpc		powerpc		(powerpc|ppc)		32	big
diff --git a/debian/changelog b/debian/changelog
index 3b25e53..8ffa143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ dpkg (1.18.5) UNRELEASED; urgency=medium
   * Check first for build type to short-circuit boolean expressions in
     dpkg-genchanges.
   * Add source format backend-specific --help options support to dpkg-source.
+  * Add MIPS R6 architectures to arch tables. Closes: #807340
+    Thanks to YunQiang Su <wzssyqa at gmail.com>.
   * Perl modules:
     - Add new CTRL_REPO_RELEASE control block type to Dpkg::Control.
     - Add new CTRL_COPYRIGHT_HEADER, CTRL_COPYRIGHT_FILES and
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index b57a0cf..c147792 100644
--- a/scripts/t/Dpkg_Arch.t
+++ b/scripts/t/Dpkg_Arch.t
@@ -98,7 +98,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet');
 is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet');
 is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet');
 
-is(scalar get_valid_arches(), 417, 'expected amount of known architectures');
+is(scalar get_valid_arches(), 475, 'expected amount of known architectures');
 
 {
     local $ENV{CC} = 'false';
diff --git a/triplettable b/triplettable
index 568a6b9..abe4726 100644
--- a/triplettable
+++ b/triplettable
@@ -9,8 +9,12 @@ musleabihf-linux-arm	musl-linux-armhf
 musl-linux-<cpu>	musl-linux-<cpu>
 gnueabihf-linux-arm	armhf
 gnueabi-linux-arm	armel
+gnuabin32-linux-mips64r6el	mipsn32r6el
+gnuabin32-linux-mips64r6	mipsn32r6
 gnuabin32-linux-mips64el	mipsn32el
 gnuabin32-linux-mips64	mipsn32
+gnuabi64-linux-mips64r6el	mips64r6el
+gnuabi64-linux-mips64r6	mips64r6
 gnuabi64-linux-mips64el	mips64el
 gnuabi64-linux-mips64	mips64
 gnuspe-linux-powerpc	powerpcspe

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