m68k: remove use of USE_TLS

diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index 9f9950c9dedf9a837902a871fd844b4717f74ebb..bac7afe09d9acfc5a51d5f80b35367c90d4f4eb5 100644 (file)
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,5 +1,9 @@
 2011-09-11  Andreas Schwab  <schwab@linux-m68k.org>
 
+       * 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 9bc35e7694e56470ba0647f6bf83a7dba5f45a6d..8f8091eb9f0f83ed66f9bae76c86245fd7b38b4e 100644 (file)
--- 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 e865fac16669ba6861f62b523863ea4a679b66ed..b16eac21ef4e8e0d35cd7d7113b143c47618af0b 100644 (file)
--- 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 <maxim@codesourcery.com>, 2010.
 
@@ -21,8 +21,6 @@
 #include <csu/libc-tls.c>
 #include <dl-tls.h>
 
-#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 c29824cfbff4af9d2ea442e84b6a810941c70ea6..3c5b165d8f229492cb183aca7cd721d93550a175 100644 (file)
--- a/sysdeps/m68k/nptl/tls.h
+++ b/sysdeps/m68k/nptl/tls.h
@@ -43,9 +43,6 @@ typedef union dtv
 # include <tcb-offsets.h>
 #endif /* __ASSEMBLER__ */
 
-/* Signal that TLS support is available.  */
-#define USE_TLS        1
-
 #ifndef __ASSEMBLER__
 
 /* Get system call information.  */