From df3cf8927580544cd6e987bed94c618556d5838a Mon Sep 17 00:00:00 2001 From: CHUNSEOK LEE Date: Wed, 30 Aug 2017 20:21:04 +0900 Subject: [PATCH] Revert "Apply unapplied patches" This reverts commit 73577b71c8ce1f3f156291654a4fb39d73ebd2ea. *** This commit may not be built *** Change-Id: Ibdccbef46f751d6f1f22a16e4e4f02c34c74b56f --- lib/Target/ARM/ARMConstantPoolValue.cpp | 6 +++--- packaging/llvm.spec | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/Target/ARM/ARMConstantPoolValue.cpp b/lib/Target/ARM/ARMConstantPoolValue.cpp index 880e230..c9849b2 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 && - ACPV->LabelId == LabelId && - ACPV->AddCurrentAddress == AddCurrentAddress) { + ACPV->Modifier == Modifier) { + if (ACPV->LabelId == LabelId) + return true; // Two PC relative constpool entries containing the same GV address or // external symbols. FIXME: What about blockaddress? if (Kind == ARMCP::CPValue || Kind == ARMCP::CPExtSymbol) diff --git a/packaging/llvm.spec b/packaging/llvm.spec index f7f6d33..c8a5b3e 100644 --- a/packaging/llvm.spec +++ b/packaging/llvm.spec @@ -8,6 +8,8 @@ Source0: %{name}-%{version}.tar.gz Source1: clang.tar.gz Source2: lldb.tar.gz Source1001: llvm.manifest +Patch: lldb.patch +Patch1: tls-patch.patch BuildRequires: cmake BuildRequires: python @@ -113,10 +115,9 @@ gzip -dc %{SOURCE1} | tar -xf - gzip -dc %{SOURCE2} | tar -xf - %endif pwd -#cd lldb -#%patch2001 -p0 -#cd ../.. -#%patch2002 -p0 +%patch -p2 +cd .. +%patch -P 1 -p1 %build -- 2.7.4