diff options
| author | Marcus Shawcroft <marcus.shawcroft@linaro.org> | 2012-11-29 10:11:44 +0000 |
|---|---|---|
| committer | Marcus Shawcroft <marcus.shawcroft@linaro.org> | 2012-11-29 10:38:49 +0000 |
| commit | 8d953369efe439d2064e78ad318f337ff9fac515 (patch) | |
| tree | 79dde60d3ecd9dfd52871de32b9549e134f5bca5 | |
| parent | 06b313bf04eef2d7dbf60f1d6d440e76754181e9 (diff) | |
| download | glibc-8d953369efe439d2064e78ad318f337ff9fac515.tar.gz glibc-8d953369efe439d2064e78ad318f337ff9fac515.tar.xz glibc-8d953369efe439d2064e78ad318f337ff9fac515.zip | |
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>
| -rw-r--r-- | ports/ChangeLog.aarch64 | 4 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/aarch64/dl-cache.h | 45 |
2 files changed, 49 insertions, 0 deletions
diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index e0ec344cb5..eac41e5012 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 0000000000..1aa1a84afe --- /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> |