Apply unapplied patches

Change-Id: I689839bc53a95b3fd05612fe6150ef7d56c592fd
Signed-off-by: chunseoklee <chunseok.lee@samsung.com>

diff --git a/lib/Target/ARM/ARMConstantPoolValue.cpp b/lib/Target/ARM/ARMConstantPoolValue.cpp
index c9849b2..880e230 100644 (file)
--- 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)

diff --git a/packaging/lldb.patch b/packaging/lldb.patch
deleted file mode 100644 (file)
index 8d435e2..0000000
--- a/packaging/lldb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru llvm-3.8.orig/tools/lldb/include/lldb/Core/ArchSpec.h llvm-3.8/tools/lldb/include/lldb/Core/ArchSpec.h
---- llvm-3.8.orig/tools/lldb/include/lldb/Core/ArchSpec.h      2016-04-05 17:42:03.784256516 +0300
-+++ llvm-3.8/tools/lldb/include/lldb/Core/ArchSpec.h   2016-04-06 10:54:31.918452753 +0300
-@@ -87,6 +87,7 @@
-         eCore_arm_armv7s,
-         eCore_arm_armv7k,
-         eCore_arm_armv7m,
-+        eCore_arm_armv7l,
-         eCore_arm_armv7em,
-         eCore_arm_xscale,  
- 
-diff -ru llvm-3.8.orig/tools/lldb/source/Core/ArchSpec.cpp llvm-3.8/tools/lldb/source/Core/ArchSpec.cpp
---- llvm-3.8.orig/tools/lldb/source/Core/ArchSpec.cpp  2016-04-05 17:42:03.832256473 +0300
-+++ llvm-3.8/tools/lldb/source/Core/ArchSpec.cpp       2016-04-06 10:54:31.934452824 +0300
-@@ -71,6 +71,7 @@
-     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv7s      , "armv7s"    },
-     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv7k      , "armv7k"    },
-     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv7m      , "armv7m"    },
-+    { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv7l      , "armv7l"    },
-     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv7em     , "armv7em"   },
-     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_xscale      , "xscale"    },
-     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumb           , "thumb"     },

diff --git a/packaging/lldb.tar.gz b/packaging/lldb.tar.gz
index 1fdf026..11763dc 100644 (file)
Binary files a/packaging/lldb.tar.gz and b/packaging/lldb.tar.gz differ

diff --git a/packaging/llvm.spec b/packaging/llvm.spec
index f25cae2..52e75ea 100644 (file)
--- a/packaging/llvm.spec
+++ b/packaging/llvm.spec
@@ -8,8 +8,6 @@ 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
@@ -82,12 +80,13 @@ The package contains header files for the LLDB debugger.
 cp %{SOURCE1001} .
 cd tools
 echo `pwd`
-gzip -dc %{SOURCE1} | tar -xvf -
-gzip -dc %{SOURCE2} | tar -xvf -
+gzip -dc %{SOURCE1} | tar -xf -
+gzip -dc %{SOURCE2} | tar -xf -
 pwd
-%patch -p2
-cd ..
-%patch -P 1 -p1
+#cd lldb
+#%patch2001 -p0
+#cd ../..
+#%patch2002 -p0
 
 %build
 

diff --git a/packaging/tls-patch.patch b/packaging/tls-patch.patch
deleted file mode 100644 (file)
index eb5a229..0000000
--- a/packaging/tls-patch.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ff9243905b1624e1bb24d2583ddc55ed6cbc6ce4 Mon Sep 17 00:00:00 2001
-From: chunseoklee <chunseok.lee@samsung.com>
-Date: Wed, 27 Jul 2016 13:24:22 +0900
-Subject: [PATCH] tls patch by Lim
-
----
- 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)
--- 
-1.9.1
-