[commits] r7778 - in /fsf/trunk/libc: ChangeLog Makeconfig

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Jan 23 00:03:03 2009
New Revision: 7778

Log:
Import glibc-mainline for 2009-01-23

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/Makeconfig

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Jan 23 00:03:03 2009
@@ -1,3 +1,8 @@
+2009-01-22  Roland McGrath  <roland@xxxxxxxxxx>
+
+	* Makeconfig (%.v.i): Strip trailing # comments,
+	not only whole-line comments.
+
 2009-01-10  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/generic/dl-osinfo.h (_dl_setup_stack_chk_guard): Take

Modified: fsf/trunk/libc/Makeconfig
==============================================================================
--- fsf/trunk/libc/Makeconfig (original)
+++ fsf/trunk/libc/Makeconfig Fri Jan 23 00:03:03 2009
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2003,2004,2005,2006,2007,2008
+# Copyright (C) 1991-2003,2004,2005,2006,2007,2008,2009
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -794,7 +794,8 @@
 # listing both its input files, and any header files that it may reference
 # (but no commands).
 %.v.i: $(common-objpfx)config.h
-	sed '/^[ 	]*#/d;s/^[ 	]*%/#/' $(filter-out FORCE %.h,$^) \
+	sed 's/#.*$$//;/^[ 	]*$$/d;s/^[ 	]*%/#/' \
+	    $(filter-out FORCE %.h,$^) \
 	| $(CC) -E -undef $(CPPFLAGS) -x assembler-with-cpp - \
 		   > $@T
 	mv -f $@T $@