diff options
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/Makefile | 6 | ||||
| -rw-r--r-- | libpthread/linuxthreads/attr.c | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads/weaks.c | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads/wrapsyscall.c | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/libpthread/Makefile b/libpthread/Makefile index 7edf34f66..c76b0a8cd 100644 --- a/libpthread/Makefile +++ b/libpthread/Makefile @@ -29,15 +29,15 @@ LIBTHREAD_DB_SHARED=libthread_db.so LIBTHREAD_DB_SHARED_FULLNAME=libthread_db-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so DIRS= -ifeq ($(strip $(INCLUDE_THREADS)),true) +ifeq ($(strip $(UCLIBC_HAS_THREADS)),y) DIRS+=linuxthreads -ifeq ($(strip $(DODEBUG)),true) +ifeq ($(strip $(DODEBUG)),y) DIRS+=linuxthreads_db endif endif GCC_LIB_DIR = $(dir $(shell $(CC) -print-libgcc-file-name )) -ifeq ($(strip $(DOPIC)),true) +ifeq ($(strip $(DOPIC)),y) START_FILES = $(TOPDIR)lib/crti.o $(GCC_LIB_DIR)crtbeginS.o END_FILES = $(GCC_LIB_DIR)crtendS.o $(TOPDIR)lib/crtn.o else diff --git a/libpthread/linuxthreads/attr.c b/libpthread/linuxthreads/attr.c index 2907a56a8..db5809cbc 100644 --- a/libpthread/linuxthreads/attr.c +++ b/libpthread/linuxthreads/attr.c @@ -50,7 +50,7 @@ int pthread_attr_init(pthread_attr_t *attr) /* uClibc: leave out this for now. */ #if DO_PTHREAD_VERSIONING_WITH_UCLIBC -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +#if defined __HAVE_ELF__ && defined PIC && defined DO_VERSIONING default_symbol_version (__pthread_attr_init_2_1, pthread_attr_init, GLIBC_2.1); int __pthread_attr_init_2_0(pthread_attr_t *attr) diff --git a/libpthread/linuxthreads/weaks.c b/libpthread/linuxthreads/weaks.c index 5281a2a5b..80ee11185 100644 --- a/libpthread/linuxthreads/weaks.c +++ b/libpthread/linuxthreads/weaks.c @@ -30,7 +30,7 @@ extern void __pthread_return_void __P ((void)); */ /* Those are pthread functions which return 0 if successful. */ -//#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +//#if defined __HAVE_ELF__ && defined PIC && defined DO_VERSIONING //weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_0) //symbol_version (__libc_pthread_attr_init_2_0, pthread_attr_init, GLIBC_2.0); //weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_1) diff --git a/libpthread/linuxthreads/wrapsyscall.c b/libpthread/linuxthreads/wrapsyscall.c index ba6d1b860..fa5b24dc4 100644 --- a/libpthread/linuxthreads/wrapsyscall.c +++ b/libpthread/linuxthreads/wrapsyscall.c @@ -90,7 +90,7 @@ CANCELABLE_SYSCALL (int, fsync, (int fd), (fd)) CANCELABLE_SYSCALL (off_t, lseek, (int fd, off_t offset, int whence), (fd, offset, whence)) -#ifdef __UCLIBC_HAVE_LFS__ +#ifdef __UCLIBC_HAS_LFS__ /* lseek64(2). */ CANCELABLE_SYSCALL (off64_t, lseek64, (int fd, off64_t offset, int whence), (fd, offset, whence)) @@ -112,7 +112,7 @@ CANCELABLE_SYSCALL_VA (int, open, (const char *pathname, int flags, ...), (pathname, flags, va_arg (ap, mode_t)), flags) -#ifdef __UCLIBC_HAVE_LFS__ +#ifdef __UCLIBC_HAS_LFS__ /* open64(3). */ CANCELABLE_SYSCALL_VA (int, open64, (const char *pathname, int flags, ...), (pathname, flags, va_arg (ap, mode_t)), flags) @@ -129,7 +129,7 @@ CANCELABLE_SYSCALL (ssize_t, pread, (int fd, void *buf, size_t count, (fd, buf, count, offset)) -#if defined __UCLIBC_HAVE_LFS__ && defined __NR_pread64 +#if defined __UCLIBC_HAS_LFS__ && defined __NR_pread64 /* pread64(3). */ CANCELABLE_SYSCALL (ssize_t, pread64, (int fd, void *buf, size_t count, off64_t offset), @@ -142,7 +142,7 @@ CANCELABLE_SYSCALL (ssize_t, pwrite, (int fd, const void *buf, size_t n, (fd, buf, n, offset)) -#if defined __UCLIBC_HAVE_LFS__ && defined __NR_pwrited64 +#if defined __UCLIBC_HAS_LFS__ && defined __NR_pwrited64 /* pwrite64(3). */ CANCELABLE_SYSCALL (ssize_t, pwrite64, (int fd, const void *buf, size_t n, off64_t offset), |