diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-07-23 22:10:27 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-07-23 22:10:27 +0000 |
commit | 1d2230a7d275706c5f0de850e15527aae3744310 (patch) | |
tree | 55f15700b16f705aa953d5c4051b2e63ca72041a /libpthread/linuxthreads_db | |
parent | 6fa52ec791e030081b7102f50222a13af7fa0d49 (diff) | |
download | uClibc-alpine-1d2230a7d275706c5f0de850e15527aae3744310.tar.bz2 uClibc-alpine-1d2230a7d275706c5f0de850e15527aae3744310.tar.xz |
Merge from trunk.
Diffstat (limited to 'libpthread/linuxthreads_db')
-rw-r--r-- | libpthread/linuxthreads_db/Makefile | 8 | ||||
-rw-r--r-- | libpthread/linuxthreads_db/td_thr_tls_get_addr.c | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads_db/Makefile index d10e3131b..66015be12 100644 --- a/libpthread/linuxthreads_db/Makefile +++ b/libpthread/linuxthreads_db/Makefile @@ -29,13 +29,11 @@ SYSDEPS_DIR:=$(TARGET_ARCH) endif # set up system dependencies include dirs (NOTE: order matters!) -SYSDEPINC = -I$(PTDIR)sysdeps/unix/sysv/linux \ - -I$(PTDIR)sysdeps/pthread \ - -I$(PTDIR)sysdeps/unix/sysv \ - -I$(PTDIR)sysdeps/unix/unix \ +PTDIR = $(TOPDIR)libpthread/linuxthreads/ +SYSDEPINC = -I$(PTDIR)sysdeps/pthread \ -I$(PTDIR)sysdeps/$(TARGET_ARCH) \ - -I$(PTDIR)sysdeps \ -I$(TOPDIR)libc/sysdeps/linux/$(TARGET_ARCH) +#CFLAGS += $(SSP_ALL_CFLAGS) CFLAGS += $(SYSDEPINC) -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\"" CSRC= td_init.c td_log.c td_ta_delete.c td_ta_get_nthreads.c \ diff --git a/libpthread/linuxthreads_db/td_thr_tls_get_addr.c b/libpthread/linuxthreads_db/td_thr_tls_get_addr.c index 330407482..e140b77dc 100644 --- a/libpthread/linuxthreads_db/td_thr_tls_get_addr.c +++ b/libpthread/linuxthreads_db/td_thr_tls_get_addr.c @@ -27,10 +27,10 @@ td_err_e -td_thr_tls_get_addr (const td_thrhandle_t *th __attribute_used__, - void *map_address __attribute_used__, - size_t offset __attribute_used__, - void **address __attribute_used__) +td_thr_tls_get_addr (const td_thrhandle_t *th __attribute__ ((unused)), + void *map_address __attribute__ ((unused)), + size_t offset __attribute__ ((unused)), + void **address __attribute__ ((unused))) { #if USE_TLS size_t modid; |