allow values for -m gcc options

Daniel Kroening · Daniel Kroening · commit 8416727b272c · 2016-05-03T14:37:12.000+01:00
diff --git a/src/goto-cc/gcc_cmdline.cpp b/src/goto-cc/gcc_cmdline.cpp
@@ -241,7 +241,15 @@ bool gcc_cmdlinet::parse(int argc, const char **argv)
     }
     else if(has_prefix(argv_i, "-m")) // m-options
     {
-      set(argv_i);
+      // these sometimes come with a value separated by '=', e.g., -march=cpu_type
+    
+      std::size_t equal_pos=argv_i.find('=');
+      
+      if(equal_pos==std::string::npos)
+        set(argv_i); // no value
+      else
+        set(std::string(argv_i, 0, equal_pos),
+            std::string(argv_i, equal_pos+1, std::string::npos));
     }
     else if(in_list(argv[i], gcc_options_without_argument)) // without argument
     {

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,15 @@ bool gcc_cmdlinet::parse(int argc, const char **argv)`
`241`	`241`	`}`
`242`	`242`	`else if(has_prefix(argv_i, "-m")) // m-options`
`243`	`243`	`{`
`244`		`- set(argv_i);`
	`244`	`+ // these sometimes come with a value separated by '=', e.g., -march=cpu_type`
	`245`	`+`
	`246`	`+ std::size_t equal_pos=argv_i.find('=');`
	`247`	`+`
	`248`	`+ if(equal_pos==std::string::npos)`
	`249`	`+ set(argv_i); // no value`
	`250`	`+ else`
	`251`	`+ set(std::string(argv_i, 0, equal_pos),`
	`252`	`+ std::string(argv_i, equal_pos+1, std::string::npos));`
`245`	`253`	`}`
`246`	`254`	`else if(in_list(argv[i], gcc_options_without_argument)) // without argument`
`247`	`255`	`{`