r4645 - in glibc-package/trunk/debian: . patches patches/any patches/arm
Author: aurel32
Date: 2011-05-08 20:19:29 +0000 (Sun, 08 May 2011)
New Revision: 4645
Added:
glibc-package/trunk/debian/patches/arm/submitted-armhf-triplet.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/submitted-autotools.diff
glibc-package/trunk/debian/patches/series
Log:
* Add support for the new armhf triplet (Closes: #625846):
- Update patches/any/submitted-autotools.diff to detect the new triplet.
- Add patches/arm/submitted-armhf-triplet.diff to support the
new triplet.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-05-08 19:20:31 UTC (rev 4644)
+++ glibc-package/trunk/debian/changelog 2011-05-08 20:19:29 UTC (rev 4645)
@@ -8,6 +8,10 @@
bassackwards tests for ARG_MAX in sys/param.h. Closes: #583433.
* Add patches/any/cvs-nss-initgroups.diff from upstream to correctly
return NSS_STATUS_NOTFOUND if no record was found.
+ * Add support for the new armhf triplet (Closes: #625846):
+ - Update patches/any/submitted-autotools.diff to detect the new triplet.
+ - Add patches/arm/submitted-armhf-triplet.diff to support the
+ new triplet.
-- Aurelien Jarno <aurel32@debian.org> Wed, 04 May 2011 19:53:33 +0200
Modified: glibc-package/trunk/debian/patches/any/submitted-autotools.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-autotools.diff 2011-05-08 19:20:31 UTC (rev 4644)
+++ glibc-package/trunk/debian/patches/any/submitted-autotools.diff 2011-05-08 20:19:29 UTC (rev 4645)
@@ -140,7 +140,7 @@
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
-@@ -830,6 +852,16 @@
+@@ -830,6 +852,21 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
@@ -150,7 +150,12 @@
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ if echo __ARM_PCS_VFP__ | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_PCS_VFP__
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++ endif
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
Added: glibc-package/trunk/debian/patches/arm/submitted-armhf-triplet.diff
===================================================================
--- glibc-package/trunk/debian/patches/arm/submitted-armhf-triplet.diff (rev 0)
+++ glibc-package/trunk/debian/patches/arm/submitted-armhf-triplet.diff 2011-05-08 20:19:29 UTC (rev 4645)
@@ -0,0 +1,20 @@
+--- a/ports/sysdeps/arm/preconfigure
++++ b/ports/sysdeps/arm/preconfigure
+@@ -2,7 +2,7 @@
+ arm*)
+ base_machine=arm
+ case $config_os in
+- linux-gnueabi)
++ linux-gnueabi*)
+ machine=arm/eabi/$machine
+ if [ "${CFLAGS+set}" != "set" ]; then
+ CFLAGS="-g -O2"
+--- a/ports/sysdeps/arm/shlib-versions
++++ b/ports/sysdeps/arm/shlib-versions
+@@ -1,4 +1,4 @@
+-arm.*-.*-linux-gnueabi DEFAULT GLIBC_2.4
++arm.*-.*-linux-gnueabi* DEFAULT GLIBC_2.4
+
+-arm.*-.*-linux-gnueabi ld=ld-linux.so.3
++arm.*-.*-linux-gnueabi* ld=ld-linux.so.3
+ arm.*-.*-linux.* ld=ld-linux.so.2
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-05-08 19:20:31 UTC (rev 4644)
+++ glibc-package/trunk/debian/patches/series 2011-05-08 20:19:29 UTC (rev 4645)
@@ -70,6 +70,7 @@
arm/local-ioperm.diff
arm/local-lowlevellock.diff
arm/local-sigaction.diff
+arm/submitted-armhf-triplet.diff
hppa/local-inlining.diff
hppa/local-linuxthreads.diff
Reply to: