[commits] r10203 - in /trunk/libc: ChangeLog Makerules

[joseph@xxxxxxxxxx]

Author: joseph
Date: Wed Apr  7 06:59:13 2010
New Revision: 10203

Log:
Merge changes between r10195 and r10202 from /fsf/trunk.

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

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Wed Apr  7 06:59:13 2010
@@ -1,3 +1,7 @@
+2010-04-06  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* Makerules (libc-abis): Add $(..) to libc-abis.
+
 2010-04-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* Makerules (libc-abis): Fix search for libc-abis in add-ons.

Modified: trunk/libc/Makerules
==============================================================================
--- trunk/libc/Makerules (original)
+++ trunk/libc/Makerules Wed Apr  7 06:59:13 2010
@@ -114,7 +114,7 @@
 before-compile := $(common-objpfx)libc-abis.h $(before-compile)
 libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), \
 				    $(..)$D/libc-abis)) \
-			 libc-abis)
+			 $(..)libc-abis)
 $(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis $(libc-abis)
 	$(SHELL) $(..)scripts/gen-libc-abis \
 		 $(base-machine)-$(config-vendor)-$(config-os) \