diff options
| -rw-r--r-- | src/build/linker/linker.C | 16 | ||||
| -rw-r--r-- | src/build/mkrules/cflags.env.mk | 2 | ||||
| -rw-r--r-- | src/makefile | 3 | ||||
| -rw-r--r-- | src/usr/errl/runtime/test/test_runtimeDeconfig.H | 12 | ||||
| -rw-r--r-- | src/usr/isteps/istep16/call_mss_scrub.C | 2 | ||||
| -rw-r--r-- | src/usr/isteps/tod/runtime/rt_todintf.C | 2 |
6 files changed, 27 insertions, 10 deletions
diff --git a/src/build/linker/linker.C b/src/build/linker/linker.C index e5e53ad8a..ba498d8a9 100644 --- a/src/build/linker/linker.C +++ b/src/build/linker/linker.C @@ -123,6 +123,7 @@ struct Object string name; //!< full path name of file bfd* image; //!< bfd image of object Section text; //!< text section of binary + Section sfpr; //!< sfpr section of binary Section rodata; //!< rodata section of binary Section data; //!< data section of binary map<string, Symbol> symbols; //!< symbol map @@ -594,6 +595,11 @@ bool Object::read_object(const char* i_file) { s = &this->text; } + else if (string(".sfpr") == + bfd_get_section_name(image, image_section)) + { + s = &this->sfpr; + } else if (string(".rodata") == bfd_get_section_name(image, image_section)) { @@ -648,6 +654,16 @@ bool Object::write_object() cout << strerror(error) << endl; } + // Output sfpr section. + fseek(iv_output, offset + sfpr.vma_offset, SEEK_SET); + if ((0 != sfpr.size) && + (sfpr.size != fwrite(sfpr.data, 1, sfpr.size, iv_output))) + { + int error = errno; + cout << "Error writing to output for sfpr." << endl; + cout << strerror(error) << endl; + } + // Output RODATA section. fseek(iv_output, offset + rodata.vma_offset, SEEK_SET); if ((0 != rodata.size) && diff --git a/src/build/mkrules/cflags.env.mk b/src/build/mkrules/cflags.env.mk index 04ff6fedd..e1d36c190 100644 --- a/src/build/mkrules/cflags.env.mk +++ b/src/build/mkrules/cflags.env.mk @@ -28,7 +28,7 @@ # Description: # Configuration of the compiler, linker, etc. flags. -OPT_LEVEL ?= -O3 +OPT_LEVEL ?= -Os ifdef MODULE COMMONFLAGS += -fPIC -Bsymbolic -Bsymbolic-functions diff --git a/src/makefile b/src/makefile index bd80d63bf..f8343555b 100644 --- a/src/makefile +++ b/src/makefile @@ -237,7 +237,8 @@ TESTCASE_MODULES += testscan TESTCASE_MODULES += testsecureboot TESTCASE_MODULES += testfsiscom TESTCASE_MODULES += testlpc -TESTCASE_MODULES += $(if $(CONFIG_HTMGT),testhtmgt) +#TODO: RTC 213102 to properly add & execute HTMGT test +#TESTCASE_MODULES += $(if $(CONFIG_HTMGT),testhtmgt) TESTCASE_MODULES += testinitservice TESTCASE_MODULES += testfsi TESTCASE_MODULES += testibscom diff --git a/src/usr/errl/runtime/test/test_runtimeDeconfig.H b/src/usr/errl/runtime/test/test_runtimeDeconfig.H index a9ba1ecbd..0cf1a0a52 100644 --- a/src/usr/errl/runtime/test/test_runtimeDeconfig.H +++ b/src/usr/errl/runtime/test/test_runtimeDeconfig.H @@ -51,8 +51,8 @@ class deconfigureTargetAtRuntimeTest : public CxxTest::TestSuite // pass in a null target pointer TARGETING::Target * l_target = nullptr; - errlHndl_t l_errl = - HWAS::theDeconfigGard().deconfigureTargetAtRuntime( + errlHndl_t l_errl = nullptr; + l_errl = HWAS::theDeconfigGard().deconfigureTargetAtRuntime( l_target, HWAS::DeconfigGard::FULLY_AT_RUNTIME, l_errl); @@ -118,8 +118,8 @@ class deconfigureTargetAtRuntimeTest : public CxxTest::TestSuite l_target = l_cores.at(0); - errlHndl_t l_errl = - HWAS::theDeconfigGard().deconfigureTargetAtRuntime( + errlHndl_t l_errl = nullptr; + l_errl = HWAS::theDeconfigGard().deconfigureTargetAtRuntime( l_target, HWAS::DeconfigGard::SPEC_DECONFIG, l_errl); @@ -179,8 +179,8 @@ class deconfigureTargetAtRuntimeTest : public CxxTest::TestSuite TARGETING::Target * l_target = l_proc.at(0); - errlHndl_t l_errl = - HWAS::theDeconfigGard().deconfigureTargetAtRuntime( + errlHndl_t l_errl = nullptr; + l_errl = HWAS::theDeconfigGard().deconfigureTargetAtRuntime( l_target, HWAS::DeconfigGard::FULLY_AT_RUNTIME, l_errl); diff --git a/src/usr/isteps/istep16/call_mss_scrub.C b/src/usr/isteps/istep16/call_mss_scrub.C index 750a85c01..0d4db2acd 100644 --- a/src/usr/isteps/istep16/call_mss_scrub.C +++ b/src/usr/isteps/istep16/call_mss_scrub.C @@ -73,7 +73,7 @@ void* call_mss_scrub (void *io_pArgs) // Determine which target type runs the maintenance commands. TARGETING::MODEL masterProcModel = masterProc->getAttr<ATTR_MODEL>(); - TARGETING::TYPE maintTrgtType; + TARGETING::TYPE maintTrgtType = TYPE_MBA; switch ( masterProcModel ) { case MODEL_CUMULUS: maintTrgtType = TYPE_MBA; break; diff --git a/src/usr/isteps/tod/runtime/rt_todintf.C b/src/usr/isteps/tod/runtime/rt_todintf.C index cc0bdb7cf..e5c537cd3 100644 --- a/src/usr/isteps/tod/runtime/rt_todintf.C +++ b/src/usr/isteps/tod/runtime/rt_todintf.C @@ -31,7 +31,7 @@ #include <runtime/interface.h> // g_hostInterfaces #include <util/runtime/rt_fwreq_helper.H> // firmware_request_helper #include <tod_init_reasoncodes.H> // TOD_RT_TOPOLOGY_RESET_BACKUP, etc -#include <errlmanager_common.C> // errlCommit +#include <errl/errlentry.H> using namespace ERRORLOG; |
