summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-06-09 13:09:52 -0700
committerRoland McGrath <roland@hack.frob.com>2014-06-09 15:54:23 -0700
commitacaa4d24f507976d10a82dc31152eb912b59b4bc (patch)
tree36641004c31c636380f892e7359d22031645ff28
parentd752f0ccd7765c6accca2d4f2dbc6dc2a6f3b066 (diff)
downloadglibc-acaa4d24f507976d10a82dc31152eb912b59b4bc.tar.gz
glibc-acaa4d24f507976d10a82dc31152eb912b59b4bc.tar.xz
glibc-acaa4d24f507976d10a82dc31152eb912b59b4bc.zip
SH: Define TLS_DEFINE_INIT_TP
-rw-r--r--ChangeLog5
-rw-r--r--nptl/sysdeps/sh/tls.h2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sh/createthread.c23
3 files changed, 7 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 249e78bf2b..42d51a7d8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-06-09  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/sh/tls.h (TLS_DEFINE_INIT_TP): New macro.
+	* nptl/sysdeps/unix/sysv/linux/sh/createthread.c: File removed.
+
+2014-06-09  Roland McGrath  <roland@hack.frob.com>
+
 	* sysdeps/m68k/nptl/tls.h (TLS_DEFINE_INIT_TP): New macro.
 	* sysdeps/unix/sysv/linux/m68k/nptl/createthread.c: File removed.
 
diff --git a/nptl/sysdeps/sh/tls.h b/nptl/sysdeps/sh/tls.h
index a0660d2854..d4d3e93d64 100644
--- a/nptl/sysdeps/sh/tls.h
+++ b/nptl/sysdeps/sh/tls.h
@@ -102,6 +102,8 @@ typedef struct
 # define TLS_INIT_TP(tcbp) \
   ({ __asm __volatile ("ldc %0,gbr" : : "r" (tcbp)); 0; })
 
+# define TLS_DEFINE_INIT_TP(tp, pd) void *tp = (pd) + 1
+
 /* Return the address of the dtv for the current thread.  */
 # define THREAD_DTV() \
   ({ tcbhead_t *__tcbp;							      \
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/createthread.c b/nptl/sysdeps/unix/sysv/linux/sh/createthread.c
deleted file mode 100644
index 95d7cd8cfa..0000000000
--- a/nptl/sysdeps/unix/sysv/linux/sh/createthread.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (C) 2003-2014 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Value passed to 'clone' for initialization of the thread register.  */
-#define TLS_VALUE (pd + 1)
-
-
-/* Get the real implementation.  */
-#include <nptl/sysdeps/pthread/createthread.c>