[commits] r7013 - in /trunk/libc: ChangeLog.eglibc csu/Makefile nptl/Makefile

[joseph@xxxxxxxxxx]

Author: joseph
Date: Wed Sep 24 14:17:25 2008
New Revision: 7013

Log:
	* csu/Makefile ($(objpfx)crti.S, $(objpfx)crtn.S): Remove .file
	lines from generated .S file.
	* nptl/Makefile ($(objpfx)crti.S, $(objpfx)crtn.S): Remove .file
	lines from generated .S file.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/csu/Makefile
    trunk/libc/nptl/Makefile

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Wed Sep 24 14:17:25 2008
@@ -1,3 +1,10 @@
+2008-09-24  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* csu/Makefile ($(objpfx)crti.S, $(objpfx)crtn.S): Remove .file
+	lines from generated .S file.
+	* nptl/Makefile ($(objpfx)crti.S, $(objpfx)crtn.S): Remove .file
+	lines from generated .S file.
+
 2008-09-08  Pete Eberlein  <eberlein@xxxxxxxxxx>
 
 	* elf/ldd.bash.in: Make pipefail check more robust when using

Modified: trunk/libc/csu/Makefile
==============================================================================
--- trunk/libc/csu/Makefile (original)
+++ trunk/libc/csu/Makefile Wed Sep 24 14:17:25 2008
@@ -104,12 +104,12 @@
 # We only have one kind of startup code files.	Static binaries and
 # shared libraries are build using the PIC version.
 $(objpfx)crti.S: $(objpfx)initfini.s
-	sed -n -e '1,/@HEADER_ENDS/p' \
+	sed -n -e '/^[ 	]*\.file[ 	]/d' -e '1,/@HEADER_ENDS/p' \
 	       -e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \
 	       -e '/@TRAILER_BEGINS/,$$p' $< > $@
 
 $(objpfx)crtn.S: $(objpfx)initfini.s
-	sed -n -e '1,/@HEADER_ENDS/p' \
+	sed -n -e '/^[ 	]*\.file[ 	]/d' -e '1,/@HEADER_ENDS/p' \
 	       -e '/@_.*_EPILOG_BEGINS/,/@_.*_EPILOG_ENDS/p' \
 	       -e '/@TRAILER_BEGINS/,$$p' $< > $@
 

Modified: trunk/libc/nptl/Makefile
==============================================================================
--- trunk/libc/nptl/Makefile (original)
+++ trunk/libc/nptl/Makefile Wed Sep 24 14:17:25 2008
@@ -564,11 +564,11 @@
 # 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' \
+	sed -n -e '/^[ 	]*\.file[ 	]/d' -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' \
+	sed -n -e '/^[ 	]*\.file[ 	]/d' -e '1,/@HEADER_ENDS/p' \
 	       -e '/@_.*_EPILOG_BEGINS/,/@_.*_EPILOG_ENDS/p' \
 	       -e '/@TRAILER_BEGINS/,$$p' $< > $@