[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#824996: glibc 2.23: add MIPS r6 support



Sorry, the above patch has some tiny problem about spaces mistake.
I updated it.

On Sun, May 22, 2016 at 5:14 PM, YunQiang Su <wzssyqa@gmail.com> wrote:
> 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
>>
>>



-- 
YunQiang Su
diff --git a/debian/control b/debian/control
index 6f3c9c2..de133cf 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: gettext, dpkg-dev (>= 1.17.14), xz-utils, file, quilt,
  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 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32],
  libc-bin (>= 2.23) <cross>
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
@@ -156,7 +156,7 @@ Description: Transitional package to ensure multiarch compatibility
  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
@@ -174,9 +174,9 @@ Replaces: libc6-amd64 [amd64],
           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
@@ -185,7 +185,7 @@ Description: GNU C Library: Shared libraries
  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
@@ -200,7 +200,7 @@ Description: GNU C Library: Development Libraries and Header Files
  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
@@ -212,7 +212,7 @@ Description: GNU C Library: detached debugging symbols
  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
@@ -228,7 +228,7 @@ Description: GNU C Library: PIC archive library
 
 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}
@@ -260,9 +260,9 @@ Replaces: libc6-amd64 [amd64],
           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
@@ -346,9 +346,9 @@ Replaces: libc6-amd64 [amd64],
           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
@@ -432,9 +432,9 @@ Replaces: libc6-amd64 [amd64],
           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
@@ -669,7 +669,7 @@ Description: GNU C Library: 64bit Development Libraries for PowerPC64
  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}
@@ -680,13 +680,13 @@ Description: GNU C Library: o32 Shared libraries for MIPS
  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
 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>
@@ -696,7 +696,7 @@ Description: GNU C Library: o32 Development Libraries for MIPS
  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}
@@ -707,11 +707,11 @@ Description: GNU C Library: n32 Shared libraries for MIPS64
  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
-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
@@ -720,7 +720,7 @@ Description: GNU C Library: n32 Development Libraries for MIPS64
  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}
@@ -731,7 +731,7 @@ Description: GNU C Library: 64bit Shared libraries for MIPS64
  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 --git a/debian/control.in/libc b/debian/control.in/libc
index 59714c5..7e6ade2 100644
--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@ -17,9 +17,9 @@ Replaces: libc6-amd64 [amd64],
           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 --git a/debian/control.in/libc0.1 b/debian/control.in/libc0.1
