Remove unused default-abi definition in Makeconfig.

diff --git a/ChangeLog b/ChangeLog
index 8895cc1fb5023f62638230ee19af29fb8264add6..09ef6821287137fb1c27aa2603aed3f9dc859610 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-01  Joseph Myers  <joseph@codesourcery.com>
+
+       * Makeconfig [abi-variants && !default-abi] (default-abi): Remove
+       definition.  Document in comment.
+
 2012-06-01  David S. Miller  <davem@davemloft.net>
 
        * stdlib/longlong.h: Updated from GCC.

diff --git a/Makeconfig b/Makeconfig
index df7545fd71e40dcf0ea5268ec820a7566b05e8fc..cba5db7d23728dcf1773ef70858a33b97b97c154 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -797,13 +797,8 @@ ifeq (yes, $(build-shared))
 # defines abi-$(variant)-condition to be the condition for those options
 # to use in a C #if condition.  abi-includes may be defined to a list of
 # headers to include in the generated header, if the default does not
-# suffice.
-
-ifdef abi-variants
-ifndef default-abi
-default-abi = $(firstword $(abi-variants))
-endif
-endif
+# suffice.  default-abi is defined to be the ABI for the current glibc
+# build.
 
 ifndef abi-includes
 abi-includes := bits/wordsize.h