View | Details | Raw Unified | Return to bug 21041 | Differences between
and this patch

Collapse All | Expand All

(-)a/sysdeps/i386/dl-machine.h (-1 / +3 lines)
Lines 325-331 elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, Link Here
325
# ifndef RTLD_BOOTSTRAP
325
# ifndef RTLD_BOOTSTRAP
326
	  if (sym_map != map
326
	  if (sym_map != map
327
	      && sym_map->l_type != lt_executable
327
	      && sym_map->l_type != lt_executable
328
	      && !sym_map->l_relocated)
328
	      && !sym_map->l_relocated
329
	      && (strcmp (sym_map->l_libname->name,
330
			  "libc.so" LIBC_SO_VERSION) == 0))
329
	    {
331
	    {
330
	      const char *strtab
332
	      const char *strtab
331
		= (const char *) D_PTR (map, l_info[DT_STRTAB]);
333
		= (const char *) D_PTR (map, l_info[DT_STRTAB]);
(-)a/sysdeps/x86/Makefile (+4 lines)
Lines 5-10 endif Link Here
5
ifeq ($(subdir),elf)
5
ifeq ($(subdir),elf)
6
sysdep-dl-routines += dl-get-cpu-features
6
sysdep-dl-routines += dl-get-cpu-features
7
7
8
CFLAGS-.o += -D'LIBC_SO_VERSION="$(libc.so-version)"'
9
CFLAGS-.op += -D'LIBC_SO_VERSION="$(libc.so-version)"'
10
CFLAGS-.os += -D'LIBC_SO_VERSION="$(libc.so-version)"'
11
8
tests += tst-get-cpu-features
12
tests += tst-get-cpu-features
9
tests-static += tst-get-cpu-features-static
13
tests-static += tst-get-cpu-features-static
10
endif
14
endif
(-)a/sysdeps/x86_64/dl-machine.h (-1 / +3 lines)
Lines 335-341 elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, Link Here
335
# ifndef RTLD_BOOTSTRAP
335
# ifndef RTLD_BOOTSTRAP
336
	  if (sym_map != map
336
	  if (sym_map != map
337
	      && sym_map->l_type != lt_executable
337
	      && sym_map->l_type != lt_executable
338
	      && !sym_map->l_relocated)
338
	      && !sym_map->l_relocated
339
	      && (strcmp (sym_map->l_libname->name,
340
			  "libc.so" LIBC_SO_VERSION) == 0))
339
	    {
341
	    {
340
	      const char *strtab
342
	      const char *strtab
341
		= (const char *) D_PTR (map, l_info[DT_STRTAB]);
343
		= (const char *) D_PTR (map, l_info[DT_STRTAB]);

Return to bug 21041