mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-05 12:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove USE_TLS conditionals for MIPS.

Browse Source
This commit is contained in:
Joseph Myers 2011-09-11 11:22:32 +00:00
parent ce001f45bc
commit b8ead09ab7
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.mips
View File

@ -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> 2011-09-06 Joseph Myers <joseph@codesourcery.com>
[BZ #13109] [BZ #13109]

4
sysdeps/mips/dl-machine.h
View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. MIPS version. /* 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. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>. 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) switch (r_type)
{ {
#if defined (USE_TLS) && !defined (RTLD_BOOTSTRAP) #if !defined (RTLD_BOOTSTRAP)
# if _MIPS_SIM == _ABI64 # if _MIPS_SIM == _ABI64
case R_MIPS_TLS_DTPMOD64: case R_MIPS_TLS_DTPMOD64:
case R_MIPS_TLS_DTPREL64: case R_MIPS_TLS_DTPREL64:

6
sysdeps/mips/libc-tls.c
View File

@ -1,5 +1,5 @@
/* Thread-local storage handling in the ELF dynamic linker. MIPS version. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -20,8 +20,6 @@
#include <csu/libc-tls.c> #include <csu/libc-tls.c>
#include <dl-tls.h> #include <dl-tls.h>
#if USE_TLS
/* On MIPS, linker optimizations are not required, so __tls_get_addr /* On MIPS, linker optimizations are not required, so __tls_get_addr
can be called even in statically linked binaries. In this case module 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 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 (); dtv_t *dtv = THREAD_DTV ();
return (char *) dtv[1].pointer.val + GET_ADDR_OFFSET; return (char *) dtv[1].pointer.val + GET_ADDR_OFFSET;
} }
#endif

3
sysdeps/mips/nptl/tls.h
View File

@ -61,9 +61,6 @@ typedef union dtv
# error "TLS support is required." # error "TLS support is required."
#endif #endif
/* Signal that TLS support is available. */
#define USE_TLS 1
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
/* Get system call information. */ /* Get system call information. */