diff --git a/ChangeLog b/ChangeLog
index 2ebf0a2..626e3af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-16  Roland McGrath  <mcgrathr@google.com>
+
+	* config.sub (32eb, 32el, 64eb, 64el): New (pseudo-)CPUs.
+	(nacl): Grok as alias for 32el-unknown-nacl.
+	* testsuite/config.sub: Add tests for those cases.
+
 2011-08-14  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/config-sub.data: Sort.
diff --git a/config.sub b/config.sub
index f9fcdc8..63142cb 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-06-03'
+timestamp='2011-08-15'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -246,6 +246,7 @@ case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
+	| 32e[bl] | 64e[bl] \
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
@@ -351,6 +352,7 @@ case $basic_machine in
 		;;
 	# Recognize the basic CPU types with company name.
 	580-* \
+	| 32e[bl]-* | 64e[bl]-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
@@ -813,6 +815,10 @@ case $basic_machine in
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=32el-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 99a48f4..a880f00 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -1,3 +1,7 @@
+32eb-none			32eb-unknown-none
+32el-nacl			32el-unknown-nacl
+64eb-none			64eb-unknown-none
+64el-none			64el-unknown-none
 amd64-cygwin			x86_64-pc-cygwin
 amd64-kfreebsd5.4-gnu		x86_64-pc-kfreebsd5.4-gnu
 amd64-unknown-freebsd5.2	x86_64-unknown-freebsd5.2
@@ -102,6 +106,7 @@ ms1-elf				mt-unknown-elf
 ms1				mt-unknown-none
 mt-elf				mt-unknown-elf
 mt				mt-unknown-none
+nacl				32el-unknown-nacl
 nds32-elf			nds32-unknown-elf
 nds32le-elf			nds32le-unknown-elf
 nds32le				nds32le-unknown-none