summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/build/linker/linker.C16
-rw-r--r--src/build/mkrules/cflags.env.mk2
-rw-r--r--src/makefile3
-rw-r--r--src/usr/errl/runtime/test/test_runtimeDeconfig.H12
-rw-r--r--src/usr/fapi2/test/fapi2GetChildrenTest.H2
-rw-r--r--src/usr/isteps/istep16/call_mss_scrub.C2
-rw-r--r--src/usr/isteps/tod/runtime/rt_todintf.C2
7 files changed, 11 insertions, 28 deletions
diff --git a/src/build/linker/linker.C b/src/build/linker/linker.C
index ba498d8a9..e5e53ad8a 100644
--- a/src/build/linker/linker.C
+++ b/src/build/linker/linker.C
@@ -123,7 +123,6 @@ 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
@@ -595,11 +594,6 @@ 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))
{
@@ -654,16 +648,6 @@ 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 e1d36c190..04ff6fedd 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 ?= -Os
+OPT_LEVEL ?= -O3
ifdef MODULE
COMMONFLAGS += -fPIC -Bsymbolic -Bsymbolic-functions
diff --git a/src/makefile b/src/makefile
index f71f38f1c..1a79d473c 100644
--- a/src/makefile
+++ b/src/makefile
@@ -236,8 +236,7 @@ TESTCASE_MODULES += testscan
TESTCASE_MODULES += testsecureboot
TESTCASE_MODULES += testfsiscom
TESTCASE_MODULES += testlpc
-#TODO: RTC 213102 to properly add & execute HTMGT test
-#TESTCASE_MODULES += $(if $(CONFIG_HTMGT),testhtmgt)
+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 0cf1a0a52..a9ba1ecbd 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 = nullptr;
- l_errl = HWAS::theDeconfigGard().deconfigureTargetAtRuntime(
+ errlHndl_t 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 = nullptr;
- l_errl = HWAS::theDeconfigGard().deconfigureTargetAtRuntime(
+ errlHndl_t 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 = nullptr;
- l_errl = HWAS::theDeconfigGard().deconfigureTargetAtRuntime(
+ errlHndl_t l_errl =
+ HWAS::theDeconfigGard().deconfigureTargetAtRuntime(
l_target,
HWAS::DeconfigGard::FULLY_AT_RUNTIME,
l_errl);
diff --git a/src/usr/fapi2/test/fapi2GetChildrenTest.H b/src/usr/fapi2/test/fapi2GetChildrenTest.H
index c0a1e5eab..9eb595dcd 100644
--- a/src/usr/fapi2/test/fapi2GetChildrenTest.H
+++ b/src/usr/fapi2/test/fapi2GetChildrenTest.H
@@ -706,7 +706,7 @@ void test_fapi2GetChildren()
TARGET_STATE_PRESENT).size(); } },
};
- pervasiveChildTestRec* ptr = nullptr;
+ pervasiveChildTestRec* ptr;
int numPervTests = 0;
TARGETING::ATTR_MODEL_type l_model = l_proc->getAttr<TARGETING::ATTR_MODEL>();
if (l_model == TARGETING::MODEL_NIMBUS)
diff --git a/src/usr/isteps/istep16/call_mss_scrub.C b/src/usr/isteps/istep16/call_mss_scrub.C
index f200b09fa..b314cea3b 100644
--- a/src/usr/isteps/istep16/call_mss_scrub.C
+++ b/src/usr/isteps/istep16/call_mss_scrub.C
@@ -81,7 +81,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 = TYPE_MBA;
+ TARGETING::TYPE maintTrgtType;
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 e5c537cd3..cc0bdb7cf 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 <errl/errlentry.H>
+#include <errlmanager_common.C> // errlCommit
using namespace ERRORLOG;
OpenPOWER on IntegriCloud