diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-14 05:43:31 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-14 05:43:31 -0400 |
| commit | b6aa6d55eb856f99a06c400b5dcda118c46dacfa (patch) | |
| tree | 02d6e99ad1c38462725aac4ed6c39216d6d93d71 /src/arch/sparc | |
| parent | 29482e90bad9d1d93b20d4f55fc4583756d68b3b (diff) | |
| download | gem5-b6aa6d55eb856f99a06c400b5dcda118c46dacfa.tar.xz | |
clang/gcc: Fix compilation issues with clang 3.0 and gcc 4.6
This patch addresses a number of minor issues that cause problems when
compiling with clang >= 3.0 and gcc >= 4.6. Most importantly, it
avoids using the deprecated ext/hash_map and instead uses
unordered_map (and similarly so for the hash_set). To make use of the
new STL containers, g++ and clang has to be invoked with "-std=c++0x",
and this is now added for all gcc versions >= 4.6, and for clang >=
3.0. For gcc >= 4.3 and <= 4.5 and clang <= 3.0 we use the tr1
unordered_map to avoid the deprecation warning.
The addition of c++0x in turn causes a few problems, as the
compiler is more stringent and adds a number of new warnings. Below,
the most important issues are enumerated:
1) the use of namespaces is more strict, e.g. for isnan, and all
headers opening the entire namespace std are now fixed.
2) another other issue caused by the more stringent compiler is the
narrowing of the embedded python, which used to be a char array,
and is now unsigned char since there were values larger than 128.
3) a particularly odd issue that arose with the new c++0x behaviour is
found in range.hh, where the operator< causes gcc to complain about
the template type parsing (the "<" is interpreted as the beginning
of a template argument), and the problem seems to be related to the
begin/end members introduced for the range-type iteration, which is
a new feature in c++11.
As a minor update, this patch also fixes the build flags for the clang
debug target that used to be shared with gcc and incorrectly use
"-ggdb".
Diffstat (limited to 'src/arch/sparc')
| -rw-r--r-- | src/arch/sparc/isa/decoder.isa | 8 | ||||
| -rw-r--r-- | src/arch/sparc/mt.hh | 1 | ||||
| -rw-r--r-- | src/arch/sparc/tlb_map.hh | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa index 44d2643c6..ad8ba5300 100644 --- a/src/arch/sparc/isa/decoder.isa +++ b/src/arch/sparc/isa/decoder.isa @@ -683,7 +683,7 @@ decode OP default Unknown::unknown() 0x47: FpUnimpl::fmovrqlez(); 0x51: fcmps({{ uint8_t fcc; - if (isnan(Frs1s) || isnan(Frs2s)) + if (std::isnan(Frs1s) || std::isnan(Frs2s)) fcc = 3; else if (Frs1s < Frs2s) fcc = 1; @@ -698,7 +698,7 @@ decode OP default Unknown::unknown() }}); 0x52: fcmpd({{ uint8_t fcc; - if (isnan(Frs1) || isnan(Frs2)) + if (std::isnan(Frs1) || std::isnan(Frs2)) fcc = 3; else if (Frs1 < Frs2) fcc = 1; @@ -714,7 +714,7 @@ decode OP default Unknown::unknown() 0x53: FpUnimpl::fcmpq(); 0x55: fcmpes({{ uint8_t fcc = 0; - if (isnan(Frs1s) || isnan(Frs2s)) + if (std::isnan(Frs1s) || std::isnan(Frs2s)) fault = new FpExceptionIEEE754; if (Frs1s < Frs2s) fcc = 1; @@ -727,7 +727,7 @@ decode OP default Unknown::unknown() }}); 0x56: fcmped({{ uint8_t fcc = 0; - if (isnan(Frs1) || isnan(Frs2)) + if (std::isnan(Frs1) || std::isnan(Frs2)) fault = new FpExceptionIEEE754; if (Frs1 < Frs2) fcc = 1; diff --git a/src/arch/sparc/mt.hh b/src/arch/sparc/mt.hh index 8b3d97aad..7fb054902 100644 --- a/src/arch/sparc/mt.hh +++ b/src/arch/sparc/mt.hh @@ -44,7 +44,6 @@ #include "base/bitfield.hh" #include "base/misc.hh" #include "base/trace.hh" -using namespace std; namespace SparcISA { diff --git a/src/arch/sparc/tlb_map.hh b/src/arch/sparc/tlb_map.hh index 5541ff7e9..c09e6eb95 100644 --- a/src/arch/sparc/tlb_map.hh +++ b/src/arch/sparc/tlb_map.hh @@ -98,7 +98,7 @@ class TlbMap if (intersect(r)) return tree.end(); - return tree.insert(std::make_pair<TlbRange,TlbEntry*>(r, d)).first; + return tree.insert(std::make_pair(r, d)).first; } size_t |