new file mode 100644
index 0000000..875320e
--- /dev/null
+++ b/debian/control.in/libc0.1
@@ -0,0 +1,86 @@
+Package: libc0.1
+Architecture: kfreebsd-amd64 kfreebsd-i386
+Section: libs
+Priority: required
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${libgcc:Depends}
+Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] 
+Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
+Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
+Conflicts: libc6-loongson2f [mipsel]
+Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Replaces: libc6-amd64 [amd64],
+          libc6-i386 [i386],
+          libc6-x32 [x32],
+          libc0.1-i386 [kfreebsd-i386],
+          libc6-powerpc [powerpc],
+          libc6-ppc64 [ppc64],
+          libc6-s390x [s390x],
+          libc6-sparc64 [sparc64],
+          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
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+
+Package: libc0.1-dev
+Architecture: kfreebsd-amd64 kfreebsd-i386
+Section: libdevel
+Priority: optional
+Multi-Arch: same
+Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
+Conflicts: libc6-dev, libc6.1-dev, libc0.3-dev,
+Description: GNU C Library: Development Libraries and Header Files
+ Contains the symlinks, headers, and object files needed to compile
+ and link programs which use the standard C library.
+
+Package: libc0.1-dbg
+Architecture: kfreebsd-amd64 kfreebsd-i386
+Section: debug
+Priority: extra
+Multi-Arch: same
+Provides: libc-dbg
+Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: detached debugging symbols
+ This package contains the detached debugging symbols for the GNU C
+ library.
+
+Package: libc0.1-pic
+Architecture: kfreebsd-amd64 kfreebsd-i386
+Section: libdevel
+Priority: optional
+Multi-Arch: same
+Conflicts: libc-pic
+Provides: libc-pic, glibc-pic
+Depends: libc0.1 (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: PIC archive library
+ Contains an archive library (ar file) composed of individual shared objects.
+ This is used for creating a library which is a smaller subset of the
+ standard libc shared library. The reduced library is used by debian-installer
+ and may be useful for custom installation media and in embedded systems.
+
+Package: libc0.1-udeb
+Package-Type: udeb
+Architecture: kfreebsd-amd64 kfreebsd-i386
+Section: debian-installer
+Priority: extra
+Provides: libc0.1, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: Shared libraries - udeb
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains a minimal set of libraries needed for the Debian
+ installer.  Do not install it on a normal system.
+
diff --git a/debian/control.in/libc0.3 b/debian/control.in/libc0.3
new file mode 100644
index 0000000..f490fc3
--- /dev/null
+++ b/debian/control.in/libc0.3
@@ -0,0 +1,86 @@
+Package: libc0.3
+Architecture: hurd-i386
+Section: libs
+Priority: required
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${libgcc:Depends}
+Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] 
+Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
+Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
+Conflicts: libc6-loongson2f [mipsel]
+Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Replaces: libc6-amd64 [amd64],
+          libc6-i386 [i386],
+          libc6-x32 [x32],
+          libc0.1-i386 [kfreebsd-i386],
+          libc6-powerpc [powerpc],
+          libc6-ppc64 [ppc64],
+          libc6-s390x [s390x],
+          libc6-sparc64 [sparc64],
+          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
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+
+Package: libc0.3-dev
+Architecture: hurd-i386
+Section: libdevel
+Priority: optional
+Multi-Arch: same
+Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
+Conflicts: libc6-dev, libc6.1-dev, libc0.1-dev,
+Description: GNU C Library: Development Libraries and Header Files
+ Contains the symlinks, headers, and object files needed to compile
+ and link programs which use the standard C library.
+
+Package: libc0.3-dbg
+Architecture: hurd-i386
+Section: debug
+Priority: extra
+Multi-Arch: same
+Provides: libc-dbg
+Depends: libc0.3 (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: detached debugging symbols
+ This package contains the detached debugging symbols for the GNU C
+ library.
+
+Package: libc0.3-pic
+Architecture: hurd-i386
+Section: libdevel
+Priority: optional
+Multi-Arch: same
+Conflicts: libc-pic
+Provides: libc-pic, glibc-pic
+Depends: libc0.3 (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: PIC archive library
+ Contains an archive library (ar file) composed of individual shared objects.
+ This is used for creating a library which is a smaller subset of the
+ standard libc shared library. The reduced library is used by debian-installer
+ and may be useful for custom installation media and in embedded systems.
+
+Package: libc0.3-udeb
+Package-Type: udeb
+Architecture: hurd-i386
+Section: debian-installer
+Priority: extra
+Provides: libc0.3, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: Shared libraries - udeb
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains a minimal set of libraries needed for the Debian
+ installer.  Do not install it on a normal system.
+
diff --git a/debian/control.in/libc6 b/debian/control.in/libc6
new file mode 100644
index 0000000..3a9dea3
--- /dev/null
+++ b/debian/control.in/libc6
@@ -0,0 +1,86 @@
+Package: libc6
+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
+Depends: ${shlibs:Depends}, ${libgcc:Depends}
+Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] 
+Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
+Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
+Conflicts: libc6-loongson2f [mipsel]
+Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Replaces: libc6-amd64 [amd64],
+          libc6-i386 [i386],
+          libc6-x32 [x32],
+          libc0.1-i386 [kfreebsd-i386],
+          libc6-powerpc [powerpc],
+          libc6-ppc64 [ppc64],
+          libc6-s390x [s390x],
+          libc6-sparc64 [sparc64],
+          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
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ 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 mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
+Section: libdevel
+Priority: optional
+Multi-Arch: same
+Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
+Conflicts: libc6.1-dev, libc0.1-dev, libc0.3-dev,
+Description: GNU C Library: Development Libraries and Header Files
+ Contains the symlinks, headers, and object files needed to compile
+ 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 mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
+Section: debug
+Priority: extra
+Multi-Arch: same
+Provides: libc-dbg
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: detached debugging symbols
+ This package contains the detached debugging symbols for the GNU C
+ library.
+
+Package: libc6-pic
+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
+Conflicts: libc-pic
+Provides: libc-pic, glibc-pic
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: PIC archive library
+ Contains an archive library (ar file) composed of individual shared objects.
+ This is used for creating a library which is a smaller subset of the
+ standard libc shared library. The reduced library is used by debian-installer
+ and may be useful for custom installation media and in embedded systems.
+
+Package: libc6-udeb
+Package-Type: udeb
+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}
+Build-Profiles: <!stage1>
+Description: GNU C Library: Shared libraries - udeb
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains a minimal set of libraries needed for the Debian
+ installer.  Do not install it on a normal system.
+
diff --git a/debian/control.in/libc6.1 b/debian/control.in/libc6.1
new file mode 100644
index 0000000..6ed61d4
--- /dev/null
+++ b/debian/control.in/libc6.1
@@ -0,0 +1,86 @@
+Package: libc6.1
+Architecture: alpha
+Section: libs
+Priority: required
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${libgcc:Depends}
+Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] 
+Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
+Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
+Conflicts: libc6-loongson2f [mipsel]
+Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
+Replaces: libc6-amd64 [amd64],
+          libc6-i386 [i386],
+          libc6-x32 [x32],
+          libc0.1-i386 [kfreebsd-i386],
+          libc6-powerpc [powerpc],
+          libc6-ppc64 [ppc64],
+          libc6-s390x [s390x],
+          libc6-sparc64 [sparc64],
+          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
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+
+Package: libc6.1-dev
+Architecture: alpha
+Section: libdevel
+Priority: optional
+Multi-Arch: same
+Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
+Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x]
+Conflicts: libc6-dev, libc0.1-dev, libc0.3-dev,
+Description: GNU C Library: Development Libraries and Header Files
+ Contains the symlinks, headers, and object files needed to compile
+ and link programs which use the standard C library.
+
+Package: libc6.1-dbg
+Architecture: alpha
+Section: debug
+Priority: extra
+Multi-Arch: same
+Provides: libc-dbg
+Depends: libc6.1 (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: detached debugging symbols
+ This package contains the detached debugging symbols for the GNU C
+ library.
+
+Package: libc6.1-pic
+Architecture: alpha
+Section: libdevel
+Priority: optional
+Multi-Arch: same
+Conflicts: libc-pic
+Provides: libc-pic, glibc-pic
+Depends: libc6.1 (= ${binary:Version}), ${misc:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: PIC archive library
+ Contains an archive library (ar file) composed of individual shared objects.
+ This is used for creating a library which is a smaller subset of the
+ standard libc shared library. The reduced library is used by debian-installer
+ and may be useful for custom installation media and in embedded systems.
+
+Package: libc6.1-udeb
+Package-Type: udeb
+Architecture: alpha
+Section: debian-installer
+Priority: extra
+Provides: libc6.1, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
+Build-Profiles: <!stage1>
+Description: GNU C Library: Shared libraries - udeb
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains a minimal set of libraries needed for the Debian
+ installer.  Do not install it on a normal system.
+
diff --git a/debian/control.in/main b/debian/control.in/main
index 0dca4b4..387ef3f 100644
--- a/debian/control.in/main
+++ b/debian/control.in/main
@@ -10,7 +10,7 @@ Build-Depends: gettext, dpkg-dev (>= 1.17.14), xz-utils, file, quilt,
  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 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32],
  libc-bin (>= @GLIBC_VERSION@) <cross>
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
diff --git a/debian/control.in/mips32 b/debian/control.in/mips32
index 1d5008a..7831000 100644
--- a/debian/control.in/mips32
+++ b/debian/control.in/mips32
@@ -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,13 +10,13 @@ Description: GNU C Library: o32 Shared libraries for MIPS
  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
 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 --git a/debian/control.in/mips64 b/debian/control.in/mips64
index ec7b70c..32aa1f3 100644
--- a/debian/control.in/mips64
+++ b/debian/control.in/mips64
@@ -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 @@ Description: GNU C Library: 64bit Shared libraries for MIPS64
  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 --git a/debian/control.in/mipsn32 b/debian/control.in/mipsn32
index 019fce2..9ad5c0a 100644
--- a/debian/control.in/mipsn32
+++ b/debian/control.in/mipsn32
@@ -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,11 +10,11 @@ Description: GNU C Library: n32 Shared libraries for MIPS64
  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
-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 --git a/debian/libc6-mips32.symbols.mips64 b/debian/libc6-mips32.symbols.mips64
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips32.symbols.mips64
@@ -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 --git a/debian/libc6-mips32.symbols.mips64r6 b/debian/libc6-mips32.symbols.mips64r6
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips32.symbols.mips64r6
@@ -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 --git a/debian/libc6-mips32.symbols.mips64r6el b/debian/libc6-mips32.symbols.mips64r6el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips32.symbols.mips64r6el
@@ -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 --git a/debian/libc6-mips32.symbols.mipsn32 b/debian/libc6-mips32.symbols.mipsn32
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips32.symbols.mipsn32
@@ -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 --git a/debian/libc6-mips32.symbols.mipsn32el b/debian/libc6-mips32.symbols.mipsn32el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips32.symbols.mipsn32el
@@ -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 --git a/debian/libc6-mips32.symbols.mipsn32r6 b/debian/libc6-mips32.symbols.mipsn32r6
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips32.symbols.mipsn32r6
@@ -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 --git a/debian/libc6-mips32.symbols.mipsn32r6el b/debian/libc6-mips32.symbols.mipsn32r6el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips32.symbols.mipsn32r6el
@@ -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 --git a/debian/libc6-mips64.symbols.mipsn32 b/debian/libc6-mips64.symbols.mipsn32
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips64.symbols.mipsn32
@@ -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 --git a/debian/libc6-mips64.symbols.mipsn32el b/debian/libc6-mips64.symbols.mipsn32el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips64.symbols.mipsn32el
@@ -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 --git a/debian/libc6-mips64.symbols.mipsn32r6 b/debian/libc6-mips64.symbols.mipsn32r6
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips64.symbols.mipsn32r6
@@ -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 --git a/debian/libc6-mips64.symbols.mipsn32r6el b/debian/libc6-mips64.symbols.mipsn32r6el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips64.symbols.mipsn32r6el
@@ -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 --git a/debian/libc6-mips64.symbols.mipsr6 b/debian/libc6-mips64.symbols.mipsr6
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips64.symbols.mipsr6
@@ -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 --git a/debian/libc6-mips64.symbols.mipsr6el b/debian/libc6-mips64.symbols.mipsr6el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mips64.symbols.mipsr6el
@@ -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 --git a/debian/libc6-mipsn32.symbols.mips64 b/debian/libc6-mipsn32.symbols.mips64
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mipsn32.symbols.mips64
@@ -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 --git a/debian/libc6-mipsn32.symbols.mips64r6 b/debian/libc6-mipsn32.symbols.mips64r6
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mipsn32.symbols.mips64r6
@@ -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 --git a/debian/libc6-mipsn32.symbols.mips64r6el b/debian/libc6-mipsn32.symbols.mips64r6el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mipsn32.symbols.mips64r6el
@@ -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 --git a/debian/libc6-mipsn32.symbols.mipsr6 b/debian/libc6-mipsn32.symbols.mipsr6
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mipsn32.symbols.mipsr6
@@ -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 --git a/debian/libc6-mipsn32.symbols.mipsr6el b/debian/libc6-mipsn32.symbols.mipsr6el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6-mipsn32.symbols.mipsr6el
@@ -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 --git a/debian/libc6.symbols.mips64 b/debian/libc6.symbols.mips64
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6.symbols.mips64
@@ -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 --git a/debian/libc6.symbols.mips64r6 b/debian/libc6.symbols.mips64r6
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6.symbols.mips64r6
@@ -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 --git a/debian/libc6.symbols.mips64r6el b/debian/libc6.symbols.mips64r6el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6.symbols.mips64r6el
@@ -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 --git a/debian/libc6.symbols.mipsn32 b/debian/libc6.symbols.mipsn32
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6.symbols.mipsn32
@@ -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 --git a/debian/libc6.symbols.mipsn32el b/debian/libc6.symbols.mipsn32el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6.symbols.mipsn32el
@@ -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 --git a/debian/libc6.symbols.mipsn32r6 b/debian/libc6.symbols.mipsn32r6
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6.symbols.mipsn32r6
@@ -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 --git a/debian/libc6.symbols.mipsn32r6el b/debian/libc6.symbols.mipsn32r6el
new file mode 100644
index 0000000..5933230
--- /dev/null
+++ b/debian/libc6.symbols.mipsn32r6el
@@ -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 --git a/debian/libc6.symbols.mipsr6 b/debian/libc6.symbols.mipsr6
new file mode 100644
index 0000000..bfe690b
--- /dev/null
+++ b/debian/libc6.symbols.mipsr6
@@ -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 --git a/debian/libc6.symbols.mipsr6el b/debian/libc6.symbols.mipsr6el
new file mode 100644
index 0000000..bfe690b
--- /dev/null
+++ b/debian/libc6.symbols.mipsr6el
@@ -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 --git a/debian/rules.d/control.mk b/debian/rules.d/control.mk
index 412192f..387430d 100644
--- a/debian/rules.d/control.mk
+++ b/debian/rules.d/control.mk
@@ -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 --git a/debian/sysdeps/mips64r6.mk b/debian/sysdeps/mips64r6.mk
new file mode 100644
index 0000000..19a3a0b
--- /dev/null
+++ b/debian/sysdeps/mips64r6.mk
@@ -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 --git a/debian/sysdeps/mips64r6el.mk b/debian/sysdeps/mips64r6el.mk
new file mode 100644
index 0000000..63c6e8d
--- /dev/null
+++ b/debian/sysdeps/mips64r6el.mk
@@ -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 --git a/debian/sysdeps/mipsn32r6.mk b/debian/sysdeps/mipsn32r6.mk
new file mode 100644
index 0000000..326d863
--- /dev/null
+++ b/debian/sysdeps/mipsn32r6.mk
@@ -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 --git a/debian/sysdeps/mipsn32r6el.mk b/debian/sysdeps/mipsn32r6el.mk
new file mode 100644
index 0000000..5e8d88e
--- /dev/null
+++ b/debian/sysdeps/mipsn32r6el.mk
@@ -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 --git a/debian/sysdeps/mipsr6.mk b/debian/sysdeps/mipsr6.mk
new file mode 100644
index 0000000..faad5d1
--- /dev/null
+++ b/debian/sysdeps/mipsr6.mk
@@ -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 --git a/debian/sysdeps/mipsr6el.mk b/debian/sysdeps/mipsr6el.mk
new file mode 100644
index 0000000..2cc706f
--- /dev/null
+++ b/debian/sysdeps/mipsr6el.mk
@@ -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: