--- a/common/autoconf/build-aux/config.sub	Thu Dec 11 15:05:06 2014 -0800
+++ b/common/autoconf/build-aux/config.sub	Thu Jan 15 15:12:38 2015 -0500
@@ -41,25 +41,8 @@
     case $1 in 
         -- )   # Stop option processing
             shift; break ;;
-        aarch64-gnu )
-            sub_args="$sub_args aarch64-unknown-gnu"
-            shift; ;;
-        aarch64-linux )
-            sub_args="$sub_args aarch64-unknown-linux-gnu"
-            shift; ;;
-        aarch64-*-linux )
-            os=`echo $1 | sed 's/aarch64-\(.*\)-linux/\1/'`
-            config="aarch64-unknown-linux-gnu"
-            sub_args="$sub_args $config"
-            shift; ;;
-        aarch64-*-gnu )
-            os=`echo $1 | sed 's/aarch64-\(.*\)-gnu.*$/\1/'`
-            config="aarch64-unknown-gnu"
-            sub_args="$sub_args $config"
-            shift; ;;
-        aarch64-*-linux-* )
-            os=`echo $1 | sed 's/aarch64-\(.*\)-linux-.*$/'`
-            config="aarch64-unknown-linux-gnu"
+        aarch64-* )
+            config=`echo $1 | sed 's/^aarch64-/arm-/'`
             sub_args="$sub_args $config"
             shift; ;;
         - )    # Use stdin as input.
@@ -74,9 +57,7 @@
 result=`. $DIR/autoconf-config.sub $sub_args "$@"`
 exitcode=$?
 
-if [ "x$os" != "x" ] ; then
-    result=`echo $result | sed "s/-unknown-/-$os-/"`
-fi
+result=`echo $result | sed "s/^arm-/aarch64-/"`
 
 echo $result
 exit $exitcode