[commits] r10190 - in /fsf/trunk/libc: ChangeLog Makerules

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Apr  7 00:03:44 2010
New Revision: 10190

Log:
Import glibc-mainline for 2010-04-07

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/Makerules

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Apr  7 00:03:44 2010
@@ -1,3 +1,7 @@
+2010-04-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
+
 2010-04-05  Thomas Schwinge  <thomas@xxxxxxxxxxxxx>
 
 	* sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.

Modified: fsf/trunk/libc/Makerules
==============================================================================
--- fsf/trunk/libc/Makerules (original)
+++ fsf/trunk/libc/Makerules Wed Apr  7 00:03:44 2010
@@ -111,7 +111,8 @@
 
 ifndef avoid-generated
 before-compile := $(common-objpfx)libc-abis.h $(before-compile)
-libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), $(..)libc-abis)) \
+libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), \
+				    $(..)$D/libc-abis)) \
 			 libc-abis)
 $(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis $(libc-abis)
 	$(SHELL) $(..)scripts/gen-libc-abis \