aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2011-09-11 11:22:32 +0000
committerJoseph Myers <joseph@codesourcery.com>2011-09-11 11:22:32 +0000
commitb8ead09ab7d5eebd3e1596e353622e2235e7deb5 (patch)
tree57abe961990e11c097886bdeccf14ce77872b1a1
parentce001f45bc3379962988f177214a9edd07d8d311 (diff)
downloadglibc-b8ead09ab7d5eebd3e1596e353622e2235e7deb5.tar.xz
glibc-b8ead09ab7d5eebd3e1596e353622e2235e7deb5.zip
Remove USE_TLS conditionals for MIPS.
-rw-r--r--ChangeLog.mips5
-rw-r--r--sysdeps/mips/dl-machine.h4
-rw-r--r--sysdeps/mips/libc-tls.c6
-rw-r--r--sysdeps/mips/nptl/tls.h3
4 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog.mips b/ChangeLog.mips
index 75f87fe418..0694fe85fc 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,8 @@
+2011-09-11 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/mips/dl-machine.h, sysdeps/mips/libc-tls.c,
+ sysdeps/mips/nptl/tls.h: Don't define or use USE_TLS.
+
2011-09-06 Joseph Myers <joseph@codesourcery.com>
[BZ #13109]
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index 123b4d6b78..26e1fcb7db 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. MIPS version.
- Copyright (C) 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007
+ Copyright (C) 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
@@ -343,7 +343,7 @@ elf_machine_reloc (struct link_map *map, ElfW(Addr) r_info,
switch (r_type)
{
-#if defined (USE_TLS) && !defined (RTLD_BOOTSTRAP)
+#if !defined (RTLD_BOOTSTRAP)
# if _MIPS_SIM == _ABI64
case R_MIPS_TLS_DTPMOD64:
case R_MIPS_TLS_DTPREL64:
diff --git a/sysdeps/mips/libc-tls.c b/sysdeps/mips/libc-tls.c
index a3d6301d1d..2c7805625b 100644
--- a/sysdeps/mips/libc-tls.c
+++ b/sysdeps/mips/libc-tls.c
@@ -1,5 +1,5 @@
/* Thread-local storage handling in the ELF dynamic linker. MIPS version.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,8 +20,6 @@
#include <csu/libc-tls.c>
#include <dl-tls.h>
-#if USE_TLS
-
/* On MIPS, linker optimizations are not required, so __tls_get_addr
can be called even in statically linked binaries. In this case module
must be always 1 and PT_TLS segment exist in the binary, otherwise it
@@ -33,5 +31,3 @@ __tls_get_addr (tls_index *ti)
dtv_t *dtv = THREAD_DTV ();
return (char *) dtv[1].pointer.val + GET_ADDR_OFFSET;
}
-
-#endif
diff --git a/sysdeps/mips/nptl/tls.h b/sysdeps/mips/nptl/tls.h
index 20f9f96832..2a89e34aaf 100644
--- a/sysdeps/mips/nptl/tls.h
+++ b/sysdeps/mips/nptl/tls.h
@@ -61,9 +61,6 @@ typedef union dtv
# error "TLS support is required."
#endif
-/* Signal that TLS support is available. */
-#define USE_TLS 1
-
#ifndef __ASSEMBLER__
/* Get system call information. */