[Glibc-bsd-commits] r3258 - in trunk/glibc-ports: kfreebsd/linuxthreads/bits patches

[Aurelien Jarno]

Author: aurel32
Date: 2011-02-08 18:42:17 +0000 (Tue, 08 Feb 2011)
New Revision: 3258

Removed:
   trunk/glibc-ports/kfreebsd/linuxthreads/bits/libc-tsd.h
Modified:
   trunk/glibc-ports/patches/linuxthreads29.patch
Log:
Adding a modified version of <bits/libc-tsd.h> to kfreebsd sysdeps make the
GNU libc failing to build. This is anyway wrong as it is not at all specific
to GNU/kFreeBSD, but to API changes of the threading library done in glibc
2.9. Move the changes in linuxthreads29.patch instead.



Deleted: trunk/glibc-ports/kfreebsd/linuxthreads/bits/libc-tsd.h
===================================================================
--- trunk/glibc-ports/kfreebsd/linuxthreads/bits/libc-tsd.h	2011-02-08 18:35:09 UTC (rev 3257)
+++ trunk/glibc-ports/kfreebsd/linuxthreads/bits/libc-tsd.h	2011-02-08 18:42:17 UTC (rev 3258)
@@ -1,59 +0,0 @@
-/* libc-internal interface for thread-specific data.  LinuxThreads version.
-   Copyright (C) 1997-2002, 2003, 2010 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; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _BITS_LIBC_TSD_H
-#define _BITS_LIBC_TSD_H 1
-
-#include <linuxthreads/descr.h>
-#include <tls.h>
-
-#if USE_TLS && HAVE___THREAD
-
-/* When __thread works, the generic definition is what we want.  */
-# include_next <bits/libc-tsd.h>
-
-#else
-
-# include <bits/libc-lock.h>
-
-# ifndef SHARED
-extern void ** __pthread_internal_tsd_address (int);
-extern void *__pthread_internal_tsd_get (int);
-extern int __pthread_internal_tsd_set (int, const void *);
-
-weak_extern (__pthread_internal_tsd_address)
-weak_extern (__pthread_internal_tsd_get)
-weak_extern (__pthread_internal_tsd_set)
-# endif
-
-#define __libc_tsd_define(CLASS, TYPE, KEY)	CLASS TYPE __libc_tsd_##KEY##_data;
-#define __libc_tsd_address(TYPE, KEY) \
-  (TYPE *) __libc_maybe_call2 (pthread_internal_tsd_address,			\
-		      (_LIBC_TSD_KEY_##KEY), &__libc_tsd_##KEY##_data)
-#define __libc_tsd_get(TYPE, KEY) \
-  (TYPE) __libc_maybe_call2 (pthread_internal_tsd_get,				\
-		      (_LIBC_TSD_KEY_##KEY), __libc_tsd_##KEY##_data)
-#define __libc_tsd_set(TYPE, KEY, VALUE) \
-  __libc_maybe_call2 (pthread_internal_tsd_set,				\
-		      (_LIBC_TSD_KEY_##KEY, (VALUE)),			\
-		       (__libc_tsd_##KEY##_data = (VALUE), 0))
-
-#endif
-
-#endif	/* bits/libc-tsd.h */

Modified: trunk/glibc-ports/patches/linuxthreads29.patch
===================================================================
--- trunk/glibc-ports/patches/linuxthreads29.patch	2011-02-08 18:35:09 UTC (rev 3257)
+++ trunk/glibc-ports/patches/linuxthreads29.patch	2011-02-08 18:42:17 UTC (rev 3258)
@@ -68,3 +68,26 @@
  
  #include <sysdeps/generic/malloc-machine.h>
  
+--- glibc-2.9.orig/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
++++ glibc-2.9/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
+@@ -42,14 +42,14 @@
+ weak_extern (__pthread_internal_tsd_set)
+ # endif
+ 
+-#define __libc_tsd_define(CLASS, KEY)	CLASS void *__libc_tsd_##KEY##_data;
+-#define __libc_tsd_address(KEY) \
+-  __libc_maybe_call2 (pthread_internal_tsd_address,			\
++#define __libc_tsd_define(CLASS, TYPE, KEY)	CLASS TYPE __libc_tsd_##KEY##_data;
++#define __libc_tsd_address(TYPE, KEY) \
++  (TYPE *) __libc_maybe_call2 (pthread_internal_tsd_address,			\
+ 		      (_LIBC_TSD_KEY_##KEY), &__libc_tsd_##KEY##_data)
+-#define __libc_tsd_get(KEY) \
+-  __libc_maybe_call2 (pthread_internal_tsd_get,				\
++#define __libc_tsd_get(TYPE, KEY) \
++  (TYPE) __libc_maybe_call2 (pthread_internal_tsd_get,				\
+ 		      (_LIBC_TSD_KEY_##KEY), __libc_tsd_##KEY##_data)
+-#define __libc_tsd_set(KEY, VALUE) \
++#define __libc_tsd_set(TYPE, KEY, VALUE) \
+   __libc_maybe_call2 (pthread_internal_tsd_set,				\
+ 		      (_LIBC_TSD_KEY_##KEY, (VALUE)),			\
+ 		       (__libc_tsd_##KEY##_data = (VALUE), 0))