Description: Use __aarch64__ on arm64, not __arm64__ or __arm__
Author: Adam Conrad <adconrad@ubuntu.com>

Index: cbmc-4.5/src/util/config.cpp
===================================================================
--- cbmc-4.5.orig/src/util/config.cpp	2013-10-28 12:49:27.000000000 -0600
+++ cbmc-4.5/src/util/config.cpp	2013-10-28 12:50:45.055824802 -0600
@@ -395,9 +395,14 @@
   {
   case MODE_GCC_C:
   case MODE_GCC_CPP:
-    defines.push_back("__arm__");
-    if(subarch=="armhf")
-      defines.push_back("__ARM_PCS_VFP");
+    if(subarch=="arm64")
+      defines.push_back("__aarch64__");
+    else
+    {
+      defines.push_back("__arm__");
+      if(subarch=="armhf")
+        defines.push_back("__ARM_PCS_VFP");
+    }
     break;
   case MODE_VISUAL_STUDIO_C_CPP:
     defines.push_back("_M_ARM");
@@ -1055,7 +1060,7 @@
   this_arch="alpha";
   #elif __armel__
   this_arch="armel";
-  #elif __arm64__
+  #elif __aarch64__
   this_arch="arm64";
   #elif __arm__
     #ifdef __ARM_PCS_VFP
