diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-25 16:35:30 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-25 16:35:30 +0000 |
| commit | 8a8d4b95c50316e31c15b68ed349233d5db28292 (patch) | |
| tree | 585c088bb8df4739f5db46e63c854477083b9f84 /libpthread/linuxthreads | |
| parent | 6622bc38bc3ed737fbd41e1c620a2dc27f1376f7 (diff) | |
| download | uClibc-alpine-8a8d4b95c50316e31c15b68ed349233d5db28292.tar.bz2 uClibc-alpine-8a8d4b95c50316e31c15b68ed349233d5db28292.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libpthread/linuxthreads')
| -rw-r--r-- | libpthread/linuxthreads/Makefile | 4 | ||||
| -rw-r--r-- | libpthread/linuxthreads/Makefile.in | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads/Makefile index f92f205a5..f9100219a 100644 --- a/libpthread/linuxthreads/Makefile +++ b/libpthread/linuxthreads/Makefile @@ -5,9 +5,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -TOPDIR=../../ - -top_srcdir=$(TOPDIR) +top_srcdir=../../ top_builddir=../../ include $(top_builddir)Rules.mak all: libs diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index fc3b0b0bd..66f5ac544 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -6,7 +6,8 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CFLAGS-linuxthreads := -DNOT_IN_libc -DIS_IN_libpthread $(SSP_ALL_CFLAGS) +CFLAGS-dir_linuxthreads := -DNOT_IN_libc -DIS_IN_libpthread +CFLAGS-linuxthreads := $(CFLAGS-dir_linuxthreads) $(SSP_ALL_CFLAGS) CFLAGS-libpthread/linuxthreads/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads) CFLAGS-libpthread/linuxthreads/sysdeps/unix/sysv/linux/ := $(CFLAGS-linuxthreads) @@ -57,10 +58,10 @@ libpthread_OBJ := $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.o,$(libpt # # Stuff that goes into libc.so, not libpthread.so # -#CFLAGS-alloca_cutoff.c := -DIS_IN_libc -CFLAGS-forward.c := -DIS_IN_libc -CFLAGS-libc-cancellation.c := -DIS_IN_libc -CFLAGS-libc_pthread_init.c := -DIS_IN_libc +#CFLAGS-OMIT-alloca_cutoff.c := $(CFLAGS-dir_linuxthreads) +CFLAGS-OMIT-forward.c := $(CFLAGS-dir_linuxthreads) +CFLAGS-OMIT-libc-cancellation.c := $(CFLAGS-dir_linuxthreads) +CFLAGS-OMIT-libc_pthread_init.c := $(CFLAGS-dir_linuxthreads) libpthread_libc_CSRC := \ forward.c libc-cancellation.c libc_pthread_init.c # alloca_cutoff.c libpthread_libc_OBJ := $(patsubst %.c, $(libpthread_OUT)/%.o,$(libpthread_libc_CSRC)) |