Rebased PNaCl localmods in LLVM to 223109

autoconf/config.sub

Index: autoconf/config.sub
diff --git a/autoconf/config.sub b/autoconf/config.sub
index 673d62bfbf5b54270b39874f780696b4680e9984..00f5829aa4b7e880d662831db5c51032fa087641 100755
--- a/autoconf/config.sub
+++ b/autoconf/config.sub
@@ -239,6 +239,10 @@ case $os in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
+        -nacl*)
+                basic_machine=i686-pc
+                os=-nacl
+                ;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
@@ -348,6 +352,14 @@ case $basic_machine in
 	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
+        nacl64*)
+          basic_machine=x86_64-pc
+          os=-nacl
+          ;;
+        nacl*)
+          basic_machine=i686-pc
+          os=-nacl
+          ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -1366,6 +1378,9 @@ case $os in
 			;;
 		esac
 		;;
+        -nacl*)
+                os=-nacl
+                ;;
 	-nto-qnx*)
 		;;
 	-nto*)