about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--NEWS2
-rwxr-xr-xconfigure5
-rw-r--r--configure.in5
4 files changed, 4 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b06a650db..66a1075ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-01-07  Ulrich Drepper  <drepper@gmail.com>
 
+	[BZ #13555]
+	* configure.in: Remove entries for unsupported architectures.
+
 	[BZ #13533]
 	* iconv/gconv_builtin.h: Use CHAR16 for the char16_t conversions.
 	* iconv/gconv_simple.c: Rename char16_t routines.  Add char16_t<->utf8
diff --git a/NEWS b/NEWS
index 6d40d85733..427cb2dd23 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.16
 
 * The following bugs are resolved with this release:
 
-  13526, 13527, 13528, 13529, 13531, 13532, 13533, 13547
+  13526, 13527, 13528, 13529, 13531, 13532, 13533, 13547, 13555
 
 * ISO C11 support:
 
diff --git a/configure b/configure
index c22ed3807b..ff680c4e57 100755
--- a/configure
+++ b/configure
@@ -4045,13 +4045,8 @@ fi
 # type and particular chip.  If an add-on configure fragment already set
 # base_machine, we don't change it.
 test -n "$base_machine" || case "$machine" in
-a29k | am29000)	base_machine=a29k machine=a29k ;;
-c3[012])	base_machine=cx0 machine=cx0/c30 ;;
-c4[04])		base_machine=cx0 machine=cx0/c40 ;;
 i[34567]86)	base_machine=i386 machine=i386/$machine ;;
 ia64)		base_machine=ia64 machine=ia64 ;;
-m88???)		base_machine=m88k machine=m88k/$machine ;;
-m88k)		base_machine=m88k machine=m88k/m88100 ;;
 powerpc)	base_machine=powerpc machine=powerpc/powerpc32 ;;
 powerpc64)	base_machine=powerpc machine=powerpc/powerpc64 ;;
 s390)           base_machine=s390 machine=s390/s390-32 ;;
diff --git a/configure.in b/configure.in
index 2c4fc97df8..b998c4792c 100644
--- a/configure.in
+++ b/configure.in
@@ -532,13 +532,8 @@ changequote(,)dnl
 # type and particular chip.  If an add-on configure fragment already set
 # base_machine, we don't change it.
 test -n "$base_machine" || case "$machine" in
-a29k | am29000)	base_machine=a29k machine=a29k ;;
-c3[012])	base_machine=cx0 machine=cx0/c30 ;;
-c4[04])		base_machine=cx0 machine=cx0/c40 ;;
 i[34567]86)	base_machine=i386 machine=i386/$machine ;;
 ia64)		base_machine=ia64 machine=ia64 ;;
-m88???)		base_machine=m88k machine=m88k/$machine ;;
-m88k)		base_machine=m88k machine=m88k/m88100 ;;
 powerpc)	base_machine=powerpc machine=powerpc/powerpc32 ;;
 powerpc64)	base_machine=powerpc machine=powerpc/powerpc64 ;;
 s390)           base_machine=s390 machine=s390/s390-32 ;;