From e0da05a698a42eea04846721c34521f4ec5b43b9 Mon Sep 17 00:00:00 2001 From: chunseoklee Date: Mon, 11 Jul 2016 11:35:18 +0900 Subject: [PATCH] llvm patched for thread local storage support (by Lim) Change-Id: I227e998f2edf1bdc169a5a71c075065909a49bd6 --- lib/Target/ARM/ARMConstantPoolValue.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Target/ARM/ARMConstantPoolValue.cpp b/lib/Target/ARM/ARMConstantPoolValue.cpp index c9849b2..880e230 100644 --- a/lib/Target/ARM/ARMConstantPoolValue.cpp +++ b/lib/Target/ARM/ARMConstantPoolValue.cpp @@ -74,9 +74,9 @@ bool ARMConstantPoolValue::hasSameValue(ARMConstantPoolValue *ACPV) { if (ACPV->Kind == Kind && ACPV->PCAdjust == PCAdjust && - ACPV->Modifier == Modifier) { - if (ACPV->LabelId == LabelId) - return true; + ACPV->Modifier == Modifier && + ACPV->LabelId == LabelId && + ACPV->AddCurrentAddress == AddCurrentAddress) { // Two PC relative constpool entries containing the same GV address or // external symbols. FIXME: What about blockaddress? if (Kind == ARMCP::CPValue || Kind == ARMCP::CPExtSymbol) -- 2.7.4