From b6aa6d55eb856f99a06c400b5dcda118c46dacfa Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Sat, 14 Apr 2012 05:43:31 -0400 Subject: 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". --- src/arch/x86/isa/microops/fpop.isa | 2 +- src/arch/x86/isa/microops/mediaop.isa | 4 ++-- src/arch/x86/types.hh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/arch/x86') diff --git a/src/arch/x86/isa/microops/fpop.isa b/src/arch/x86/isa/microops/fpop.isa index 17698f198..01f26b0f5 100644 --- a/src/arch/x86/isa/microops/fpop.isa +++ b/src/arch/x86/isa/microops/fpop.isa @@ -285,7 +285,7 @@ let {{ // OF = SF = AF = 0 ccFlagBits = ccFlagBits & ~(OFBit | SFBit | AFBit | ZFBit | PFBit | CFBit); - if (isnan(FpSrcReg1) || isnan(FpSrcReg2)) + if (std::isnan(FpSrcReg1) || std::isnan(FpSrcReg2)) ccFlagBits = ccFlagBits | (ZFBit | PFBit | CFBit); else if(FpSrcReg1 < FpSrcReg2) ccFlagBits = ccFlagBits | CFBit; diff --git a/src/arch/x86/isa/microops/mediaop.isa b/src/arch/x86/isa/microops/mediaop.isa index 9320d9f39..0c4827990 100644 --- a/src/arch/x86/isa/microops/mediaop.isa +++ b/src/arch/x86/isa/microops/mediaop.isa @@ -1404,7 +1404,7 @@ let {{ } uint64_t resBits = 0; - bool nanop = isnan(arg1) || isnan(arg2); + bool nanop = std::isnan(arg1) || std::isnan(arg2); switch (ext & mask(3)) { case 0: if (arg1 == arg2 && !nanop) @@ -1492,7 +1492,7 @@ let {{ // OF = SF = AF = 0 ccFlagBits = ccFlagBits & ~(OFBit | SFBit | AFBit | ZFBit | PFBit | CFBit); - if (isnan(arg1) || isnan(arg2)) + if (std::isnan(arg1) || std::isnan(arg2)) ccFlagBits = ccFlagBits | (ZFBit | PFBit | CFBit); else if(arg1 < arg2) ccFlagBits = ccFlagBits | CFBit; diff --git a/src/arch/x86/types.hh b/src/arch/x86/types.hh index c7e824fb7..6d9f600ff 100644 --- a/src/arch/x86/types.hh +++ b/src/arch/x86/types.hh @@ -280,7 +280,7 @@ namespace X86ISA } -namespace __hash_namespace { +__hash_namespace_begin template<> struct hash { size_t operator()(const X86ISA::ExtMachInst &emi) const { @@ -298,7 +298,7 @@ namespace __hash_namespace { emi.stackSize ^ emi.dispSize; }; }; -} +__hash_namespace_end // These two functions allow ExtMachInst to be used with SERIALIZE_SCALAR // and UNSERIALIZE_SCALAR. -- cgit v1.2.3