picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add x32 support to ldconfig

Browse source
This commit is contained in:
H.J. Lu 2012-03-16 15:03:37 -07:00
parent c0c83bc8b2
commit f1a77b01f4
7 changed files with 95 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ChangeLog
View file

@ -1,3 +1,22 @@
2012-03-16 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/generic/ldconfig.h (FLAG_X8664_LIBX32): New macro.
* elf/cache.c (print_entry): Handle FLAG_X8664_LIBX32.
* sysdeps/unix/sysv/linux/i386/readelflib.c (process_elf_file):
Move e_machine check before EI_CLASS check. Handle x32
libraries. Check EM_IA_64 only if SKIP_EM_IA_64 isn't defined.
* sysdeps/unix/sysv/linux/x86_64/readelflib.c: Just define
SKIP_EM_IA_64 and include
<sysdeps/unix/sysv/linux/i386/readelflib.c>.
* sysdeps/unix/sysv/linux/x86_64/dl-cache.h:
Don't include <sysdeps/unix/sysv/linux/sparc/dl-cache.h>.
(add_system_dir): New macro.
* sysdeps/unix/sysv/linux/x86_64/ldconfig.h
(SYSDEP_KNOWN_INTERPRETER_NAMES): Add /libx32/ld-linux-x32.so.2.
2012-03-16 Joseph Myers <joseph@codesourcery.com>
[BZ #2551]

4
elf/cache.c
View file

@ -90,6 +90,10 @@ print_entry (const char *lib, int flag, unsigned int osversion,
break;
case FLAG_MIPS64_LIBN64:
fputs (",64bit", stdout);
break;
case FLAG_X8664_LIBX32:
fputs (",x32", stdout);
break;
case 0:
break;
default:

1
sysdeps/generic/ldconfig.h
View file

@ -33,6 +33,7 @@
#define FLAG_POWERPC_LIB64 0x0500
#define FLAG_MIPS64_LIBN32 0x0600
#define FLAG_MIPS64_LIBN64 0x0700
#define FLAG_X8664_LIBX32 0x0800
/* Name of auxiliary cache. */
#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"

68
sysdeps/unix/sysv/linux/i386/readelflib.c
View file

@ -32,40 +32,52 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
int ret;
int ret, file_flag = 0;
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
return process_elf32_file (file_name, lib, flag, osversion, soname,
file_contents, file_length);
else
switch (elf_header->e_machine)
{
switch (elf_header->e_machine)
case EM_X86_64:
if (elf_header->e_ident[EI_CLASS] == ELFCLASS64)
/* X86-64 64bit libraries are always libc.so.6+. */
file_flag = FLAG_X8664_LIB64|FLAG_ELF_LIBC6;
else
/* X32 libraries are always libc.so.6+. */
file_flag = FLAG_X8664_LIBX32|FLAG_ELF_LIBC6;
break;
#ifndef SKIP_EM_IA_64
case EM_IA_64:
if (elf_header->e_ident[EI_CLASS] == ELFCLASS64)
{
case EM_IA_64:
case EM_X86_64:
/* IA64 64bit libraries are always libc.so.6+. */
file_flag = FLAG_IA64_LIB64|FLAG_ELF_LIBC6;
break;
default:
error (0, 0, _("%s is for unknown machine %d.\n"),
file_name, elf_header->e_machine);
return 1;
}
ret = process_elf64_file (file_name, lib, flag, osversion, soname,
file_contents, file_length);
/* IA64/X86-64 64bit libraries are always libc.so.6+. */
if (!ret)
switch (elf_header->e_machine)
{
case EM_IA_64:
*flag = FLAG_IA64_LIB64|FLAG_ELF_LIBC6;
break;
case EM_X86_64:
*flag = FLAG_X8664_LIB64|FLAG_ELF_LIBC6;
break;
}
return ret;
goto failed;
#endif
case EM_386:
if (elf_header->e_ident[EI_CLASS] == ELFCLASS32)
break;
/* Fall through. */
default:
#ifndef SKIP_EM_IA_64
failed:
#endif
error (0, 0, _("%s is for unknown machine %d.\n"),
file_name, elf_header->e_machine);
return 1;
}
if (elf_header->e_ident[EI_CLASS] == ELFCLASS32)
ret = process_elf32_file (file_name, lib, flag, osversion, soname,
file_contents, file_length);
else
ret = process_elf64_file (file_name, lib, flag, osversion, soname,
file_contents, file_length);
if (!ret && file_flag)
*flag = file_flag;
return ret;
}
#undef __ELF_NATIVE_CLASS

29
sysdeps/unix/sysv/linux/x86_64/dl-cache.h
View file

@ -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>

1
sysdeps/unix/sysv/linux/x86_64/ldconfig.h
View file

@ -19,6 +19,7 @@
#define SYSDEP_KNOWN_INTERPRETER_NAMES \
{ "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
{ "/libx32/ld-linux-x32.so.2", FLAG_ELF_LIBC6 }, \
{ "/lib64/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
#define SYSDEP_KNOWN_LIBRARY_NAMES \
{ "libc.so.6", FLAG_ELF_LIBC6 }, \

63
sysdeps/unix/sysv/linux/x86_64/readelflib.c
View file

@ -1,61 +1,2 @@
/* Copyright (C) 1999, 2001, 2002, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 1999 and
Jakub Jelinek <jakub@redhat.com>, 1999.
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/>. */
int process_elf32_file (const char *file_name, const char *lib, int *flag,
unsigned int *osversion, char **soname,
void *file_contents, size_t file_length);
int process_elf64_file (const char *file_name, const char *lib, int *flag,
unsigned int *osversion, char **soname,
void *file_contents, size_t file_length);
/* Returns 0 if everything is ok, != 0 in case of error. */
int
process_elf_file (const char *file_name, const char *lib, int *flag,
unsigned int *osversion, char **soname, void *file_contents,
size_t file_length)
{
ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents;
int ret;
if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
return process_elf32_file (file_name, lib, flag, osversion, soname,
file_contents, file_length);
else
{
ret = process_elf64_file (file_name, lib, flag, osversion, soname,
file_contents, file_length);
/* x86-64 64bit libraries are always libc.so.6+. */
if (!ret)
*flag = FLAG_X8664_LIB64|FLAG_ELF_LIBC6;
return ret;
}
}
#undef __ELF_NATIVE_CLASS
#undef process_elf_file
#define process_elf_file process_elf32_file
#define __ELF_NATIVE_CLASS 32
#include "elf/readelflib.c"
#undef __ELF_NATIVE_CLASS
#undef process_elf_file
#define process_elf_file process_elf64_file
#define __ELF_NATIVE_CLASS 64
#include "elf/readelflib.c"
#define SKIP_EM_IA_64
#include <sysdeps/unix/sysv/linux/i386/readelflib.c>