summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2014-09-27 09:08:34 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2014-09-27 09:08:34 -0400
commitdeb2200671d5b4856ca27d4286253db0d9e12a32 (patch)
tree9d626092cfc02b2841a4a2ae9c0dbddd62e768fc /src
parent4836aef1e4ab80ce9b11c6c4385c167b503bc782 (diff)
downloadgem5-deb2200671d5b4856ca27d4286253db0d9e12a32.tar.xz
scons: Address issues related to gcc 4.9.1
Fix a number few minor issues to please gcc 4.9.1. Removing the '-fuse-linker-plugin' flag means no libraries are part of the LTO process, but hopefully this is an acceptable loss, as the flag causes issues on a lot of systems (only certain combinations of gcc, ld and ar work).
Diffstat (limited to 'src')
-rwxr-xr-xsrc/arch/isa_parser.py4
-rw-r--r--src/cpu/checker/cpu.cc4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py
index 87e02cb31..aa773ae80 100755
--- a/src/arch/isa_parser.py
+++ b/src/arch/isa_parser.py
@@ -856,7 +856,9 @@ class PCStateOperand(Operand):
ctype = 'TheISA::PCState'
if self.isPCPart():
ctype = self.ctype
- return "%s %s;\n" % (ctype, self.base_name)
+ # Note that initializations in the declarations are solely
+ # to avoid 'uninitialized variable' errors from the compiler.
+ return '%s %s = 0;\n' % (ctype, self.base_name)
def isPCState(self):
return 1
diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc
index c6dacf9db..61c127ec4 100644
--- a/src/cpu/checker/cpu.cc
+++ b/src/cpu/checker/cpu.cc
@@ -298,10 +298,10 @@ CheckerCPU::writeMem(uint8_t *data, unsigned size,
// Cannot check this is actually what went to memory because
// there stores can be in ld/st queue or coherent operations
// overwriting values.
- bool extraData;
+ bool extraData = false;
if (unverifiedReq) {
extraData = unverifiedReq->extraDataValid() ?
- unverifiedReq->getExtraData() : 1;
+ unverifiedReq->getExtraData() : true;
}
if (unverifiedReq && unverifiedMemData &&