[dpkg] 13/192: arch: Add support for ARM64 ILP32

[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 dpkg.

commit 7e0656a1e1ab5177b5bacecad96ee0a1386b505a
Author: Guillem Jover <guillem at debian.org>
Date:   Wed Mar 15 19:49:08 2017 +0100

    arch: Add support for ARM64 ILP32
    
    Closes: #824742
    Based-on-patch-by: Wookey <wookey at wookware.org>
---
 data/abitable         | 1 +
 data/ostable          | 1 +
 data/tupletable       | 1 +
 debian/changelog      | 3 +++
 scripts/t/Dpkg_Arch.t | 4 ++--
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/data/abitable b/data/abitable
index 18fa367..b9b1dc4 100644
--- a/data/abitable
+++ b/data/abitable
@@ -10,4 +10,5 @@
 #
 # <Debian name>	<Bits>
 abin32		32
+ilp32		32
 x32		32
diff --git a/data/ostable b/data/ostable
index 09007da..99c1f88 100644
--- a/data/ostable
+++ b/data/ostable
@@ -24,6 +24,7 @@ abin32-gnu-linux	linux-gnuabin32		linux[^-]*-gnuabin32
 abi64-gnu-linux		linux-gnuabi64		linux[^-]*-gnuabi64
 spe-gnu-linux		linux-gnuspe		linux[^-]*-gnuspe
 x32-gnu-linux		linux-gnux32		linux[^-]*-gnux32
+ilp32-gnu-linux		linux-gnu_ilp32		linux[^-]*-gnu_ilp32
 base-gnu-linux		linux-gnu		linux[^-]*(-gnu.*)?
 eabihf-gnu-kfreebsd	kfreebsd-gnueabihf	kfreebsd[^-]*-gnueabihf
 base-gnu-kfreebsd	kfreebsd-gnu		kfreebsd[^-]*(-gnu.*)?
diff --git a/data/tupletable b/data/tupletable
index 2692f2d..b7802be 100644
--- a/data/tupletable
+++ b/data/tupletable
@@ -9,6 +9,7 @@ eabi-uclibc-linux-arm		uclibc-linux-armel
 base-uclibc-linux-<cpu>		uclibc-linux-<cpu>
 eabihf-musl-linux-arm		musl-linux-armhf
 base-musl-linux-<cpu>		musl-linux-<cpu>
+ilp32-gnu-linux-arm64		arm64ilp32
 eabihf-gnu-linux-arm		armhf
 eabi-gnu-linux-arm		armel
 abin32-gnu-linux-mips64r6el	mipsn32r6el
diff --git a/debian/changelog b/debian/changelog
index fc96168..c87e3cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 dpkg (1.18.24) UNRELEASED; urgency=medium
 
   [ Guillem Jover ]
+  * Architecture support:
+    - Add support for ARM64 ILP32. Closes: #824742
+      Thanks to Wookey <wookey at wookware.org>.
   * Documentation:
     - Many spelling fixes. Thanks to Josh Soref <jsoref at gmail.com>.
     - Do not include mispellings in changelogs, as that makes detecting them
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index 9fd9527..d478b49 100644
--- a/scripts/t/Dpkg_Arch.t
+++ b/scripts/t/Dpkg_Arch.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 16334;
+use Test::More tests => 16367;
 
 use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch
                         debarch_eq debarch_is debarch_is_wildcard
@@ -162,7 +162,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(), 523, 'expected amount of known architectures');
+is(scalar get_valid_arches(), 524, 'expected amount of known architectures');
 
 {
     local $ENV{CC} = 'false';

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