This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
Community source repository for glibc add-on ports branch, master, updated. glibc-2.14-12-g57d2b48
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Sep 2011 15:03:29 -0000
- Subject: Community source repository for glibc add-on ports branch, master, updated. glibc-2.14-12-g57d2b48
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Community source repository for glibc add-on ports".
The branch, master has been updated
via 57d2b48d397a98adb6ec71a83e6fe1c72774a74b (commit)
via df62b0cd513b56515cb6378b55952696193fc1ef (commit)
from b8ead09ab7d5eebd3e1596e353622e2235e7deb5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc-ports.git;a=commitdiff;h=57d2b48d397a98adb6ec71a83e6fe1c72774a74b
commit 57d2b48d397a98adb6ec71a83e6fe1c72774a74b
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun Sep 11 16:48:42 2011 +0200
m68k: remove use of USE_TLS
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 <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 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 <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 c29824c..3c5b165 100644
--- 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. */
http://sources.redhat.com/git/gitweb.cgi?p=glibc-ports.git;a=commitdiff;h=df62b0cd513b56515cb6378b55952696193fc1ef
commit df62b0cd513b56515cb6378b55952696193fc1ef
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun Sep 11 16:47:45 2011 +0200
m68k: remove use of USE___THREAD
diff --git a/ChangeLog.m68k b/ChangeLog.m68k
index 8c85d5c..9f9950c 100644
--- a/ChangeLog.m68k
+++ b/ChangeLog.m68k
@@ -1,3 +1,8 @@
+2011-09-11 Andreas Schwab <schwab@linux-m68k.org>
+
+ * sysdeps/unix/sysv/linux/m68k/sysdep.h: Remove use of
+ USE___THREAD.
+
2011-06-23 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/m68k/dl-trampoline.S (_dl_runtime_profile)
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index d381189..28113ac 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -106,7 +106,7 @@ SYSCALL_ERROR_LABEL: \
a pointer (e.g., mmap). */ \
move.l %d0, %a0; \
rts;
-# elif USE___THREAD
+# elif defined _LIBC_REENTRANT
# ifndef NOT_IN_libc
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
@@ -125,18 +125,6 @@ SYSCALL_ERROR_LABEL: \
a pointer (e.g., mmap). */ \
move.l %d0, %a0; \
rts;
-# elif defined _LIBC_REENTRANT
-# define SYSCALL_ERROR_HANDLER \
-SYSCALL_ERROR_LABEL: \
- neg.l %d0; \
- move.l %d0, -(%sp); \
- jbsr __errno_location@PLTPC; \
- move.l (%sp)+, (%a0); \
- move.l &-1, %d0; \
- /* Copy return value to %a0 for syscalls that are declared to return \
- a pointer (e.g., mmap). */ \
- move.l %d0, %a0; \
- rts;
# else /* !_LIBC_REENTRANT */
/* Store (- %d0) into errno through the GOT. */
# define SYSCALL_ERROR_HANDLER \
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.m68k | 9 +++++++++
sysdeps/m68k/dl-machine.h | 6 +++---
sysdeps/m68k/libc-tls.c | 6 +-----
sysdeps/m68k/nptl/tls.h | 3 ---
sysdeps/unix/sysv/linux/m68k/sysdep.h | 14 +-------------
5 files changed, 14 insertions(+), 24 deletions(-)
hooks/post-receive
--
Community source repository for glibc add-on ports