[Glibc-bsd-commits] r4510 - in trunk/glibc-ports: . linuxthreads

[Petr Salinger]

Author: ps-guest
Date: 2013-05-31 07:12:29 +0000 (Fri, 31 May 2013)
New Revision: 4510

Modified:
   trunk/glibc-ports/TODO.linuxthreads
   trunk/glibc-ports/linuxthreads/Makefile
   trunk/glibc-ports/linuxthreads/tst-stackguard1.c
Log:
elf is mandatory, crti and crtn are provided as separate source files
(kfreebsd/local-linuxthreads-initfini.diff, kfreebsd/local-linuxthreads-stackguard.diff)



Modified: trunk/glibc-ports/TODO.linuxthreads
===================================================================
--- trunk/glibc-ports/TODO.linuxthreads	2013-05-30 18:07:23 UTC (rev 4509)
+++ trunk/glibc-ports/TODO.linuxthreads	2013-05-31 07:12:29 UTC (rev 4510)
@@ -18,6 +18,8 @@
 kfreebsd/local-linuxthreads-TLS-THREAD.diff
 kfreebsd/local-linuxthreads-ctype_init.diff
 kfreebsd/local-pthread_at_fork
+kfreebsd/local-linuxthreads-initfini.diff
+kfreebsd/local-linuxthreads-stackguard.diff
 
 TODO:
 
@@ -27,9 +29,7 @@
 any/local-linuxthreads-tst-sighandler.diff
 any/local-linuxthreads-weak.diff
 
-kfreebsd/local-linuxthreads-initfini.diff
 kfreebsd/local-linuxthreads-mutex-initializer.diff
-kfreebsd/local-linuxthreads-stackguard.diff
 kfreebsd/local-linuxthreads29.diff
 
 kfreebsd/local-config_h_in.patch

Modified: trunk/glibc-ports/linuxthreads/Makefile
===================================================================
--- trunk/glibc-ports/linuxthreads/Makefile	2013-05-30 18:07:23 UTC (rev 4509)
+++ trunk/glibc-ports/linuxthreads/Makefile	2013-05-31 07:12:29 UTC (rev 4510)
@@ -94,12 +94,9 @@
 generated-dirs := $(firstword $(subst /, , $(multidir)))
 crti-objs += $(multidir)/crti.o
 crtn-objs += $(multidir)/crtn.o
-omit-deps += $(multidir)/crti $(multidir)/crtn
 endif
 extra-objs += $(crti-objs) $(crtn-objs)
-omit-deps += crti crtn
-
-CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time)
+extra-objs += pt-crti.o
 endif
 
 librt-tests = ex10 ex11 tst-clock1
@@ -230,7 +227,7 @@
 # a statically-linked program that hasn't already loaded it.
 # Depend on ld.so too to get proper versions of ld.so symbols.
 $(objpfx)libpthread.so: $(libc-link.so) $(common-objpfx)libc_nonshared.a \
-			$(if $(filter yes,$(elf)), $(elfobjdir)/ld.so)
+			$(elfobjdir)/ld.so
 
 # Make sure we link with the thread library.
 ifeq ($(build-shared),yes)
@@ -261,33 +258,10 @@
 endif
 
 ifeq ($(build-shared),yes)
-vpath pt-initfini.c $(sysdirs)
 
-$(objpfx)pt-initfini.s: pt-initfini.c
-	$(compile.c) -S $(CFLAGS-pt-initfini.s) -finhibit-size-directive \
-		$(patsubst -f%,-fno-%,$(exceptions)) -o $@
+$(objpfx)crti.o: $(objpfx)pt-crti.o
+	ln -f $< $@
 
-# We only have one kind of startup code files.  Static binaries and
-# shared libraries are build using the PIC version.
-$(objpfx)crti.S: $(objpfx)pt-initfini.s
-	sed -n -e '1,/@HEADER_ENDS/p' \
-	       -e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \
-	       -e '/@TRAILER_BEGINS/,$$p' $< > $@
-$(objpfx)crtn.S: $(objpfx)pt-initfini.s
-	sed -n -e '1,/@HEADER_ENDS/p' \
-	       -e '/@_.*_EPILOG_BEGINS/,/@_.*_EPILOG_ENDS/p' \
-	       -e '/@TRAILER_BEGINS/,$$p' $< > $@
-
-$(objpfx)defs.h: $(objpfx)pt-initfini.s
-	sed -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \
-		$(AWK) -f ../csu/defs.awk > $@
-
-$(objpfx)crti.o: $(objpfx)crti.S $(objpfx)defs.h
-	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
-
-$(objpfx)crtn.o: $(objpfx)crtn.S $(objpfx)defs.h
-	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
-
 ifneq ($(multidir),.)
 $(objpfx)$(multidir):
 	@mkdir -p $(objpfx)$(multidir)
@@ -299,7 +273,7 @@
 	ln -f $< $@
 endif
 
-generated += crti.S crtn.S defs.h pt-initfini.s libpthread_nonshared.a
+generated += libpthread_nonshared.a
 endif
 
 ifeq (yes,$(build-static-nss))

Modified: trunk/glibc-ports/linuxthreads/tst-stackguard1.c
===================================================================
--- trunk/glibc-ports/linuxthreads/tst-stackguard1.c	2013-05-30 18:07:23 UTC (rev 4509)
+++ trunk/glibc-ports/linuxthreads/tst-stackguard1.c	2013-05-31 07:12:29 UTC (rev 4510)
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
-#include <elf/stackguard-macros.h>
+#include <stackguard-macros.h>
 #include <unistd.h>
 
 static const char *command;