A couple of fixes for using Makefile.standalone on Mac.
(*) PNaCl toolchain_build builds 64-bit libraries for LLVM on Mac.
That won't link with subzero code if subzero is built with -m32,
so add an option to override the -m32.
(*) include locale header
(*) Mark xMacroIntegrityCheck unused to avoid clang compiler warning.
(*) virtual dtor, for inheritable class
(*) Mark compare function const
BUG=none
R=stichnot@chromium.org
Review URL: https://codereview.chromium.org/428733003
diff --git a/src/IceGlobalContext.cpp b/src/IceGlobalContext.cpp
index 113ffc4..5dd8b63 100644
--- a/src/IceGlobalContext.cpp
+++ b/src/IceGlobalContext.cpp
@@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//
#include <ctype.h> // isdigit(), isupper()
+#include <locale> // locale
#include "IceDefs.h"
#include "IceTypes.h"
@@ -61,7 +62,7 @@
private:
typedef std::pair<Type, KeyType> TupleType;
struct TupleCompare {
- bool operator()(const TupleType &A, const TupleType &B) {
+ bool operator()(const TupleType &A, const TupleType &B) const {
if (A.first != B.first)
return A.first < B.first;
if (KeyTypeHasFP)
