summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2014-01-31 06:28:32 +0000
committerRui Ueyama <ruiu@google.com>2014-01-31 06:28:32 +0000
commitd0d01c66ba0105090b58d1eec8cc3df4d4aa321e (patch)
tree8b7f07a0d12c269c313ebc8fc8c22720b0f4ad3d
parent14876abb3df3231ec6def07f62fd8a79a301b17b (diff)
downloadbcm5719-llvm-d0d01c66ba0105090b58d1eec8cc3df4d4aa321e.tar.gz
bcm5719-llvm-d0d01c66ba0105090b58d1eec8cc3df4d4aa321e.zip
MSVC2012 does not choose to use uint64_t as underlying type without this.
MSVC2012 seems to choose int as the underlying type for an enum even if one of its member is unsigned long long. llvm-svn: 200519
-rw-r--r--lld/include/lld/ReaderWriter/PECOFFLinkingContext.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
index fdc8c10c9a6..8aebdd23ca0 100644
--- a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
@@ -250,10 +250,10 @@ protected:
virtual std::unique_ptr<File> createUndefinedSymbolFile() const;
private:
- enum {
+ enum : uint64_t {
invalidBaseAddress = UINT64_MAX,
- pe32DefaultBaseAddress = 0x400000UL,
- pe32PlusDefaultBaseAddress = 0x140000000UL
+ pe32DefaultBaseAddress = 0x400000U,
+ pe32PlusDefaultBaseAddress = 0x140000000U
};
// The start address for the program. The default value for the executable is
OpenPOWER on IntegriCloud