Description: Follow-up fix for preprocessing for x32
 .
 cbmc (5.9-4) unstable; urgency=low
 .
   * Fix preprocessing flags for non-x86 architectures
   * Fix copy&paste error in built-in library
   * Enable all hardening flags
Author: Michael Tautschnig <mt@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2018-07-04

--- cbmc-5.9.orig/src/ansi-c/c_preprocess.cpp
+++ cbmc-5.9/src/ansi-c/c_preprocess.cpp
@@ -552,8 +552,10 @@ bool c_preprocess_gcc_clang(
   }
   else if(config.ansi_c.pointer_width == 32)
   {
-    if(arch == "i386" || arch == "x86_64" || arch == "x32")
+    if(arch == "i386" || arch == "x86_64")
       command += " -m32";
+    else if(arch == "x32")
+      command += " -mx32";
     else if(has_prefix(id2string(arch), "mips"))
       command += " -mips32";
     else if(arch == "powerpc" || arch == "ppc64" || arch == "ppc64le")
