diff --git a/SConstruct b/SConstruct index ff3f7e3fe4f222c0d547f479a81baacebdaad195..c173b4402501cde7f4aaa6c89692c10b2f2e4366 100644 --- a/SConstruct +++ b/SConstruct @@ -8,7 +8,7 @@ env=Environment() # default build options env.Replace(CFLAGS=" -fPIC ") -env.Replace(CXXFLAGS=" -std=c++11 -fPIC ") +env.Replace(CXXFLAGS="-fPIC ") env.Replace(LINKFLAGS=" -fPIC ") # parse arguments diff --git a/include/zipr_impl.h b/include/zipr_impl.h index d7ee537ef2a4b2633a7af300853c51e960acb2d9..e5d5c9dc6e2061b975249b3c522e62fc8f7f05b5 100644 --- a/include/zipr_impl.h +++ b/include/zipr_impl.h @@ -31,7 +31,6 @@ #ifndef zipr_impl_h #define zipr_impl_h -#include <random> #include <climits> class Stats_t; @@ -45,7 +44,6 @@ class ZiprImpl_t : public Zipr_t elfiop(new ELFIO::elfio), start_of_new_space(0), memory_space(), - random_int_distribution(1,INT_MAX), m_zipr_options(argc-1, argv+1), m_output_filename("output", "b.out"), m_callbacks("callbacks"), @@ -54,7 +52,7 @@ class ZiprImpl_t : public Zipr_t m_verbose("verbose", true), m_variant("variant"), m_architecture("architecture"), - m_seed("seed", random_int_distribution(random_generator)) + m_seed("seed", 0) { Init(); }; @@ -174,10 +172,6 @@ class ZiprImpl_t : public Zipr_t std::map<libIRDB::Instruction_t*,DLFunctionHandle_t> plopping_plugins; - // For default seed generation. - std::default_random_engine random_generator; - std::uniform_int_distribution<int> random_int_distribution; - // Options ZiprOptions_t m_zipr_options; ZiprStringOption_t m_output_filename, m_callbacks, m_objcopy; diff --git a/src/plugin_man.cpp b/src/plugin_man.cpp index 2e3885e54fba30ff05bde8f5c0afddee28b0d29e..5e636b34d053b5f091776818cb796bbf1ec0c3d5 100644 --- a/src/plugin_man.cpp +++ b/src/plugin_man.cpp @@ -87,7 +87,7 @@ bool ZiprPluginManager_t::DoesPluginPlace(const RangeAddress_t &jump, const Doll for(m_handleList.begin();it!=m_handleList.end();++it) { ZiprPluginInterface_t* zpi=(ZiprPluginInterface_t*)*it; - if (Zipr_SDK::ZiprPreference::Must == zpi->PlopAddress(jump, dollop, place)) + if (Must == zpi->PlopAddress(jump, dollop, place)) { placer = zpi; return true; diff --git a/src/zipr.cpp b/src/zipr.cpp index 031a88cc4d1d058d5c0ec3d50bb16762249a8e8d..2210d393c2e2e8b4d6b51c106be3bf4eab05340b 100644 --- a/src/zipr.cpp +++ b/src/zipr.cpp @@ -2248,7 +2248,7 @@ void ZiprImpl_t::dump_map() // std::map<libIRDB::Instruction_t*,RangeAddress_t> final_insn_locations string filename="zipr.map"; // parameterize later. - std::ofstream ofs(filename, std::ofstream::out); + std::ofstream ofs(filename.c_str(), ios_base::out); ofs <<left<<setw(20)<<"ID" <<left<<setw(20)<<"OrigAddr" diff --git a/test/SConscript b/test/SConscript index 7bda378dbe9d17bea25a6295e1aeb7d2a31f0902..c65b3f22946d452d29ad36d11aed34b9d4443ece 100644 --- a/test/SConscript +++ b/test/SConscript @@ -49,7 +49,7 @@ libpath=''' ''' myenv.Append(CCFLAGS=" -Wall ") -myenv.Append(CXXFLAGS=" -g -O0 -std=c++11 ") +myenv.Append(CXXFLAGS=" -g -O0 ") myenv.Append(LINKFLAGS=" -Wl,-E ") # export all symbols