[prev in list] [next in list] [prev in thread] [next in thread] 

List:       uclibc-cvs
Subject:    [uClibc-cvs] CVS uClibc/libpthread
From:       vapier () codepoet ! org (CVS User vapier)
Date:       2004-12-26 2:01:02
Message-ID: 20041226090100.18984B4031 () codepoet ! org
[Download RAW message or body]

Update of /var/cvs/uClibc/libpthread
In directory nail:/tmp/cvs-serv29417

Modified Files:
	Makefile 
Log Message:
Peter S. Mazinger: make sure the ld RELRO and NOW options are independent options

--- /var/cvs/uClibc/libpthread/Makefile	2004/12/22 22:35:31	1.36
+++ /var/cvs/uClibc/libpthread/Makefile	2004/12/26 09:00:59	1.37
@@ -34,18 +34,24 @@
 ifeq ($(strip $(UCLIBC_HAS_THREADS)),y)
 	DIRS+=linuxthreads
 	LDFLAGS_THREAD:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc -z defs
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	DIRS+=linuxthreads_db
-	LDFLAGS_THREAD_DB:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
 ifeq ($(UCLIBC_BUILD_RELRO),y)
 	LDFLAGS_THREAD+=-z relro
 endif
 ifeq ($(UCLIBC_BUILD_NOW),y)
 	LDFLAGS_THREAD+=-z now
 endif
+ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
+	DIRS+=linuxthreads_db
+	LDFLAGS_THREAD_DB:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
 endif
 ifeq ($(DODEBUG),n)
 	LDFLAGS_THREAD_DB+=-s
+ifeq ($(UCLIBC_BUILD_RELRO),y)
+       LDFLAGS_THREAD_DB+=-z relro
+endif
+ifeq ($(UCLIBC_BUILD_NOW),y)
+       LDFLAGS_THREAD_DB+=-z now
+endif
 endif
 endif
 

[prev in list] [next in list] [prev in thread] [next in thread]