From: Richard Henderson <rth@twiddle.net>
Date: Wed, 15 Feb 2012 21:48:44 +0000 (-0800)
Subject: alpha: Don't test USE___THREAD in dl-machine.h.
X-Git-Tag: upstream/2.20~3636^2~263
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b4f30e3563c45999ea28f4c8bada9856b00bb95;p=platform%2Fupstream%2Flinaro-glibc.git

alpha: Don't test USE___THREAD in dl-machine.h.
---

diff --git a/ChangeLog.alpha b/ChangeLog.alpha
index 7fc6f07..5b4be14 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 2790ae5..5ab71b1 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);
     }