diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-03-16 08:51:34 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2008-03-16 08:51:34 +0000 |
| commit | e772b90e7e8190112a987f7c18c19a33766acfd0 (patch) | |
| tree | 4d1400da48cfc116476ffe69bd76d6f782759c4c /libpthread | |
| parent | 35201f6b3f772e03ce456d20605ba99f21e6a04a (diff) | |
| download | uClibc-alpine-e772b90e7e8190112a987f7c18c19a33766acfd0.tar.bz2 uClibc-alpine-e772b90e7e8190112a987f7c18c19a33766acfd0.tar.xz | |
Merge nptl branch tree with trunk.
Step 6: fix Makefiles to use $(VERSION) and the compiler-driver
for the link stage
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/linuxthreads.old/Makefile.in | 4 | ||||
| -rw-r--r-- | libpthread/linuxthreads.old_db/Makefile.in | 6 | ||||
| -rw-r--r-- | libpthread/linuxthreads/Makefile.in | 4 | ||||
| -rw-r--r-- | libpthread/linuxthreads_db/Makefile.in | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in index 9c152764f..6b1232c32 100644 --- a/libpthread/linuxthreads.old/Makefile.in +++ b/libpthread/linuxthreads.old/Makefile.in @@ -12,7 +12,7 @@ CFLAGS-linuxthreads.old := $(CFLAGS-dir_linuxthreads.old) $(SSP_ALL_CFLAGS) CFLAGS-libpthread/linuxthreads.old/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads.old) ifeq ($(PTHREADS_DEBUG_SUPPORT),y) -LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -z defs +LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs else LDFLAGS-libpthread.so := $(LDFLAGS) endif @@ -22,7 +22,7 @@ LIBS-libpthread.so := $(LIBS) $(ldso) START_FILE-libpthread.so := $(SHARED_START_FILES) END_FILE-libpthread.so := $(SHARED_END_FILES) -libpthread_FULL_NAME := libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so +libpthread_FULL_NAME := libpthread-$(VERSION).so libpthread_DIR := $(top_srcdir)libpthread/linuxthreads.old libpthread_OUT := $(top_builddir)libpthread/linuxthreads.old diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in index 96e1b9496..f0aa61f13 100644 --- a/libpthread/linuxthreads.old_db/Makefile.in +++ b/libpthread/linuxthreads.old_db/Makefile.in @@ -8,14 +8,14 @@ # Get the thread include dependencies and shared object name CFLAGS-linuxthreads.old_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\"" -LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(call check_ld,--warn-unresolved-symbols) +LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols) ifeq ($(DOSTRIP),y) -LDFLAGS-libthread_db.so += -s +LDFLAGS-libthread_db.so += -Wl,-s endif LIBS-libthread_db.so := $(LIBS) -libthread_db_FULL_NAME := libthread_db-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so +libthread_db_FULL_NAME := libthread_db-$(VERSION).so libthread_db_DIR := $(top_srcdir)libpthread/linuxthreads.old_db libthread_db_OUT := $(top_builddir)libpthread/linuxthreads.old_db diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index a5f52ec12..37ed96365 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -19,7 +19,7 @@ CFLAGS-libpthread/linuxthreads/sysdeps/pthread/ := $(CFLAGS-linuxthreads #CFLAGS:=$(CFLAGS:-O0=-O1) ifeq ($(PTHREADS_DEBUG_SUPPORT),y) -LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -z defs +LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs else LDFLAGS-libpthread.so := $(LDFLAGS) endif @@ -29,7 +29,7 @@ LIBS-libpthread.so := $(LIBS) $(ldso) START_FILE-libpthread.so := $(SHARED_START_FILES) END_FILE-libpthread.so := $(SHARED_END_FILES) -libpthread_FULL_NAME := libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so +libpthread_FULL_NAME := libpthread-$(VERSION).so libpthread_DIR := $(top_srcdir)libpthread/linuxthreads libpthread_OUT := $(top_builddir)libpthread/linuxthreads diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in index d6ad70085..87f20e208 100644 --- a/libpthread/linuxthreads_db/Makefile.in +++ b/libpthread/linuxthreads_db/Makefile.in @@ -8,14 +8,14 @@ # Get the thread include dependencies and shared object name CFLAGS-linuxthreads_db := -DNOT_IN_libc -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\"" -LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(call check_ld,--warn-unresolved-symbols) +LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols) ifeq ($(DOSTRIP),y) -LDFLAGS-libthread_db.so += -s +LDFLAGS-libthread_db.so += -Wl,-s endif LIBS-libthread_db.so := $(LIBS) -libthread_db_FULL_NAME := libthread_db-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so +libthread_db_FULL_NAME := libthread_db-$(VERSION).so libthread_db_DIR := $(top_srcdir)libpthread/linuxthreads_db libthread_db_OUT := $(top_builddir)libpthread/linuxthreads_db |