Bug#824996: glibc 2.23: add MIPS r6 support
On Sun, 22 May 2016 16:57:39 +0800 YunQiang Su <wzssyqa@gmail.com> wrote:
> Package: src:glibc
> Version: 2.23-1
>
> Hi, I am working add MIPS r6 support for base toolchains.
> This is the patch for glibc (2.23 only)
>
> The patch for 2.22 was submit by bug: #824985
>
Sorry for forgetting the patch.
>
> --
> YunQiang Su
>
>
diff -urN glibc-2.22/debian/control glibc/debian/control
--- glibc-2.22/debian/control 2016-05-12 10:54:15.000000000 +0000
+++ glibc/debian/control 2016-05-18 07:25:29.801305464 +0000
@@ -10,7 +10,7 @@
hurd-dev (>= 1:0.5.git20140320~) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-5, g++-5-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32],
+ g++-5, g++-5-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32],
g++-5 (>= 5.3.1-17) [hurd-i386 i386 kfreebsd-i386],
libc-bin (>= 2.22) <cross>
Build-Depends-Indep: perl, po-debconf (>= 1.0)
@@ -160,7 +160,7 @@
be removed once nothing on the system depends on it.
Package: libc6
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: libs
Priority: required
Multi-Arch: same
@@ -180,9 +180,9 @@
libc6-ppc64 [ppc64],
libc6-s390x [s390x],
libc6-sparc64 [sparc64],
- libc6-mips64 [mips64 mips64el],
- libc6-mipsn32 [mipsn32 mipsn32el],
- libc6-mips32 [mips mipsel],
+ libc6-mips64 [mips64 mips64el mips64r6 mips64r6el],
+ libc6-mipsn32 [mipsn32 mipsn32el mipsn32r6 mipsn32r6el],
+ libc6-mips32 [mips mipsel mipsr6 mipsr6el],
hurd (<< 20120408-3) [hurd-i386]
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries
@@ -191,7 +191,7 @@
and the standard math library, as well as many others.
Package: libc6-dev
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: libdevel
Priority: optional
Multi-Arch: same
@@ -206,7 +206,7 @@
and link programs which use the standard C library.
Package: libc6-dbg
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: debug
Priority: extra
Multi-Arch: same
@@ -218,7 +218,7 @@
library.
Package: libc6-pic
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: libdevel
Priority: optional
Multi-Arch: same
@@ -234,7 +234,7 @@
Package: libc6-udeb
Package-Type: udeb
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: debian-installer
Priority: extra
Provides: libc6, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
@@ -268,9 +268,9 @@
libc6-ppc64 [ppc64],
libc6-s390x [s390x],
libc6-sparc64 [sparc64],
- libc6-mips64 [mips64 mips64el],
- libc6-mipsn32 [mipsn32 mipsn32el],
- libc6-mips32 [mips mipsel],
+ libc6-mips64 [mips64 mips64el mips64r6 mips64r6el],
+ libc6-mipsn32 [mipsn32 mipsn32el mipsn32r6 mipsn32r6el],
+ libc6-mips32 [mips mipsel mipsr6 mipsr6el],
hurd (<< 20120408-3) [hurd-i386]
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries
@@ -356,9 +356,9 @@
libc6-ppc64 [ppc64],
libc6-s390x [s390x],
libc6-sparc64 [sparc64],
- libc6-mips64 [mips64 mips64el],
- libc6-mipsn32 [mipsn32 mipsn32el],
- libc6-mips32 [mips mipsel],
+ libc6-mips64 [mips64 mips64el mips64r6 mips64r6el],
+ libc6-mipsn32 [mipsn32 mipsn32el mipsn32r6 mipsn32r6el],
+ libc6-mips32 [mips mipsel mipsr6 mipsr6el],
hurd (<< 20120408-3) [hurd-i386]
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries
@@ -444,9 +444,9 @@
libc6-ppc64 [ppc64],
libc6-s390x [s390x],
libc6-sparc64 [sparc64],
- libc6-mips64 [mips64 mips64el],
- libc6-mipsn32 [mipsn32 mipsn32el],
- libc6-mips32 [mips mipsel],
+ libc6-mips64 [mips64 mips64el mips64r6 mips64r6el],
+ libc6-mipsn32 [mipsn32 mipsn32el mipsn32r6 mipsn32r6el],
+ libc6-mips32 [mips mipsel mipsr6 mipsr6el],
hurd (<< 20120408-3) [hurd-i386]
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries
@@ -696,7 +696,7 @@
library, meant for PowerPC64 systems.
Package: libc6-mips32
-Architecture: mipsn32 mipsn32el mips64 mips64el
+Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -707,15 +707,15 @@
of the library, meant for MIPS systems.
Package: libc6-dev-mips32
-Architecture: mipsn32 mipsn32el mips64 mips64el
+Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
Section: libdevel
Priority: optional
Provides: lib32c-dev
Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-dev (= ${binary:Version}), libc6-mips32 (= ${binary:Version}),
- libc6-dev-mipsn32 (= ${binary:Version}) [mips64 mips64el],
- libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el],
+ libc6-dev-mipsn32 (= ${binary:Version}) [mips64 mips64el mips64r6 mips64r6el],
+ libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el mipsn32r6 mipsn32r6el],
${misc:Depends}
Recommends: gcc-multilib
Build-Profiles: <!nobiarch>
@@ -725,7 +725,7 @@
library, meant for MIPS systems.
Package: libc6-mipsn32
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -736,13 +736,13 @@
of the library, meant for MIPS64 systems.
Package: libc6-dev-mipsn32
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libdevel
Priority: optional
Provides: libn32c-dev
Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
-Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel], libc6-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel mipsr6 mipsr6el], libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Build-Profiles: <!nobiarch>
Description: GNU C Library: n32 Development Libraries for MIPS64
@@ -751,7 +751,7 @@
library, meant for MIPS64 systems.
Package: libc6-mips64
-Architecture: mips mipsel mipsn32 mipsn32el
+Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -762,7 +762,7 @@
of the library, meant for MIPS64 systems.
Package: libc6-dev-mips64
-Architecture: mips mipsel mipsn32 mipsn32el
+Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
Section: libdevel
Priority: optional
Provides: lib64c-dev
diff -urN glibc-2.22/debian/control.in/libc glibc/debian/control.in/libc
--- glibc-2.22/debian/control.in/libc 2016-05-11 21:13:39.000000000 +0000
+++ glibc/debian/control.in/libc 2016-05-18 07:25:10.877375169 +0000
@@ -19,9 +19,9 @@
libc6-ppc64 [ppc64],
libc6-s390x [s390x],
libc6-sparc64 [sparc64],
- libc6-mips64 [mips64 mips64el],
- libc6-mipsn32 [mipsn32 mipsn32el],
- libc6-mips32 [mips mipsel],
+ libc6-mips64 [mips64 mips64el mips64r6 mips64r6el],
+ libc6-mipsn32 [mipsn32 mipsn32el mipsn32r6 mipsn32r6el],
+ libc6-mips32 [mips mipsel mipsr6 mipsr6el],
hurd (<< 20120408-3) [hurd-i386]
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries
diff -urN glibc-2.22/debian/control.in/main glibc/debian/control.in/main
--- glibc-2.22/debian/control.in/main 2016-05-12 10:54:10.000000000 +0000
+++ glibc/debian/control.in/main 2016-05-18 03:58:13.719231205 +0000
@@ -10,7 +10,7 @@
hurd-dev (>= 1:0.5.git20140320~) [hurd-i386] <!stage1> | libihash-dev [hurd-i386] <!stage1>,
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
- g++-5, g++-5-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32],
+ g++-5, g++-5-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32],
g++-5 (>= 5.3.1-17) [hurd-i386 i386 kfreebsd-i386],
libc-bin (>= @GLIBC_VERSION@) <cross>
Build-Depends-Indep: perl, po-debconf (>= 1.0)
diff -urN glibc-2.22/debian/control.in/mips32 glibc/debian/control.in/mips32
--- glibc-2.22/debian/control.in/mips32 2016-05-11 21:13:39.000000000 +0000
+++ glibc/debian/control.in/mips32 2016-05-15 13:31:53.530311882 +0000
@@ -1,5 +1,5 @@
Package: libc6-mips32
-Architecture: mipsn32 mipsn32el mips64 mips64el
+Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -10,15 +10,15 @@
of the library, meant for MIPS systems.
Package: libc6-dev-mips32
-Architecture: mipsn32 mipsn32el mips64 mips64el
+Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
Section: libdevel
Priority: optional
Provides: lib32c-dev
Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
Depends: libc6-dev (= ${binary:Version}), libc6-mips32 (= ${binary:Version}),
- libc6-dev-mipsn32 (= ${binary:Version}) [mips64 mips64el],
- libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el],
+ libc6-dev-mipsn32 (= ${binary:Version}) [mips64 mips64el mips64r6 mips64r6el],
+ libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el mipsn32r6 mipsn32r6el],
${misc:Depends}
Recommends: gcc-multilib
Build-Profiles: <!nobiarch>
diff -urN glibc-2.22/debian/control.in/mips64 glibc/debian/control.in/mips64
--- glibc-2.22/debian/control.in/mips64 2016-05-11 21:13:39.000000000 +0000
+++ glibc/debian/control.in/mips64 2016-05-15 13:31:53.530311882 +0000
@@ -1,5 +1,5 @@
Package: libc6-mips64
-Architecture: mips mipsel mipsn32 mipsn32el
+Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -10,7 +10,7 @@
of the library, meant for MIPS64 systems.
Package: libc6-dev-mips64
-Architecture: mips mipsel mipsn32 mipsn32el
+Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
Section: libdevel
Priority: optional
Provides: lib64c-dev
diff -urN glibc-2.22/debian/control.in/mipsn32 glibc/debian/control.in/mipsn32
--- glibc-2.22/debian/control.in/mipsn32 2016-05-11 21:13:39.000000000 +0000
+++ glibc/debian/control.in/mipsn32 2016-05-15 13:31:53.530311882 +0000
@@ -1,5 +1,5 @@
Package: libc6-mipsn32
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -10,13 +10,13 @@
of the library, meant for MIPS64 systems.
Package: libc6-dev-mipsn32
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libdevel
Priority: optional
Provides: libn32c-dev
Conflicts: libc6-dev (<< 2.13-14)
Replaces: libc6-dev (<< 2.13-11)
-Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel], libc6-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel mipsr6 mipsr6el], libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Build-Profiles: <!nobiarch>
Description: GNU C Library: n32 Development Libraries for MIPS64
diff -urN glibc-2.22/debian/libc6-mips32.symbols.mips64 glibc/debian/libc6-mips32.symbols.mips64
--- glibc-2.22/debian/libc6-mips32.symbols.mips64 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips32.symbols.mips64 2016-05-15 13:31:53.530311882 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips32.symbols.mips64r6 glibc/debian/libc6-mips32.symbols.mips64r6
--- glibc-2.22/debian/libc6-mips32.symbols.mips64r6 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips32.symbols.mips64r6 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips32.symbols.mips64r6el glibc/debian/libc6-mips32.symbols.mips64r6el
--- glibc-2.22/debian/libc6-mips32.symbols.mips64r6el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips32.symbols.mips64r6el 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips32.symbols.mipsn32 glibc/debian/libc6-mips32.symbols.mipsn32
--- glibc-2.22/debian/libc6-mips32.symbols.mipsn32 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips32.symbols.mipsn32 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips32.symbols.mipsn32el glibc/debian/libc6-mips32.symbols.mipsn32el
--- glibc-2.22/debian/libc6-mips32.symbols.mipsn32el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips32.symbols.mipsn32el 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips32.symbols.mipsn32r6 glibc/debian/libc6-mips32.symbols.mipsn32r6
--- glibc-2.22/debian/libc6-mips32.symbols.mipsn32r6 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips32.symbols.mipsn32r6 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips32.symbols.mipsn32r6el glibc/debian/libc6-mips32.symbols.mipsn32r6el
--- glibc-2.22/debian/libc6-mips32.symbols.mipsn32r6el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips32.symbols.mipsn32r6el 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips64.symbols.mipsn32 glibc/debian/libc6-mips64.symbols.mipsn32
--- glibc-2.22/debian/libc6-mips64.symbols.mipsn32 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips64.symbols.mipsn32 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips64.symbols.mipsn32el glibc/debian/libc6-mips64.symbols.mipsn32el
--- glibc-2.22/debian/libc6-mips64.symbols.mipsn32el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips64.symbols.mipsn32el 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips64.symbols.mipsn32r6 glibc/debian/libc6-mips64.symbols.mipsn32r6
--- glibc-2.22/debian/libc6-mips64.symbols.mipsn32r6 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips64.symbols.mipsn32r6 2016-05-15 13:32:08.442231512 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips64.symbols.mipsn32r6el glibc/debian/libc6-mips64.symbols.mipsn32r6el
--- glibc-2.22/debian/libc6-mips64.symbols.mipsn32r6el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips64.symbols.mipsn32r6el 2016-05-15 13:32:08.442231512 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips64.symbols.mipsr6 glibc/debian/libc6-mips64.symbols.mipsr6
--- glibc-2.22/debian/libc6-mips64.symbols.mipsr6 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips64.symbols.mipsr6 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mips64.symbols.mipsr6el glibc/debian/libc6-mips64.symbols.mipsr6el
--- glibc-2.22/debian/libc6-mips64.symbols.mipsr6el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mips64.symbols.mipsr6el 2016-05-15 13:32:08.438231533 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mipsn32.symbols.mips64 glibc/debian/libc6-mipsn32.symbols.mips64
--- glibc-2.22/debian/libc6-mipsn32.symbols.mips64 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mipsn32.symbols.mips64 2016-05-15 13:32:08.442231512 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mipsn32.symbols.mips64r6 glibc/debian/libc6-mipsn32.symbols.mips64r6
--- glibc-2.22/debian/libc6-mipsn32.symbols.mips64r6 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mipsn32.symbols.mips64r6 2016-05-15 13:32:19.126173931 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mipsn32.symbols.mips64r6el glibc/debian/libc6-mipsn32.symbols.mips64r6el
--- glibc-2.22/debian/libc6-mipsn32.symbols.mips64r6el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mipsn32.symbols.mips64r6el 2016-05-15 13:32:19.126173931 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mipsn32.symbols.mipsr6 glibc/debian/libc6-mipsn32.symbols.mipsr6
--- glibc-2.22/debian/libc6-mipsn32.symbols.mipsr6 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mipsn32.symbols.mipsr6 2016-05-15 13:32:08.442231512 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6-mipsn32.symbols.mipsr6el glibc/debian/libc6-mipsn32.symbols.mipsr6el
--- glibc-2.22/debian/libc6-mipsn32.symbols.mipsr6el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6-mipsn32.symbols.mipsr6el 2016-05-15 13:32:08.442231512 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6.symbols.mips64 glibc/debian/libc6.symbols.mips64
--- glibc-2.22/debian/libc6.symbols.mips64 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6.symbols.mips64 2016-05-15 13:32:19.126173931 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6.symbols.mips64r6 glibc/debian/libc6.symbols.mips64r6
--- glibc-2.22/debian/libc6.symbols.mips64r6 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6.symbols.mips64r6 2016-05-15 13:32:26.998131506 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6.symbols.mips64r6el glibc/debian/libc6.symbols.mips64r6el
--- glibc-2.22/debian/libc6.symbols.mips64r6el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6.symbols.mips64r6el 2016-05-15 13:32:26.998131506 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6.symbols.mipsn32 glibc/debian/libc6.symbols.mipsn32
--- glibc-2.22/debian/libc6.symbols.mipsn32 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6.symbols.mipsn32 2016-05-15 13:32:26.998131506 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6.symbols.mipsn32el glibc/debian/libc6.symbols.mipsn32el
--- glibc-2.22/debian/libc6.symbols.mipsn32el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6.symbols.mipsn32el 2016-05-15 13:32:26.998131506 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6.symbols.mipsn32r6 glibc/debian/libc6.symbols.mipsn32r6
--- glibc-2.22/debian/libc6.symbols.mipsn32r6 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6.symbols.mipsn32r6 2016-05-15 13:32:26.998131506 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6.symbols.mipsn32r6el glibc/debian/libc6.symbols.mipsn32r6el
--- glibc-2.22/debian/libc6.symbols.mipsn32r6el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6.symbols.mipsn32r6el 2016-05-15 13:32:26.998131506 +0000
@@ -0,0 +1,5 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6.symbols.mipsr6 glibc/debian/libc6.symbols.mipsr6
--- glibc-2.22/debian/libc6.symbols.mipsr6 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6.symbols.mipsr6 2016-05-15 13:32:19.126173931 +0000
@@ -0,0 +1,12 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+### TLS support enabled in Debian upload 2.4
+ __tls_get_addr@GLIBC_2.3 2.4
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+###
+### Override headers already defined in libc6.symbols.common
+###
+libpthread.so.0 #PACKAGE# (>= 2.4), #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/libc6.symbols.mipsr6el glibc/debian/libc6.symbols.mipsr6el
--- glibc-2.22/debian/libc6.symbols.mipsr6el 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/libc6.symbols.mipsr6el 2016-05-15 13:32:19.126173931 +0000
@@ -0,0 +1,12 @@
+#include "libc6.symbols.common"
+ld.so.1 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+### TLS support enabled in Debian upload 2.4
+ __tls_get_addr@GLIBC_2.3 2.4
+libc.so.6 #PACKAGE# #MINVER#
+#include "symbols.wildcards"
+###
+### Override headers already defined in libc6.symbols.common
+###
+libpthread.so.0 #PACKAGE# (>= 2.4), #PACKAGE# #MINVER#
+#include "symbols.wildcards"
diff -urN glibc-2.22/debian/rules.d/control.mk glibc/debian/rules.d/control.mk
--- glibc-2.22/debian/rules.d/control.mk 2016-05-08 14:10:43.000000000 +0000
+++ glibc/debian/rules.d/control.mk 2016-05-18 07:22:51.301887552 +0000
@@ -1,7 +1,7 @@
libc_packages := libc6 libc6.1 libc0.1 libc0.3
libc0_1_archs := kfreebsd-amd64 kfreebsd-i386
libc0_3_archs := hurd-i386
-libc6_archs := amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
+libc6_archs := amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
libc6_1_archs := alpha
control_deps := $(wildcard debian/control.in/*) $(addprefix debian/control.in/, $(libc_packages))
diff -urN glibc-2.22/debian/sysdeps/mips64r6.mk glibc/debian/sysdeps/mips64r6.mk
--- glibc-2.22/debian/sysdeps/mips64r6.mk 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/sysdeps/mips64r6.mk 2016-05-21 08:24:05.025451125 +0000
@@ -0,0 +1,63 @@
+libc_add-ons = $(add-ons)
+libc_rtlddir = /lib64
+extra_cflags = -mno-plt
+
+# build 32-bit (n32) alternative library
+GLIBC_MULTILIB_PASSES += mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+mipsn32_add-ons = $(add-ons)
+mipsn32_configure_target = mipsisa64r6-linux-gnuabin32
+mipsn32_extra_cflags = -mno-plt
+mipsn32_CC = $(CC) -mabi=n32
+mipsn32_CXX = $(CXX) -mabi=n32
+libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_rtlddir = /lib32
+mipsn32_slibdir = /lib32
+mipsn32_libdir = /usr/lib32
+mipsn32_extra_config_options := $(extra_config_options)
+
+# build 32-bit (o32) alternative library
+GLIBC_MULTILIB_PASSES += mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
+mips32_add-ons = $(add-ons)
+mips32_configure_target = mipsisa32r6-linux-gnu
+mips32_extra_cflags = -mno-plt
+mips32_CC = $(CC) -mabi=32
+mips32_CXX = $(CXX) -mabi=32
+libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
+mips32_rtlddir = /lib
+mips32_slibdir = /libo32
+mips32_libdir = /usr/libo32
+mips32_extra_config_options := $(extra_config_options)
+
+define libc6-dev-mipsn32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include
+ln -sf mipsisa64r6-linux-gnuabi64/bits debian/libc6-dev-mipsn32/usr/include/
+ln -sf mipsisa64r6-linux-gnuabi64/gnu debian/libc6-dev-mipsn32/usr/include/
+ln -sf mipsisa64r6-linux-gnuabi64/fpu_control.h debian/libc6-dev-mipsn32/usr/include/
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include/mipsisa64r6-linux-gnuabi64/gnu
+cp -a debian/tmp-mipsn32/usr/include/gnu/stubs-n32_hard_2008.h \
+ debian/libc6-dev-mipsn32/usr/include/mipsisa64r6-linux-gnuabi64/gnu
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mipsisa64r6-linux-gnuabi64/sys` ; do \
+ ln -sf ../mipsisa64r6-linux-gnuabi64/sys/$$i debian/libc6-dev-mipsn32/usr/include/sys/$$i ; \
+done
+
+endef
+
+define libc6-dev-mips32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips32/usr/include/mipsisa64r6-linux-gnuabi64/gnu
+cp -a debian/tmp-mips32/usr/include/gnu/stubs-o32_hard_2008.h \
+ debian/libc6-dev-mips32/usr/include/mipsisa64r6-linux-gnuabi64/gnu
+
+endef
+
+# create a symlink for the 32 bit dynamic linker in /lib
+define libc6-mips32_extra_pkg_install
+mkdir -p debian/libc6-mips32/lib
+ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib
+endef
diff -urN glibc-2.22/debian/sysdeps/mips64r6el.mk glibc/debian/sysdeps/mips64r6el.mk
--- glibc-2.22/debian/sysdeps/mips64r6el.mk 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/sysdeps/mips64r6el.mk 2016-05-20 02:35:47.907531465 +0000
@@ -0,0 +1,63 @@
+libc_add-ons = $(add-ons)
+libc_rtlddir = /lib64
+extra_cflags = -mno-plt
+
+# build 32-bit (n32) alternative library
+GLIBC_MULTILIB_PASSES += mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+mipsn32_add-ons = $(add-ons)
+mipsn32_configure_target = mipsisa64r6el-linux-gnuabin32
+mipsn32_extra_cflags = -mno-plt
+mipsn32_CC = $(CC) -mabi=n32
+mipsn32_CXX = $(CXX) -mabi=n32
+libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_rtlddir = /lib32
+mipsn32_slibdir = /lib32
+mipsn32_libdir = /usr/lib32
+mipsn32_extra_config_options := $(extra_config_options)
+
+# build 32-bit (o32) alternative library
+GLIBC_MULTILIB_PASSES += mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
+mips32_add-ons = $(add-ons)
+mips32_configure_target = mipsisa32r6el-linux-gnu
+mips32_extra_cflags = -mno-plt
+mips32_CC = $(CC) -mabi=32
+mips32_CXX = $(CXX) -mabi=32
+libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
+mips32_rtlddir = /lib
+mips32_slibdir = /libo32
+mips32_libdir = /usr/libo32
+mips32_extra_config_options := $(extra_config_options)
+
+define libc6-dev-mipsn32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include
+ln -sf mipsisa64r6el-linux-gnuabi64/bits debian/libc6-dev-mipsn32/usr/include/
+ln -sf mipsisa64r6el-linux-gnuabi64/gnu debian/libc6-dev-mipsn32/usr/include/
+ln -sf mipsisa64r6el-linux-gnuabi64/fpu_control.h debian/libc6-dev-mipsn32/usr/include/
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include/mipsisa64r6el-linux-gnuabi64/gnu
+cp -a debian/tmp-mipsn32/usr/include/gnu/stubs-n32_hard_2008.h \
+ debian/libc6-dev-mipsn32/usr/include/mipsisa64r6el-linux-gnuabi64/gnu
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mipsisa64r6el-linux-gnuabi64/sys` ; do \
+ ln -sf ../mipsisa64r6el-linux-gnuabi64/sys/$$i debian/libc6-dev-mipsn32/usr/include/sys/$$i ; \
+done
+
+endef
+
+define libc6-dev-mips32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips32/usr/include/mipsisa64r6el-linux-gnuabi64/gnu
+cp -a debian/tmp-mips32/usr/include/gnu/stubs-o32_hard_2008.h \
+ debian/libc6-dev-mips32/usr/include/mipsisa64r6el-linux-gnuabi64/gnu
+
+endef
+
+# create a symlink for the 32 bit dynamic linker in /lib
+define libc6-mips32_extra_pkg_install
+mkdir -p debian/libc6-mips32/lib
+ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib
+endef
diff -urN glibc-2.22/debian/sysdeps/mipsn32r6.mk glibc/debian/sysdeps/mipsn32r6.mk
--- glibc-2.22/debian/sysdeps/mipsn32r6.mk 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/sysdeps/mipsn32r6.mk 2016-05-20 14:38:03.219389204 +0000
@@ -0,0 +1,63 @@
+libc_add-ons = $(add-ons)
+libc_rtlddir = /lib32
+extra_cflags = -mno-plt
+
+# build 64-bit alternative library
+GLIBC_MULTILIB_PASSES += mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
+mips64_add-ons = $(add-ons)
+mips64_configure_target = mipsisa64r6-linux-gnuabi64
+mips64_extra_cflags = -mno-plt
+mips64_CC = $(CC) -mabi=64
+mips64_CXX = $(CXX) -mabi=64
+libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
+mips64_rtlddir = /lib64
+mips64_slibdir = /lib64
+mips64_libdir = /usr/lib64
+mips64_extra_config_options := $(extra_config_options)
+
+# build 32-bit (o32) alternative library
+GLIBC_MULTILIB_PASSES += mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
+mips32_add-ons = $(add-ons)
+mips32_configure_target = mipsisa32r6-linux-gnu
+mips32_extra_cflags = -mno-plt
+mips32_CC = $(CC) -mabi=32
+mips32_CXX = $(CXX) -mabi=32
+libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
+mips32_rtlddir = /lib
+mips32_slibdir = /libo32
+mips32_libdir = /usr/libo32
+mips32_extra_config_options := $(extra_config_options)
+
+define libc6-dev-mips64_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips64/usr/include
+ln -sf mipsisa64r6-linux-gnuabin32/bits debian/libc6-dev-mips64/usr/include/
+ln -sf mipsisa64r6-linux-gnuabin32/gnu debian/libc6-dev-mips64/usr/include/
+ln -sf mipsisa64r6-linux-gnuabin32/fpu_control.h debian/libc6-dev-mips64/usr/include/
+
+mkdir -p debian/libc6-dev-mips64/usr/include/mipsisa64r6-linux-gnuabin32/gnu
+cp -a debian/tmp-mips64/usr/include/gnu/stubs-n64_hard_2008.h \
+ debian/libc6-dev-mips64/usr/include/mipsisa64r6-linux-gnuabin32/gnu
+
+mkdir -p debian/libc6-dev-mips64/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mipsisa64r6-linux-gnuabin32/sys` ; do \
+ ln -sf ../mipsisa64r6-linux-gnuabin32/sys/$$i debian/libc6-dev-mips64/usr/include/sys/$$i ; \
+done
+
+endef
+
+define libc6-dev-mips32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips32/usr/include/mipsisa64r6-linux-gnuabin32/gnu
+cp -a debian/tmp-mips32/usr/include/gnu/stubs-o32_hard_2008.h \
+ debian/libc6-dev-mips32/usr/include/mipsisa64r6-linux-gnuabin32/gnu
+
+endef
+
+# create a symlink for the 32 bit dynamic linker in /lib
+define libc6-mips32_extra_pkg_install
+mkdir -p debian/libc6-mips32/lib
+ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib
+endef
diff -urN glibc-2.22/debian/sysdeps/mipsn32r6el.mk glibc/debian/sysdeps/mipsn32r6el.mk
--- glibc-2.22/debian/sysdeps/mipsn32r6el.mk 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/sysdeps/mipsn32r6el.mk 2016-05-20 02:32:42.364478789 +0000
@@ -0,0 +1,63 @@
+libc_add-ons = $(add-ons)
+libc_rtlddir = /lib32
+extra_cflags = -mno-plt
+
+# build 64-bit alternative library
+GLIBC_MULTILIB_PASSES += mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
+mips64_add-ons = $(add-ons)
+mips64_configure_target = mipsisa64r6el-linux-gnuabi64
+mips64_extra_cflags = -mno-plt
+mips64_CC = $(CC) -mabi=64
+mips64_CXX = $(CXX) -mabi=64
+libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
+mips64_rtlddir = /lib64
+mips64_slibdir = /lib64
+mips64_libdir = /usr/lib64
+mips64_extra_config_options := $(extra_config_options)
+
+# build 32-bit (o32) alternative library
+GLIBC_MULTILIB_PASSES += mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
+mips32_add-ons = $(add-ons)
+mips32_configure_target = mipsisa32r6el-linux-gnu
+mips32_extra_cflags = -mno-plt
+mips32_CC = $(CC) -mabi=32
+mips32_CXX = $(CXX) -mabi=32
+libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
+mips32_rtlddir = /lib
+mips32_slibdir = /libo32
+mips32_libdir = /usr/libo32
+mips32_extra_config_options := $(extra_config_options)
+
+define libc6-dev-mips64_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips64/usr/include
+ln -sf mipsisa64r6el-linux-gnuabin32/bits debian/libc6-dev-mips64/usr/include/
+ln -sf mipsisa64r6el-linux-gnuabin32/gnu debian/libc6-dev-mips64/usr/include/
+ln -sf mipsisa64r6el-linux-gnuabin32/fpu_control.h debian/libc6-dev-mips64/usr/include/
+
+mkdir -p debian/libc6-dev-mips64/usr/include/mipsisa64r6el-linux-gnuabin32/gnu
+cp -a debian/tmp-mips64/usr/include/gnu/stubs-n64_hard_2008.h \
+ debian/libc6-dev-mips64/usr/include/mipsisa64r6el-linux-gnuabin32/gnu
+
+mkdir -p debian/libc6-dev-mips64/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mipsisa64r6el-linux-gnuabin32/sys` ; do \
+ ln -sf ../mipsisa64r6el-linux-gnuabin32/sys/$$i debian/libc6-dev-mips64/usr/include/sys/$$i ; \
+done
+
+endef
+
+define libc6-dev-mips32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips32/usr/include/mipsisa64r6el-linux-gnuabin32/gnu
+cp -a debian/tmp-mips32/usr/include/gnu/stubs-o32_hard_2008.h \
+ debian/libc6-dev-mips32/usr/include/mipsisa64r6el-linux-gnuabin32/gnu
+
+endef
+
+# create a symlink for the 32 bit dynamic linker in /lib
+define libc6-mips32_extra_pkg_install
+mkdir -p debian/libc6-mips32/lib
+ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib
+endef
diff -urN glibc-2.22/debian/sysdeps/mipsr6.mk glibc/debian/sysdeps/mipsr6.mk
--- glibc-2.22/debian/sysdeps/mipsr6.mk 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/sysdeps/mipsr6.mk 2016-05-18 03:55:50.311962708 +0000
@@ -0,0 +1,61 @@
+libc_add-ons = $(add-ons)
+extra_cflags = -mno-plt
+
+# build 32-bit (n32) alternative library
+GLIBC_MULTILIB_PASSES += mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+mipsn32_add-ons = $(add-ons)
+mipsn32_configure_target = mipsisa64r6-linux-gnuabin32
+mipsn32_extra_cflags = -mno-plt
+mipsn32_CC = $(CC) -mips64r6 -mabi=n32
+mipsn32_CXX = $(CXX) -mips64r6 -mabi=n32
+libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_rtlddir = /lib32
+mipsn32_slibdir = /lib32
+mipsn32_libdir = /usr/lib32
+mipsn32_extra_config_options := $(extra_config_options)
+
+# build 64-bit alternative library
+GLIBC_MULTILIB_PASSES += mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
+mips64_add-ons = $(add-ons)
+mips64_configure_target = mipsisa64r6-linux-gnuabi64
+mips64_extra_cflags = -mno-plt
+mips64_CC = $(CC) -mips64r6 -mabi=64
+mips64_CXX = $(CXX) -mips64r6 -mabi=64
+libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
+mips64_rtlddir = /lib64
+mips64_slibdir = /lib64
+mips64_libdir = /usr/lib64
+mips64_extra_config_options := $(extra_config_options)
+
+define libc6-dev-mips64_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips64/usr/include
+ln -sf mipsisa32r6-linux-gnu/bits debian/libc6-dev-mips64/usr/include/
+ln -sf mipsisa32r6-linux-gnu/gnu debian/libc6-dev-mips64/usr/include/
+ln -sf mipsisa32r6-linux-gnu/fpu_control.h debian/libc6-dev-mips64/usr/include/
+
+mkdir -p debian/libc6-dev-mips64/usr/include/mipsisa32r6-linux-gnu/gnu
+cp -a debian/tmp-mips64/usr/include/gnu/stubs-n64_hard_2008.h \
+ debian/libc6-dev-mips64/usr/include/mipsisa32r6-linux-gnu/gnu
+
+mkdir -p debian/libc6-dev-mips64/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mipsisa32r6-linux-gnu/sys` ; do \
+ ln -sf ../mipsisa32r6-linux-gnu/sys/$$i debian/libc6-dev-mips64/usr/include/sys/$$i ; \
+done
+
+endef
+
+define libc6-dev-mipsn32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include/mipsisa32r6-linux-gnu/gnu
+cp -a debian/tmp-mipsn32/usr/include/gnu/stubs-n32_hard_2008.h \
+ debian/libc6-dev-mipsn32/usr/include/mipsisa32r6-linux-gnu/gnu
+
+endef
+
+# Need to put a tri-arch aware version of ldd in the base package
+define mipsn32_extra_install
+cp debian/tmp-mipsn32/usr/bin/ldd debian/tmp-libc/usr/bin
+endef
diff -urN glibc-2.22/debian/sysdeps/mipsr6el.mk glibc/debian/sysdeps/mipsr6el.mk
--- glibc-2.22/debian/sysdeps/mipsr6el.mk 1970-01-01 00:00:00.000000000 +0000
+++ glibc/debian/sysdeps/mipsr6el.mk 2016-05-18 03:55:07.904178933 +0000
@@ -0,0 +1,61 @@
+libc_add-ons = $(add-ons)
+extra_cflags = -mno-plt
+
+# build 32-bit (n32) alternative library
+GLIBC_MULTILIB_PASSES += mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+mipsn32_add-ons = $(add-ons)
+mipsn32_configure_target = mipsisa64r6el-linux-gnuabin32
+mipsn32_extra_cflags = -mno-plt
+mipsn32_CC = $(CC) -mips64r6 -mabi=n32
+mipsn32_CXX = $(CXX) -mips64r6 -mabi=n32
+libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_rtlddir = /lib32
+mipsn32_slibdir = /lib32
+mipsn32_libdir = /usr/lib32
+mipsn32_extra_config_options := $(extra_config_options)
+
+# build 64-bit alternative library
+GLIBC_MULTILIB_PASSES += mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
+mips64_add-ons = $(add-ons)
+mips64_configure_target = mipsisa64r6el-linux-gnuabi64
+mips64_extra_cflags = -mno-plt
+mips64_CC = $(CC) -mips64r6 -mabi=64
+mips64_CXX = $(CXX) -mips64r6 -mabi=64
+libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
+mips64_rtlddir = /lib64
+mips64_slibdir = /lib64
+mips64_libdir = /usr/lib64
+mips64_extra_config_options := $(extra_config_options)
+
+define libc6-dev-mips64_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mips64/usr/include
+ln -sf mipsisa32r6el-linux-gnu/bits debian/libc6-dev-mips64/usr/include/
+ln -sf mipsisa32r6el-linux-gnu/gnu debian/libc6-dev-mips64/usr/include/
+ln -sf mipsisa32r6el-linux-gnu/fpu_control.h debian/libc6-dev-mips64/usr/include/
+
+mkdir -p debian/libc6-dev-mips64/usr/include/mipsisa32r6el-linux-gnu/gnu
+cp -a debian/tmp-mips64/usr/include/gnu/stubs-n64_hard_2008.h \
+ debian/libc6-dev-mips64/usr/include/mipsisa32r6el-linux-gnu/gnu
+
+mkdir -p debian/libc6-dev-mips64/usr/include/sys
+for i in `ls debian/tmp-libc/usr/include/mipsisa32r6el-linux-gnu/sys` ; do \
+ ln -sf ../mipsisa32r6el-linux-gnu/sys/$$i debian/libc6-dev-mips64/usr/include/sys/$$i ; \
+done
+
+endef
+
+define libc6-dev-mipsn32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-mipsn32/usr/include/mipsisa32r6el-linux-gnu/gnu
+cp -a debian/tmp-mipsn32/usr/include/gnu/stubs-n32_hard_2008.h \
+ debian/libc6-dev-mipsn32/usr/include/mipsisa32r6el-linux-gnu/gnu
+
+endef
+
+# Need to put a tri-arch aware version of ldd in the base package
+define mipsn32_extra_install
+cp debian/tmp-mipsn32/usr/bin/ldd debian/tmp-libc/usr/bin
+endef
Reply to: