about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-06-01 21:17:36 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-06-01 21:17:36 +0000
commit88a4576f50b0b7f71c28f7e3d37f8ac2016fa132 (patch)
tree9544d11e3915e889f121970f0d762389315ac5e8
parent402fe938f60c1f10700c8d0b673bf4a6dc2d1d40 (diff)
downloadglibc-88a4576f50b0b7f71c28f7e3d37f8ac2016fa132.tar.gz
glibc-88a4576f50b0b7f71c28f7e3d37f8ac2016fa132.tar.xz
glibc-88a4576f50b0b7f71c28f7e3d37f8ac2016fa132.zip
Remove unused default-abi definition in Makeconfig.
-rw-r--r--ChangeLog5
-rw-r--r--Makeconfig9
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8895cc1fb5..09ef682128 100644
--- 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 df7545fd71..cba5db7d23 100644
--- 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