From 8824d4aa66d0bf343eac5176ebd0f5601462b677 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 6 Apr 2010 17:32:29 -0700
Subject: [PATCH] Fix libc-abis handling for add-ons.

---
 ChangeLog | 4 ++++
 Makerules | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 48bdfecec4..71652e44d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
+
 2010-04-05  Thomas Schwinge  <thomas@schwinge.name>
 
 	* sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.
diff --git a/Makerules b/Makerules
index d5ff383770..debac299c2 100644
--- a/Makerules
+++ b/Makerules
@@ -111,7 +111,8 @@ endif # $(versioning) = yes
 
 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 \