This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-786-g8d95336
- From: mshawcroft at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 29 Nov 2012 10:39:17 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-786-g8d95336
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 8d953369efe439d2064e78ad318f337ff9fac515 (commit)
from 06b313bf04eef2d7dbf60f1d6d440e76754181e9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8d953369efe439d2064e78ad318f337ff9fac515
commit 8d953369efe439d2064e78ad318f337ff9fac515
Author: Marcus Shawcroft <marcus.shawcroft@linaro.org>
Date: Thu Nov 29 10:11:44 2012 +0000
aarch64: Use FLAG_AARCH64_LIB64 ldconfig cache tag.
Use the new FLAG_AARCH64_LIB64 ldconfig cache tag for AArch64,
similarly to the way tags are handled for other architectures.
Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
Reviewed-by: Carlos O'Donell <carlos@systemhalted.org>
Signed-off-by: Marcus Shawcroft <marcus.shawcroft@linaro.org>
diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64
index e0ec344..eac41e5 100644
--- a/ports/ChangeLog.aarch64
+++ b/ports/ChangeLog.aarch64
@@ -1,3 +1,7 @@
+2012-11-29 Steve McIntyre <steve.mcintyre@linaro.org>
+
+ * sysdeps/unix/sysv/linux/aarch64/dl-cache.h: New file.
+
2012-11-22 Marcus Shawcroft <marcus.shawcroft@linaro.org>
* sysdeps/aarch64/libm-test-ulps: Regenerate.
diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/dl-cache.h b/ports/sysdeps/unix/sysv/linux/aarch64/dl-cache.h
new file mode 100644
index 0000000..1aa1a84
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/aarch64/dl-cache.h
@@ -0,0 +1,45 @@
+/* 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>
+
+#define _DL_CACHE_DEFAULT_ID (FLAG_AARCH64_LIB64 | FLAG_ELF_LIBC6)
+
+#define _dl_cache_check_flags(flags) \
+ ((flags) == _DL_CACHE_DEFAULT_ID)
+
+#define add_system_dir(dir) \
+ do \
+ { \
+ size_t len = strlen (dir); \
+ char path[len + 3]; \
+ memcpy (path, dir, len + 1); \
+ if (len >= 6 && ! memcmp (path + len - 6, "/lib64", 6)) \
+ { \
+ len -= 2; \
+ path[len] = '\0'; \
+ } \
+ add_dir (path); \
+ if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4)) \
+ { \
+ memcpy (path + len, "64", 3); \
+ add_dir (path); \
+ } \
+ } while (0)
+
+#include_next <dl-cache.h>
-----------------------------------------------------------------------
Summary of changes:
ports/ChangeLog.aarch64 | 4 ++++
.../sysdeps/unix/sysv/linux/aarch64}/dl-cache.h | 13 ++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
copy {sysdeps/unix/sysv/linux/sparc => ports/sysdeps/unix/sysv/linux/aarch64}/dl-cache.h (79%)
hooks/post-receive
--
GNU C Library master sources