r5391 - in glibc-package/branches/eglibc-2.16/debian: . debhelper.in patches patches/arm patches/arm64
Author: adconrad
Date: 2012-11-20 02:11:12 +0000 (Tue, 20 Nov 2012)
New Revision: 5391
Added:
glibc-package/branches/eglibc-2.16/debian/patches/arm/cvs-ldconfig-cache-abi.diff
glibc-package/branches/eglibc-2.16/debian/patches/arm64/cvs-ldconfig-cache-abi.diff
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc.preinst
glibc-package/branches/eglibc-2.16/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff
glibc-package/branches/eglibc-2.16/debian/patches/series
Log:
* debian/patches/arm/cvs-ldconfig-cache-abi.diff: Backport upstream
patch to re-enable ldconfig cache tagging for armhf binaries again.
* debian/patches/arm64/cvs-ldconfig-cache-abi.diff: Same for aarch64.
* debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff: Re-enable
and adjust to account for changes in cvs-ldconfig-cache-abi.diff.
* debian/debhelper.in/libc.preinst: Remove old ld.so.cache on upgrade.
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-19 22:00:23 UTC (rev 5390)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-20 02:11:12 UTC (rev 5391)
@@ -367,6 +367,12 @@
* patches/arm/local-vfp-sysdeps.diff: Force the Tag_ABI_HardFP_use
and Tag_ABI_VFP_args EABI tags when building for armhf, so compilers
only linking crti.o will generate what appear to be armhf binaries.
+ * debian/patches/arm/cvs-ldconfig-cache-abi.diff: Backport upstream
+ patch to re-enable ldconfig cache tagging for armhf binaries again.
+ * debian/patches/arm64/cvs-ldconfig-cache-abi.diff: Same for aarch64.
+ * debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff: Re-enable
+ and adjust to account for changes in cvs-ldconfig-cache-abi.diff.
+ * debian/debhelper.in/libc.preinst: Remove old ld.so.cache on upgrade.
[ Matthias Klose ]
* Add patches/any/local-revert-bz13979.diff: revert a commit that made
Modified: glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc.preinst 2012-11-19 22:00:23 UTC (rev 5390)
+++ glibc-package/branches/eglibc-2.16/debian/debhelper.in/libc.preinst 2012-11-20 02:11:12 UTC (rev 5391)
@@ -438,12 +438,13 @@
esac
if [ -n "$preversion" ]; then
- if dpkg --compare-versions "$preversion" lt 2.13-5; then
+ if dpkg --compare-versions "$preversion" lt 2.13-38; then
# upgrading from a pre-multiarch libc to a multiarch libc; we have
# to blow away /etc/ld.so.cache, otherwise the old unpacked libc
# is still first in the cache and segfaults when combined with
# our newly-unpacked ld.so. Do this last to avoid slowing down the
- # rest of the upgrade.
+ # rest of the upgrade. Version number bumped to 2.13-38 to also
+ # cover cache format upgrades for ARM.
rm -f /etc/ld.so.cache
fi
fi
Added: glibc-package/branches/eglibc-2.16/debian/patches/arm/cvs-ldconfig-cache-abi.diff
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/arm/cvs-ldconfig-cache-abi.diff (rev 0)
+++ glibc-package/branches/eglibc-2.16/debian/patches/arm/cvs-ldconfig-cache-abi.diff 2012-11-20 02:11:12 UTC (rev 5391)
@@ -0,0 +1,51 @@
+commit 6665d4a25da6dc1788010466f6f52e1df94a048b
+Author: Steve McIntyre <steve.mcintyre@linaro.org>
+Date: Mon Nov 19 01:12:53 2012 -0500
+
+ Add ldconfig cache tag handling for ARM hard-float ABI
+
+ * sysdeps/generic/ldconfig.h (FLAG_ARM_LIBHF): New macro.
+ * elf/cache.c (print_entry): Print ",hard-float" for
+ FLAG_ARM_LIBHF.
+
+ Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
+ Reviewed-by: Carlos O'Donell <carlos@systemhalted.org>
+
+diff --git a/elf/cache.c b/elf/cache.c
+index db8b9fa..3336bab 100644
+--- a/elf/cache.c
++++ b/elf/cache.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1999-2003,2005,2006,2007,2011 Free Software Foundation, Inc.
++/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Andreas Jaeger <aj@suse.de>, 1999.
+
+@@ -94,6 +94,9 @@ print_entry (const char *lib, int flag, unsigned int osversion,
+ case FLAG_X8664_LIBX32:
+ fputs (",x32", stdout);
+ break;
++ case FLAG_ARM_LIBHF:
++ fputs (",hard-float", stdout);
++ break;
+ case 0:
+ break;
+ default:
+diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h
+index ef3f4b9..a805284 100644
+--- a/sysdeps/generic/ldconfig.h
++++ b/sysdeps/generic/ldconfig.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1999,2000,2002,2003,2007,2012 Free Software Foundation, Inc.
++/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Andreas Jaeger <aj@suse.de>, 1999.
+
+@@ -34,6 +34,7 @@
+ #define FLAG_MIPS64_LIBN32 0x0600
+ #define FLAG_MIPS64_LIBN64 0x0700
+ #define FLAG_X8664_LIBX32 0x0800
++#define FLAG_ARM_LIBHF 0x0900
+
+ /* Name of auxiliary cache. */
+ #define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"
Modified: glibc-package/branches/eglibc-2.16/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff 2012-11-19 22:00:23 UTC (rev 5390)
+++ glibc-package/branches/eglibc-2.16/debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff 2012-11-20 02:11:12 UTC (rev 5391)
@@ -1,32 +1,8 @@
---
- elf/cache.c | 2
ports/sysdeps/unix/sysv/linux/arm/dl-cache.h | 34 ++++
ports/sysdeps/unix/sysv/linux/arm/readelflib.c | 186 +++++++++++++++++++++++++
- sysdeps/generic/ldconfig.h | 1
4 files changed, 223 insertions(+)
---- a/elf/cache.c
-+++ b/elf/cache.c
-@@ -94,6 +94,9 @@
- case FLAG_X8664_LIBX32:
- fputs (",x32", stdout);
- break;
-+ case FLAG_ARM_HFABI:
-+ fputs (",hard-float", stdout);
-+ break;
- case 0:
- break;
- default:
---- a/sysdeps/generic/ldconfig.h
-+++ b/sysdeps/generic/ldconfig.h
-@@ -34,6 +34,7 @@
- #define FLAG_MIPS64_LIBN32 0x0600
- #define FLAG_MIPS64_LIBN64 0x0700
- #define FLAG_X8664_LIBX32 0x0800
-+#define FLAG_ARM_HFABI 0x0900
-
- /* Name of auxiliary cache. */
- #define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
@@ -0,0 +1,34 @@
@@ -53,7 +29,7 @@
+#include <ldconfig.h>
+
+/* Redefine the cache ID for the new hf ABI; the sf ABI inverts the check. */
-+#define _DL_CACHE_ARMHF_ID (FLAG_ARM_HFABI | FLAG_ELF_LIBC6)
++#define _DL_CACHE_ARMHF_ID (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6)
+
+#ifdef __ARM_PCS_VFP
+#define _dl_cache_check_flags(flags) \
@@ -244,7 +220,7 @@
+ if (!ret)
+ /* Do we have a hard-float ABI library? */
+ if (is_library_hf(file_name, file_contents, file_length))
-+ *flag = FLAG_ARM_HFABI|FLAG_ELF_LIBC6;
++ *flag = FLAG_ARM_LIBHF|FLAG_ELF_LIBC6;
+ return ret;
+}
+
Added: glibc-package/branches/eglibc-2.16/debian/patches/arm64/cvs-ldconfig-cache-abi.diff
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/arm64/cvs-ldconfig-cache-abi.diff (rev 0)
+++ glibc-package/branches/eglibc-2.16/debian/patches/arm64/cvs-ldconfig-cache-abi.diff 2012-11-20 02:11:12 UTC (rev 5391)
@@ -0,0 +1,39 @@
+commit 1f51ee9246b048d8966c36ddd2c26d7e0f927d83
+Author: Steve McIntyre <steve.mcintyre@linaro.org>
+Date: Mon Nov 19 01:22:33 2012 -0500
+
+ Add ldconfig cache tag handling for AArch64
+
+ * sysdeps/generic/ldconfig.h (FLAG_AARCH64_LIB64): New macro.
+ * elf/cache.c (print_entry): Print ",AArch64" for
+ FLAG_AARCH64_LIB64.
+
+ Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
+ Reviewed-by: Carlos O'Donell <carlos@systemhalted.org>
+
+diff --git a/elf/cache.c b/elf/cache.c
+index 3336bab..f5ed370 100644
+--- a/elf/cache.c
++++ b/elf/cache.c
+@@ -97,6 +97,9 @@ print_entry (const char *lib, int flag, unsigned int osversion,
+ case FLAG_ARM_LIBHF:
+ fputs (",hard-float", stdout);
+ break;
++ case FLAG_AARCH64_LIB64:
++ fputs (",AArch64", stdout);
++ break;
+ case 0:
+ break;
+ default:
+diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h
+index a805284..43cb9bd 100644
+--- a/sysdeps/generic/ldconfig.h
++++ b/sysdeps/generic/ldconfig.h
+@@ -35,6 +35,7 @@
+ #define FLAG_MIPS64_LIBN64 0x0700
+ #define FLAG_X8664_LIBX32 0x0800
+ #define FLAG_ARM_LIBHF 0x0900
++#define FLAG_AARCH64_LIB64 0x0a00
+
+ /* Name of auxiliary cache. */
+ #define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"
Modified: glibc-package/branches/eglibc-2.16/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/patches/series 2012-11-19 22:00:23 UTC (rev 5390)
+++ glibc-package/branches/eglibc-2.16/debian/patches/series 2012-11-20 02:11:12 UTC (rev 5391)
@@ -53,13 +53,15 @@
arm/local-ioperm.diff
arm/local-lowlevellock.diff
arm/local-sigaction.diff
-#arm/unsubmitted-ldconfig-cache-abi.diff
+arm/unsubmitted-ldconfig-cache-abi.diff
arm/unsubmitted-ldso-abi-check.diff
arm/unsubmitted-armhf-linker.diff
arm/local-soname-hack.diff
arm/local-vfp-sysdeps.diff
+arm/cvs-ldconfig-cache-abi.diff
arm64/submitted-aarch64-support.diff
+arm64/cvs-ldconfig-cache-abi.diff
hppa/local-inlining.diff
hppa/submitted-fadvise64_64.diff
Reply to: