From 7876fe94ada2c9411cef3e4f67d8c513d911a712 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 17 Sep 2018 06:25:01 -0400 Subject: [PATCH] Fix Mac OSX 10.13.6 / LLVM 9.1 compile issues, bug1348. --- Changes | 2 ++ include/verilated.cpp | 1 - src/V3EmitC.cpp | 2 +- src/V3SenTree.h | 6 ++---- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Changes b/Changes index 4ffb1a97a..b542131da 100644 --- a/Changes +++ b/Changes @@ -4,6 +4,8 @@ The contributors that suggested a given feature are shown in []. Thanks! * Verilator 4.003 devel +*** Fix Mac OSX 10.13.6 / LLVM 9.1 compile issues, bug1348. [Kevin Kiningham] + * Verilator 4.002 2018-09-16 diff --git a/include/verilated.cpp b/include/verilated.cpp index b010c215a..be0b474d3 100644 --- a/include/verilated.cpp +++ b/include/verilated.cpp @@ -234,7 +234,6 @@ vluint64_t vl_rand64() VL_MT_SAFE { if (VL_UNLIKELY(!t_seeded)) { t_seeded = true; { - long seedval; VerilatedLockGuard lock(s_mutex); t_state[0] = (((vluint64_t)vl_sys_rand32())<<32 ^ ((vluint64_t)vl_sys_rand32())); diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp index d22ce74c9..66e837d92 100644 --- a/src/V3EmitC.cpp +++ b/src/V3EmitC.cpp @@ -1875,7 +1875,7 @@ void EmitCImp::emitSavableImp(AstNodeModule* modp) { } } ofp()->printf( "vluint64_t __Vcheckval = VL_ULL(0x%" VL_PRI64 "x);\n", - hash.digestUInt64()); + (vluint64_t)hash.digestUInt64()); if (de) { puts("os.readAssert(__Vcheckval);\n"); } else { diff --git a/src/V3SenTree.h b/src/V3SenTree.h index 49dfab33a..c9c4c14fd 100644 --- a/src/V3SenTree.h +++ b/src/V3SenTree.h @@ -61,8 +61,7 @@ private: size_t operator() (const AstSenTree* kp) const { return V3Hashed::uncachedHash(kp).fullValue(); } - private: - VL_UNCOPYABLE(HashSenTree); + // Copying required for OSX's libc++ }; class EqSenTree { @@ -71,8 +70,7 @@ private: bool operator() (const AstSenTree* ap, const AstSenTree* bp) const { return ap->sameTree(bp); } - private: - VL_UNCOPYABLE(EqSenTree); + // Copying required for OSX's libc++ }; // MEMBERS