r2135 - in glibc-package/trunk/debian: . control.in rules.d sysdeps
Author: aurel32
Date: 2007-04-25 22:03:52 +0000 (Wed, 25 Apr 2007)
New Revision: 2135
Added:
glibc-package/trunk/debian/control.in/mips64
glibc-package/trunk/debian/control.in/mipsn32
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/rules.d/control.mk
glibc-package/trunk/debian/sysdeps/mips.mk
glibc-package/trunk/debian/sysdeps/mipsel.mk
Log:
* Add support for support for n32 and 64 ABIs on mips and mipsel, but
keep it disable for now:
- control.in/main: add libc6-dev-mipsn32, libc6-dev-mips64 to the
build-dependencies.
- control.in/mips64: add libc6-mips64 and libc6-dev-mips64 packages.
- control.in/mipsn32: add libc6-mipsn32 and libc6-dev-mipsn32 packages.
- rules.d/control.mk: use control.in/mips64 and control.in/mipsn32.
- sysdeps/mips.mk: add two new passes for n32 and 64 ABIs.
- sysdeps/mipsel.mk: likewise.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-25 20:29:32 UTC (rev 2134)
+++ glibc-package/trunk/debian/changelog 2007-04-25 22:03:52 UTC (rev 2135)
@@ -11,6 +11,15 @@
#420755.
* script.in/nohwcap.sh: use sed instead of awk. Closes: #420799.
* Update Catalan debconf translation, by Jordà Polo. Closes: #420835.
+ * Add support for support for n32 and 64 ABIs on mips and mipsel, but
+ keep it disable for now:
+ - control.in/main: add libc6-dev-mipsn32, libc6-dev-mips64 to the
+ build-dependencies.
+ - control.in/mips64: add libc6-mips64 and libc6-dev-mips64 packages.
+ - control.in/mipsn32: add libc6-mipsn32 and libc6-dev-mipsn32 packages.
+ - rules.d/control.mk: use control.in/mips64 and control.in/mipsn32.
+ - sysdeps/mips.mk: add two new passes for n32 and 64 ABIs.
+ - sysdeps/mipsel.mk: likewise.
[ Michael Banck ]
* patches/hurd-i386/local-dl-dynamic-weak.diff: new patch (turn
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2007-04-25 20:29:32 UTC (rev 2134)
+++ glibc-package/trunk/debian/control 2007-04-25 22:03:52 UTC (rev 2135)
@@ -7,7 +7,7 @@
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [hurd-i386], gcc-4.1 [!hppa !hurd-i386], gcc-4.2 [hppa],
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
- libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64],
+ libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64], libc6-dev-mipsn32 [mips mipsel], libc6-dev-mips64 [mips mipsel],
lib32ssp0 [amd64 kfreebsd-amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
@@ -483,6 +483,48 @@
which use the standard C library. This is the 64bit version of the
library, meant for PowerPC64 systems.
+Package: libc6-mipsn32
+Architecture: mips mipsel
+Section: base
+Priority: optional
+Depends: libc6 (= ${Source-Version})
+Description: GNU C Library: n32 Shared libraries for MIPS64
+ This package includes shared versions of the standard C library and the
+ standard math library, as well as many others. This is the n32 version
+ of the library, meant for MIPS64 systems.
+
+Package: libc6-dev-mipsn32
+Architecture: mips mipsel
+Section: libdevel
+Priority: optional
+Provides: libn32c-dev
+Depends: libc6-mipsn32 (= ${Source-Version}), libc6-dev (= ${Source-Version}), libn32gcc1
+Description: GNU C Library: n32 Development Libraries for MIPS64
+ Contains the symlinks and object files needed to compile and link programs
+ which use the standard C library. This is the n32 version of the
+ library, meant for MIPS64 systems.
+
+Package: libc6-mips64
+Architecture: mips mipsel
+Section: base
+Priority: optional
+Depends: libc6 (= ${Source-Version})
+Description: GNU C Library: 64bit Shared libraries for MIPS64
+ This package includes shared versions of the standard C library and the
+ standard math library, as well as many others. This is the 64bit version
+ of the library, meant for MIPS64 systems.
+
+Package: libc6-dev-mips64
+Architecture: mips mipsel
+Section: libdevel
+Priority: optional
+Provides: lib64c-dev
+Depends: libc6-mips64 (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib64gcc1
+Description: GNU C Library: 64bit Development Libraries for MIPS64
+ Contains the symlinks and object files needed to compile and link programs
+ which use the standard C library. This is the 64bit version of the
+ library, meant for MIPS64 systems.
+
Package: libc0.1-i386
Architecture: kfreebsd-amd64
Section: libs
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2007-04-25 20:29:32 UTC (rev 2134)
+++ glibc-package/trunk/debian/control.in/main 2007-04-25 22:03:52 UTC (rev 2135)
@@ -7,7 +7,7 @@
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [hurd-i386], gcc-4.1 [!hppa !hurd-i386], gcc-4.2 [hppa],
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
- libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64],
+ libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], libc0.1-dev-i386 [kfreebsd-amd64], libc6-dev-mipsn32 [mips mipsel], libc6-dev-mips64 [mips mipsel],
lib32ssp0 [amd64 kfreebsd-amd64 ppc64], lib64ssp0 [i386 powerpc sparc s390],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Added: glibc-package/trunk/debian/control.in/mips64
===================================================================
--- glibc-package/trunk/debian/control.in/mips64 2007-04-25 20:29:32 UTC (rev 2134)
+++ glibc-package/trunk/debian/control.in/mips64 2007-04-25 22:03:52 UTC (rev 2135)
@@ -0,0 +1,21 @@
+Package: libc6-mips64
+Architecture: mips mipsel
+Section: base
+Priority: optional
+Depends: libc6 (= ${Source-Version})
+Description: GNU C Library: 64bit Shared libraries for MIPS64
+ This package includes shared versions of the standard C library and the
+ standard math library, as well as many others. This is the 64bit version
+ of the library, meant for MIPS64 systems.
+
+Package: libc6-dev-mips64
+Architecture: mips mipsel
+Section: libdevel
+Priority: optional
+Provides: lib64c-dev
+Depends: libc6-mips64 (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib64gcc1
+Description: GNU C Library: 64bit Development Libraries for MIPS64
+ Contains the symlinks and object files needed to compile and link programs
+ which use the standard C library. This is the 64bit version of the
+ library, meant for MIPS64 systems.
+
Added: glibc-package/trunk/debian/control.in/mipsn32
===================================================================
--- glibc-package/trunk/debian/control.in/mipsn32 2007-04-25 20:29:32 UTC (rev 2134)
+++ glibc-package/trunk/debian/control.in/mipsn32 2007-04-25 22:03:52 UTC (rev 2135)
@@ -0,0 +1,21 @@
+Package: libc6-mipsn32
+Architecture: mips mipsel
+Section: base
+Priority: optional
+Depends: libc6 (= ${Source-Version})
+Description: GNU C Library: n32 Shared libraries for MIPS64
+ This package includes shared versions of the standard C library and the
+ standard math library, as well as many others. This is the n32 version
+ of the library, meant for MIPS64 systems.
+
+Package: libc6-dev-mipsn32
+Architecture: mips mipsel
+Section: libdevel
+Priority: optional
+Provides: libn32c-dev
+Depends: libc6-mipsn32 (= ${Source-Version}), libc6-dev (= ${Source-Version}), libn32gcc1
+Description: GNU C Library: n32 Development Libraries for MIPS64
+ Contains the symlinks and object files needed to compile and link programs
+ which use the standard C library. This is the n32 version of the
+ library, meant for MIPS64 systems.
+
Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk 2007-04-25 20:29:32 UTC (rev 2134)
+++ glibc-package/trunk/debian/rules.d/control.mk 2007-04-25 22:03:52 UTC (rev 2135)
@@ -1,4 +1,4 @@
-control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.1 libc0.3 sparc64 s390x powerpc ppc64 opt amd64)
+control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.1 libc0.3 sparc64 s390x powerpc ppc64 opt amd64 mipsn32 mips64)
threads_archs := alpha amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
@@ -35,6 +35,8 @@
cat debian/control.in/amd64 >> $@T
cat debian/control.in/powerpc >> $@T
cat debian/control.in/ppc64 >> $@T
+ cat debian/control.in/mipsn32 >> $@T
+ cat debian/control.in/mips64 >> $@T
cat debian/control.in/kfreebsd-i386 >> $@T
cat debian/control.in/opt >> $@T
cat debian/control.in/libnss-dns-udeb >> $@T
Modified: glibc-package/trunk/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips.mk 2007-04-25 20:29:32 UTC (rev 2134)
+++ glibc-package/trunk/debian/sysdeps/mips.mk 2007-04-25 22:03:52 UTC (rev 2135)
@@ -1 +1,34 @@
libc_add-ons = ports nptl $(add-ons)
+
+# build 32-bit (n32) alternative library
+# GLIBC_PASSES += mipsn32
+# DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+mipsn32_add-ons = ports nptl $(add-ons)
+mipsn32_configure_target = mips32-linux
+mipsn32_CC = $(CC) -mabi=n32
+libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_extra_cflags = -O3 -g
+mipsn32_slibdir = /lib32
+mipsn32_libdir = /usr/lib32
+mipsn32_extra_config_options := $(extra_config_options) --disable-profile
+
+# build 64-bit (64) alternative library
+# GLIBC_PASSES += mips64
+# DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+mips64_add-ons = ports nptl $(add-ons)
+mips64_configure_target = mips64-linux
+mips64_CC = $(CC) -mabi=64
+libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
+mips64_extra_cflags = -O3 -g
+mips64_slibdir = /lib64
+mips64_libdir = /usr/lib64
+mips64_extra_config_options := $(extra_config_options) --disable-profile
+
+# 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
+
+# This is needed to keep binutils (ar & ranlib) from getting confused about
+# the file format being used.
+#export GNUTARGET=elf64-tradbigmips
Modified: glibc-package/trunk/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsel.mk 2007-04-25 20:29:32 UTC (rev 2134)
+++ glibc-package/trunk/debian/sysdeps/mipsel.mk 2007-04-25 22:03:52 UTC (rev 2135)
@@ -1 +1,34 @@
libc_add-ons = ports nptl $(add-ons)
+
+# build 32-bit (n32) alternative library
+# GLIBC_PASSES += mipsn32
+# DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+mipsn32_add-ons = ports nptl $(add-ons)
+mipsn32_configure_target = mips32-linux
+mipsn32_CC = $(CC) -mabi=n32
+libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
+mipsn32_extra_cflags = -O3 -g
+mipsn32_slibdir = /lib32
+mipsn32_libdir = /usr/lib32
+mipsn32_extra_config_options := $(extra_config_options) --disable-profile
+
+# build 64-bit alternative library
+# GLIBC_PASSES += mips64
+# DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+mips64_add-ons = ports nptl $(add-ons)
+mips64_configure_target = mips64-linux
+mips64_CC = $(CC) -mabi=64
+libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
+mips64_extra_cflags = -O3 -g
+mips64_slibdir = /lib64
+mips64_libdir = /usr/lib64
+mips64_extra_config_options := $(extra_config_options) --disable-profile
+
+# 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
+
+# This is needed to keep binutils (ar & ranlib) from getting confused about
+# the file format being used.
+#export GNUTARGET=elf64-tradlittlemips
Reply to: