summaryrefslogtreecommitdiffstats
path: root/libpthread
diff options
context:
space:
mode:
Diffstat (limited to 'libpthread')
-rw-r--r--libpthread/Makefile.in2
-rw-r--r--libpthread/linuxthreads.old/specific.c2
-rw-r--r--libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h7
3 files changed, 6 insertions, 5 deletions
diff --git a/libpthread/Makefile.in b/libpthread/Makefile.in
index 4772cba32..bda935b5b 100644
--- a/libpthread/Makefile.in
+++ b/libpthread/Makefile.in
@@ -5,5 +5,7 @@
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
#
+ifneq ($(PTNAME),)
include $(PTDIR)/Makefile.in
include $(PTDIR)_db/Makefile.in
+endif
diff --git a/libpthread/linuxthreads.old/specific.c b/libpthread/linuxthreads.old/specific.c
index d8b5bb0b3..ae836055d 100644
--- a/libpthread/linuxthreads.old/specific.c
+++ b/libpthread/linuxthreads.old/specific.c
@@ -200,5 +200,5 @@ libc_internal_tsd_address (enum __libc_tsd_key_t key)
return &self->p_libc_specific[key];
}
void **(*const __libc_internal_tsd_address) (enum __libc_tsd_key_t key)
- __THROW __attribute__ ((__const__)) = libc_internal_tsd_address;
+ __attribute__ ((__const__)) = libc_internal_tsd_address;
#endif
diff --git a/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h
index efd0c83be..c152fddba 100644
--- a/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h
+++ b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h
@@ -40,11 +40,10 @@ enum __libc_tsd_key_t { _LIBC_TSD_KEY_MALLOC = 0,
#else
-extern void *(*__libc_internal_tsd_get) (enum __libc_tsd_key_t) __THROW;
-extern int (*__libc_internal_tsd_set) (enum __libc_tsd_key_t,
- __const void *) __THROW;
+extern void *(*__libc_internal_tsd_get) (enum __libc_tsd_key_t);
+extern int (*__libc_internal_tsd_set) (enum __libc_tsd_key_t, __const void *);
extern void **(*const __libc_internal_tsd_address) (enum __libc_tsd_key_t)
- __THROW __attribute__ ((__const__));
+ __attribute__ ((__const__));
#define __libc_tsd_address(KEY) \
(__libc_internal_tsd_address != NULL \