aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Shawcroft <marcus.shawcroft@linaro.org>2012-12-04 12:13:06 +0000
committerMarcus Shawcroft <marcus.shawcroft@linaro.org>2012-12-04 13:07:24 +0000
commit931ed9559b9717aafecc057e6ced05f4ac4bcfaf (patch)
tree4aab63fc9ff0840f185a63fb3c98969e55d78d02
parentbc7981ac2b217098cc9f12fb8474e3254a472763 (diff)
downloadglibc-931ed9559b9717aafecc057e6ced05f4ac4bcfaf.tar
glibc-931ed9559b9717aafecc057e6ced05f4ac4bcfaf.tar.gz
glibc-931ed9559b9717aafecc057e6ced05f4ac4bcfaf.tar.bz2
glibc-931ed9559b9717aafecc057e6ced05f4ac4bcfaf.zip
arm: Check for the FLAG_ARM_LIBHF flag in the ldconfig cache
Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
-rw-r--r--ports/ChangeLog.arm4
-rw-r--r--ports/sysdeps/unix/sysv/linux/arm/dl-cache.h29
2 files changed, 33 insertions, 0 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index ee1871012d..c01a8127ed 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,5 +1,9 @@
2012-12-04 Steve McIntyre <steve.mcintyre@linaro.org>
+ * sysdeps/unix/sysv/linux/arm/dl-cache.h: New file.
+
+2012-12-04 Steve McIntyre <steve.mcintyre@linaro.org>
+
* sysdeps/unix/sysv/linux/arm/ldconfig.h: New file.
2012-12-04 Steve McIntyre <steve.mcintyre@linaro.org>
diff --git a/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h b/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
new file mode 100644
index 0000000000..525caa2cbe
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
@@ -0,0 +1,29 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+ Copyright (C) 2003-2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <ldconfig.h>
+
+#ifdef __ARM_PCS_VFP
+# define _dl_cache_check_flags(flags) \
+ ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6))
+#else
+# define _dl_cache_check_flags(flags) \
+ ((flags) == FLAG_ELF_LIBC6)
+#endif
+
+#include_next <dl-cache.h>