From 57d2b48d397a98adb6ec71a83e6fe1c72774a74b Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 11 Sep 2011 16:48:42 +0200 Subject: [PATCH] m68k: remove use of USE_TLS --- ChangeLog.m68k | 4 ++++ sysdeps/m68k/dl-machine.h | 6 +++--- sysdeps/m68k/libc-tls.c | 6 +----- sysdeps/m68k/nptl/tls.h | 3 --- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ChangeLog.m68k b/ChangeLog.m68k index 9f9950c..bac7afe 100644 --- a/ChangeLog.m68k +++ b/ChangeLog.m68k @@ -1,5 +1,9 @@ 2011-09-11 Andreas Schwab + * sysdeps/m68k/nptl/tls.h: Don't define USE_TLS. + * sysdeps/m68k/dl-machine.h: Remove use of USE_TLS. + * sysdeps/m68k/libc-tls.c: Likewise. + * sysdeps/unix/sysv/linux/m68k/sysdep.h: Remove use of USE___THREAD. diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index 9bc35e7..8f8091e 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. m68k version. - Copyright (C) 1996-2001, 2002, 2003, 2004, 2005, 2010 + Copyright (C) 1996-2001, 2002, 2003, 2004, 2005, 2010, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -269,7 +269,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, case R_68K_PC32: *reloc_addr = value + reloc->r_addend - (Elf32_Addr) reloc_addr; break; -#if defined USE_TLS && !defined RTLD_BOOTSTRAP +#ifndef RTLD_BOOTSTRAP case R_68K_TLS_DTPMOD32: /* Get the information from the link map returned by the resolv function. */ @@ -287,7 +287,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, *reloc_addr = TLS_TPREL_VALUE (sym_map, sym, reloc); } break; -#endif /* defined USE_TLS && !defined RTLD_BOOTSTRAP */ +#endif /* !RTLD_BOOTSTRAP */ case R_68K_NONE: /* Alright, Wilbur. */ break; default: diff --git a/sysdeps/m68k/libc-tls.c b/sysdeps/m68k/libc-tls.c index e865fac..b16eac2 100644 --- a/sysdeps/m68k/libc-tls.c +++ b/sysdeps/m68k/libc-tls.c @@ -1,5 +1,5 @@ /* Thread-local storage handling in the ELF dynamic linker. m68k version. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Maxim Kuvyrkov , 2010. @@ -21,8 +21,6 @@ #include #include -#if USE_TLS - /* On M68K, 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 @@ -34,5 +32,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/m68k/nptl/tls.h b/sysdeps/m68k/nptl/tls.h index c29824c..3c5b165 100644 --- a/sysdeps/m68k/nptl/tls.h +++ b/sysdeps/m68k/nptl/tls.h @@ -43,9 +43,6 @@ typedef union dtv # include #endif /* __ASSEMBLER__ */ -/* Signal that TLS support is available. */ -#define USE_TLS 1 - #ifndef __ASSEMBLER__ /* Get system call information. */ -- 2.7.4