aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2012-02-15 13:48:44 -0800
committerRichard Henderson <rth@twiddle.net>2012-02-15 16:07:11 -0800
commit7b4f30e3563c45999ea28f4c8bada9856b00bb95 (patch)
treef34cbb88ac67399d2df4a2b7297e4783cd8dfbb0
parenta31567f46f9b30f2979223c42502c7a57f41b703 (diff)
downloadglibc-7b4f30e3563c45999ea28f4c8bada9856b00bb95.tar.xz
glibc-7b4f30e3563c45999ea28f4c8bada9856b00bb95.zip
alpha: Don't test USE___THREAD in dl-machine.h.
-rw-r--r--ChangeLog.alpha2
-rw-r--r--sysdeps/alpha/dl-machine.h7
2 files changed, 2 insertions, 7 deletions
diff --git a/ChangeLog.alpha b/ChangeLog.alpha
index 7fc6f07a63..5b4be14df3 100644
--- a/ChangeLog.alpha
+++ b/ChangeLog.alpha
@@ -1,5 +1,7 @@
2012-02-15 Richard Henderson <rth@twiddle.net>
+ * sysdeps/alpha/dl-machine.h: Don't check USE___THREAD.
+
* sysdeps/unix/alpha/sysdeps.S: Don't check __ELF__, USE___THREAD,
or _LIBC_REENTRANT.
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h
index 2790ae5702..5ab71b1d1d 100644
--- a/sysdeps/alpha/dl-machine.h
+++ b/sysdeps/alpha/dl-machine.h
@@ -232,16 +232,11 @@ $fixup_stack: \n\
to one of the main executable's symbols, as for a COPY reloc.
This is unused on Alpha. */
-#if !defined RTLD_BOOTSTRAP || USE___THREAD
# define elf_machine_type_class(type) \
(((type) == R_ALPHA_JMP_SLOT \
|| (type) == R_ALPHA_DTPMOD64 \
|| (type) == R_ALPHA_DTPREL64 \
|| (type) == R_ALPHA_TPREL64) * ELF_RTYPE_CLASS_PLT)
-#else
-# define elf_machine_type_class(type) \
- (((type) == R_ALPHA_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)
-#endif
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
#define ELF_MACHINE_JMP_SLOT R_ALPHA_JMP_SLOT
@@ -452,7 +447,6 @@ elf_machine_rela (struct link_map *map,
memcpy (reloc_addr_arg, &sym_value, 8);
}
#endif
-#if !defined RTLD_BOOTSTRAP || USE___THREAD
else if (r_type == R_ALPHA_DTPMOD64)
{
# ifdef RTLD_BOOTSTRAP
@@ -485,7 +479,6 @@ elf_machine_rela (struct link_map *map,
}
# endif
}
-#endif
else
_dl_reloc_bad_type (map, r_type, 0);
}