cleanout

Author: Daniel Kroening

src/goto-cc/goto_cc_main.cpp

@@ -107,7 +107,7 @@ int main(int argc, const char **argv)
   {
     // this simulates "ld" for linking
     ld_cmdlinet cmdline;
-    ld_modet ld_mode(cmdline, base_name, true);
+    ld_modet ld_mode(cmdline, base_name);
     return ld_mode.main(argc, argv);
   }
   else if(base_name.find("goto-bcc")!=std::string::npos)

src/goto-cc/ld_mode.cpp

@@ -102,10 +102,8 @@ static std::string linker_name(
 
 ld_modet::ld_modet(
   goto_cc_cmdlinet &_cmdline,
-  const std::string &_base_name,
-  bool _produce_hybrid_binary):
+  const std::string &_base_name):
   goto_cc_modet(_cmdline, _base_name, gcc_message_handler),
-  produce_hybrid_binary(_produce_hybrid_binary),
   goto_binary_tmp_suffix(".goto-cc-saved"),
 
   // Keys are architectures specified in configt::set_arch().
@@ -302,8 +300,7 @@ ld_modet::ld_modet(
 /// does it.
 int ld_modet::doit()
 {
-  if(cmdline.isset('?') ||
-     cmdline.isset("help"))
+  if(cmdline.isset("help"))
   {
     help();
     return EX_OK;
@@ -313,95 +310,33 @@ int ld_modet::doit()
 
   auto default_verbosity = (cmdline.isset("Wall") || cmdline.isset("Wextra")) ?
     messaget::M_WARNING : messaget::M_ERROR;
+
   eval_verbosity(
     cmdline.get_value("verbosity"), default_verbosity, gcc_message_handler);
 
-  if((cmdline.isset('v') && cmdline.have_infile_arg()) ||
-     (cmdline.isset("version") && !produce_hybrid_binary))
-  {
-    // "-v" a) prints the version and b) increases verbosity.
-    // Compilation continues, don't exit!
-
-    std::cout << "GNU ld version 2.16.91 20050610 (goto-cc " CBMC_VERSION
-              << ")\n";
-  }
-
   compilet compiler(cmdline,
                     gcc_message_handler,
                     cmdline.isset("Werror") &&
                     cmdline.isset("Wextra") &&
                     !cmdline.isset("Wno-error"));
 
   if(cmdline.isset("version"))
-  {
-    if(produce_hybrid_binary)
-      return run_ld(compiler);
-
-    std::cout << '\n' <<
-      "Copyright (C) 2006-2014 Daniel Kroening, Christoph Wintersteiger\n" <<
-      "CBMC version: " CBMC_VERSION << '\n' <<
-      "Architecture: " << config.this_architecture() << '\n' <<
-      "OS: " << config.this_operating_system() << '\n';
-
-    return EX_OK; // Exit!
-  }
+    return run_ld(compiler);
 
   if(
     cmdline.isset("dumpmachine") || cmdline.isset("dumpspecs") ||
     cmdline.isset("dumpversion") || cmdline.isset("print-sysroot") ||
     cmdline.isset("print-sysroot-headers-suffix"))
   {
-    if(produce_hybrid_binary)
-      return run_ld(compiler);
-
-    // GCC will only print one of these, even when multiple arguments are
-    // passed, so we do the same
-    if(cmdline.isset("dumpmachine"))
-      std::cout << config.this_architecture() << '\n';
-    else if(cmdline.isset("dumpversion"))
-      std::cout << "3.4.4\n";
-
-    // we don't have any meaningful output for the other options, and GCC
-    // doesn't necessarily produce non-empty output either
-
-    return EX_OK;
+    return run_ld(compiler);
   }
 
-  if(produce_hybrid_binary)
-    debug() << "LD mode (hybrid)" << eom;
-  else
-    debug() << "LD mode" << eom;
-
   // determine actions to be undertaken
   compiler.mode=compilet::LINK_LIBRARY;
 
   // get configuration
   config.set(cmdline);
 
-  // Intel-specific
-  // in GCC, m16 is 32-bit (!), as documented here:
-  // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59672
-  if(cmdline.isset("m16") ||
-     cmdline.isset("m32") || cmdline.isset("mx32"))
-  {
-    config.ansi_c.arch="i386";
-    config.ansi_c.set_arch_spec_i386();
-  }
-  else if(cmdline.isset("m64"))
-  {
-    config.ansi_c.arch="x86_64";
-    config.ansi_c.set_arch_spec_x86_64();
-  }
-
-  // ARM-specific
-  if(cmdline.isset("mbig-endian") || cmdline.isset("mbig"))
-    config.ansi_c.endianness=configt::ansi_ct::endiannesst::IS_BIG_ENDIAN;
-  else if(cmdline.isset("little-endian") || cmdline.isset("mlittle"))
-    config.ansi_c.endianness=configt::ansi_ct::endiannesst::IS_LITTLE_ENDIAN;
-
-  if(cmdline.isset("mthumb") || cmdline.isset("mthumb-interwork"))
-    config.ansi_c.set_arch_spec_arm("armhf");
-
   // -mcpu sets both the arch and tune, but should only be used if
   // neither -march nor -mtune are passed on the command line.
   std::string target_cpu=
@@ -488,10 +423,7 @@ int ld_modet::doit()
 
   // We can generate hybrid ELF and Mach-O binaries
   // containing both executable machine code and the goto-binary.
-  if(produce_hybrid_binary)
-    return gcc_hybrid_binary(compiler);
-
-  return EX_OK;
+  return gcc_hybrid_binary(compiler);
 }
 
 int ld_modet::run_ld(const compilet &compiler)

src/goto-cc/ld_mode.h

@@ -29,14 +29,11 @@ class ld_modet:public goto_cc_modet
 
   ld_modet(
     goto_cc_cmdlinet &_cmdline,
-    const std::string &_base_name,
-    bool _produce_hybrid_binary);
+    const std::string &_base_name);
 
 protected:
   gcc_message_handlert gcc_message_handler;
 
-  const bool produce_hybrid_binary;
-
   std::string native_tool_name;
 
   const std::string goto_binary_tmp_suffix;