This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch sid in repository glibc.
commit fc9335421a5fb7295c667ee4c029dd29ac745ddb Author: Aurelien Jarno <aurel...@aurel32.net> Date: Mon Nov 20 18:10:03 2017 +0100 Add mipsr6, mipsr6el, mipsn32r6, mipsn32r6el, mips64r6, mips64r6el architectures. Closes: #824985, #881457. --- debian/changelog | 4 ++ debian/control.in/mips32 | 8 ++-- debian/control.in/mips64 | 4 +- debian/control.in/mipsn32 | 6 +-- debian/libc6-mips32.symbols.mips64r6 | 5 +++ debian/libc6-mips32.symbols.mips64r6el | 5 +++ debian/libc6-mips32.symbols.mipsn32el | 5 +++ debian/libc6-mips32.symbols.mipsn32r6 | 5 +++ debian/libc6-mips32.symbols.mipsn32r6el | 5 +++ debian/libc6-mips64.symbols.mipsn32el | 5 +++ debian/libc6-mips64.symbols.mipsn32r6 | 5 +++ debian/libc6-mips64.symbols.mipsn32r6el | 5 +++ debian/libc6-mips64.symbols.mipsr6 | 5 +++ debian/libc6-mips64.symbols.mipsr6el | 5 +++ debian/libc6-mipsn32.symbols.mips64r6 | 5 +++ debian/libc6-mipsn32.symbols.mips64r6el | 5 +++ debian/libc6-mipsn32.symbols.mipsr6 | 5 +++ debian/libc6-mipsn32.symbols.mipsr6el | 5 +++ debian/libc6.symbols.mips64r6 | 5 +++ debian/libc6.symbols.mips64r6el | 5 +++ debian/libc6.symbols.mipsn32el | 5 +++ debian/libc6.symbols.mipsn32r6 | 5 +++ debian/libc6.symbols.mipsn32r6el | 5 +++ debian/libc6.symbols.mipsr6 | 5 +++ debian/libc6.symbols.mipsr6el | 5 +++ debian/rules.d/control.mk | 3 +- debian/sysdeps/mips64r6.mk | 64 ++++++++++++++++++++++++++++++++ debian/sysdeps/mips64r6el.mk | 64 ++++++++++++++++++++++++++++++++ debian/sysdeps/mipsn32r6.mk | 66 +++++++++++++++++++++++++++++++++ debian/sysdeps/mipsn32r6el.mk | 64 ++++++++++++++++++++++++++++++++ debian/sysdeps/mipsr6.mk | 60 ++++++++++++++++++++++++++++++ debian/sysdeps/mipsr6el.mk | 60 ++++++++++++++++++++++++++++++ 32 files changed, 498 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3bdb6e6..11e766a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ glibc (2.25-2) UNRELEASED; urgency=medium [ YunQiang Su ] * Add symbol files for mipsn32 and mips64. + [ YunQiang Su / Aurelien Jarno ] + * Add mipsr6, mipsr6el, mipsn32r6, mipsn32r6el, mips64r6, mips64r6el + architectures. Closes: #824985, #881457. + -- Aurelien Jarno <aure...@debian.org> Sat, 18 Nov 2017 11:58:21 +0100 glibc (2.25-1) unstable; urgency=medium 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.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.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.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.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.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.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..5933230 --- /dev/null +++ b/debian/libc6.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.symbols.mipsr6el b/debian/libc6.symbols.mipsr6el new file mode 100644 index 0000000..5933230 --- /dev/null +++ b/debian/libc6.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/rules.d/control.mk b/debian/rules.d/control.mk index bd5e2af..6b61448 100644 --- a/debian/rules.d/control.mk +++ b/debian/rules.d/control.mk @@ -1,7 +1,8 @@ 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 sh3 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 sh3 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..adffeff --- /dev/null +++ b/debian/sysdeps/mips64r6.mk @@ -0,0 +1,64 @@ +# configuration options for all flavours +extra_cflags = -mno-plt + +# main library +libc_rtlddir = /lib64 + +# multilib flavours +ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES))) + +# build 32-bit (n32) alternative library +GLIBC_PASSES += mipsn32 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32 +libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver)) +mipsn32_configure_target = mipsisa64r6-linux-gnuabin32 +mipsn32_CC = $(CC) -mabi=n32 +mipsn32_CXX = $(CXX) -mabi=n32 +mipsn32_rtlddir = /lib32 +mipsn32_slibdir = /lib32 +mipsn32_libdir = /usr/lib32 + +# build 32-bit (o32) alternative library +GLIBC_PASSES += mips32 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32 +libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver)) +mips32_configure_target = mipsisa32r6-linux-gnu +mips32_CC = $(CC) -mabi=32 +mips32_CXX = $(CXX) -mabi=32 +mips32_rtlddir = /lib +mips32_slibdir = /libo32 +mips32_libdir = /usr/libo32 + +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 + +endif # multilib diff --git a/debian/sysdeps/mips64r6el.mk b/debian/sysdeps/mips64r6el.mk new file mode 100644 index 0000000..b518d25 --- /dev/null +++ b/debian/sysdeps/mips64r6el.mk @@ -0,0 +1,64 @@ +# configuration options for all flavours +extra_cflags = -mno-plt + +# main library +libc_rtlddir = /lib64 + +# multilib flavours +ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES))) + +# build 32-bit (n32) alternative library +GLIBC_PASSES += mipsn32 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32 +libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver)) +mipsn32_configure_target = mipsisa64r6el-linux-gnuabin32 +mipsn32_CC = $(CC) -mabi=n32 +mipsn32_CXX = $(CXX) -mabi=n32 +mipsn32_rtlddir = /lib32 +mipsn32_slibdir = /lib32 +mipsn32_libdir = /usr/lib32 + +# build 32-bit (o32) alternative library +GLIBC_PASSES += mips32 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32 +libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver)) +mips32_configure_target = mipsisa32r6el-linux-gnu +mips32_CC = $(CC) -mabi=32 +mips32_CXX = $(CXX) -mabi=32 +mips32_rtlddir = /lib +mips32_slibdir = /libo32 +mips32_libdir = /usr/libo32 + +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 + +endif # multilib diff --git a/debian/sysdeps/mipsn32r6.mk b/debian/sysdeps/mipsn32r6.mk new file mode 100644 index 0000000..7967578 --- /dev/null +++ b/debian/sysdeps/mipsn32r6.mk @@ -0,0 +1,66 @@ +# configuration options for all flavours +extra_cflags = -mno-plt + +# main library +libc_rtlddir = /lib32 + +# multilib flavours +ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES))) + +# build 64-bit alternative library +GLIBC_PASSES += mips64 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64 +libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver)) +mips64_configure_target = mipsisa64r6-linux-gnuabi64 +mips64_extra_cflags = -mno-plt +mips64_CC = $(CC) -mabi=64 +mips64_CXX = $(CXX) -mabi=64 +mips64_rtlddir = /lib64 +mips64_slibdir = /lib64 +mips64_libdir = /usr/lib64 + +# build 32-bit (o32) alternative library +GLIBC_PASSES += mips32 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32 +libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver)) +mips32_configure_target = mipsisa32r6-linux-gnu +mips32_extra_cflags = -mno-plt +mips32_CC = $(CC) -mabi=32 +mips32_CXX = $(CXX) -mabi=32 +mips32_rtlddir = /lib +mips32_slibdir = /libo32 +mips32_libdir = /usr/libo32 + +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 + +endif # multilib diff --git a/debian/sysdeps/mipsn32r6el.mk b/debian/sysdeps/mipsn32r6el.mk new file mode 100644 index 0000000..9c345cd --- /dev/null +++ b/debian/sysdeps/mipsn32r6el.mk @@ -0,0 +1,64 @@ +# configuration options for all flavours +extra_cflags = -mno-plt + +# main library +libc_rtlddir = /lib32 + +# multilib flavours +ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES))) + +# build 64-bit alternative library +GLIBC_PASSES += mips64 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64 +libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver)) +mips64_configure_target = mipsisa64r6el-linux-gnuabi64 +mips64_CC = $(CC) -mabi=64 +mips64_CXX = $(CXX) -mabi=64 +mips64_rtlddir = /lib64 +mips64_slibdir = /lib64 +mips64_libdir = /usr/lib64 + +# build 32-bit (o32) alternative library +GLIBC_PASSES += mips32 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32 +libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver)) +mips32_configure_target = mipsisa32r6el-linux-gnu +mips32_CC = $(CC) -mabi=32 +mips32_CXX = $(CXX) -mabi=32 +mips32_rtlddir = /lib +mips32_slibdir = /libo32 +mips32_libdir = /usr/libo32 + +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 + +endif # multilib diff --git a/debian/sysdeps/mipsr6.mk b/debian/sysdeps/mipsr6.mk new file mode 100644 index 0000000..6e71b82 --- /dev/null +++ b/debian/sysdeps/mipsr6.mk @@ -0,0 +1,60 @@ +# configuration options for all flavours +extra_cflags = -mno-plt + +# multilib flavours +ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES))) + +# build 32-bit (n32) alternative library +GLIBC_PASSES += mipsn32 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32 +mipsn32_configure_target = mipsisa64r6-linux-gnuabin32 +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 + +# build 64-bit alternative library +GLIBC_PASSES += mips64 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64 +mips64_configure_target = mipsisa64r6-linux-gnuabi64 +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 + +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 + +endif # multilib diff --git a/debian/sysdeps/mipsr6el.mk b/debian/sysdeps/mipsr6el.mk new file mode 100644 index 0000000..d7c6af8 --- /dev/null +++ b/debian/sysdeps/mipsr6el.mk @@ -0,0 +1,60 @@ +# configuration options for all flavours +extra_cflags = -mno-plt + +# multilib flavours +ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES))) + +# build 32-bit (n32) alternative library +GLIBC_PASSES += mipsn32 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32 +libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver)) +mipsn32_configure_target = mipsisa64r6el-linux-gnuabin32 +mipsn32_CC = $(CC) -mabi=n32 +mipsn32_CXX = $(CXX) -mabi=n32 +mipsn32_rtlddir = /lib32 +mipsn32_slibdir = /lib32 +mipsn32_libdir = /usr/lib32 + +# build 64-bit alternative library +GLIBC_PASSES += mips64 +DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64 +libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver)) +mips64_configure_target = mipsisa64r6el-linux-gnuabi64 +mips64_CC = $(CC) -mabi=64 +mips64_CXX = $(CXX) -mabi=64 +mips64_rtlddir = /lib64 +mips64_slibdir = /lib64 +mips64_libdir = /usr/lib64 + +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 + +endif # multilib -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git