diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-03-16 15:03:37 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-03-16 15:20:45 -0700 |
| commit | f1a77b01f4e3a80782171297120e77ab112ce85d (patch) | |
| tree | 75a6f8db458cd46c36a05f48b45e932cd1a7e558 /sysdeps/unix/sysv/linux/x86_64/dl-cache.h | |
| parent | c0c83bc8b299b08c4c0c5129da9a28ba740f087a (diff) | |
| download | glibc-f1a77b01f4e3a80782171297120e77ab112ce85d.tar.gz glibc-f1a77b01f4e3a80782171297120e77ab112ce85d.tar.xz glibc-f1a77b01f4e3a80782171297120e77ab112ce85d.zip | |
Add x32 support to ldconfig
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86_64/dl-cache.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/dl-cache.h | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-cache.h b/sysdeps/unix/sysv/linux/x86_64/dl-cache.h index 8463fea3d9..e14151d42b 100644 --- a/sysdeps/unix/sysv/linux/x86_64/dl-cache.h +++ b/sysdeps/unix/sysv/linux/x86_64/dl-cache.h @@ -21,4 +21,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) -#include <sysdeps/unix/sysv/linux/sparc/dl-cache.h> +#define add_system_dir(dir) \ + do \ + { \ + size_t len = strlen (dir); \ + char path[len + 4]; \ + memcpy (path, dir, len + 1); \ + if (len >= 6 && ! memcmp (path + len - 6, "/lib64", 6)) \ + { \ + len -= 2; \ + path[len] = '\0'; \ + } \ + else if (len >= 7 \ + && ! memcmp (path + len - 7, "/libx32", 7)) \ + { \ + len -= 3; \ + path[len] = '\0'; \ + } \ + add_dir (path); \ + if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4)) \ + { \ + memcpy (path + len, "64", 3); \ + add_dir (path); \ + memcpy (path + len, "x32", 4); \ + add_dir (path); \ + } \ + } while (0) + +#include <sysdeps/generic/dl-cache.h> |