[EFL] Remove LLVM related cruft after r196077
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Feb 2016 17:35:58 +0000 (17:35 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Feb 2016 17:35:58 +0000 (17:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=154031

Reviewed by Alex Christensen.

* efl/jhbuild.modules:
* efl/patches/llvm-elf-add-stackmaps-arm64.patch: Removed.
* efl/patches/llvm-elf-allow-fde-references-outside-the-2gb-range-arm64.patch: Removed.
* efl/patches/llvm-version-arm64.patch: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/efl/jhbuild.modules
Tools/efl/patches/llvm-elf-add-stackmaps-arm64.patch [deleted file]
Tools/efl/patches/llvm-elf-allow-fde-references-outside-the-2gb-range-arm64.patch [deleted file]
Tools/efl/patches/llvm-version-arm64.patch [deleted file]

index e1907e0..011c8dd 100644 (file)
@@ -1,3 +1,15 @@
+2016-02-09  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        [EFL] Remove LLVM related cruft after r196077
+        https://bugs.webkit.org/show_bug.cgi?id=154031
+
+        Reviewed by Alex Christensen.
+
+        * efl/jhbuild.modules:
+        * efl/patches/llvm-elf-add-stackmaps-arm64.patch: Removed.
+        * efl/patches/llvm-elf-allow-fde-references-outside-the-2gb-range-arm64.patch: Removed.
+        * efl/patches/llvm-version-arm64.patch: Removed.
+
 2016-02-05  Aakash Jain  <aakash_jain@apple.com>
 
         tests fail if display sleeps while run-webkit-tests is running
index 123cc5f..16e291a 100644 (file)
@@ -24,9 +24,6 @@
       <dep package="libseccomp"/>
       <dep package="atk"/>
       <dep package="openwebrtc"/>
-      <if condition-set="x86_64">
-        <dep package="llvm-3.6-for-X86_64"/>
-      </if>
     </dependencies>
   </metamodule>
 
       href="http://download.enlightenment.org"/>
   <repository type="tarball" name="gstreamer"
       href="http://gstreamer.freedesktop.org/src/"/>
-  <repository type="svn" name="llvm.org"
-      href="http://llvm.org/svn/llvm-project/"/>
-  <repository type="tarball" name="llvm-tar"
-      href="http://llvm.org"/>
 
   <autotools id="cairo" autogen-sh="configure"
              makeargs="CFLAGS='-fno-lto' CXXFLAGS='-fno-lto' LDFLAGS='-fno-lto'">
     </branch>
   </autotools>
 
-  <autotools id="llvm-3.5-for-AArch64"
-             autogen-sh="configure"
-             autogenargs="--enable-optimized=yes --enable-backtraces=no --enable-targets=host --enable-zlib=no --enable-terminfo=no --enable-crash-overrides=no --disable-expensive-checks --disable-debug-runtime --disable-assertions">
-    <branch repo="llvm-tar"
-            module="/releases/3.5.0/llvm-3.5.0.src.tar.xz" version="3.5.0" checkoutdir="llvm-3.5.0"
-            hash="sha256:28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03">
-      <patch file="llvm-elf-allow-fde-references-outside-the-2gb-range-arm64.patch" strip="1"/>
-      <patch file="llvm-elf-add-stackmaps-arm64.patch" strip="1"/>
-      <patch file="llvm-version-arm64.patch" strip="1"/>
-    </branch>
-  </autotools>
-
-  <autotools id="llvm-3.6-for-X86_64"
-             autogen-sh="configure"
-             autogenargs="--enable-optimized=yes --enable-backtraces=no --enable-targets=host --enable-zlib=no --enable-terminfo=no --enable-crash-overrides=no --disable-expensive-checks --disable-debug-runtime --disable-assertions">
-    <branch repo="llvm-tar"
-            module="/releases/3.6.0/llvm-3.6.0.src.tar.xz" version="3.6.0" checkoutdir="llvm-3.6.0"
-            hash="sha256:b39a69e501b49e8f73ff75c9ad72313681ee58d6f430bfad4d81846fe92eb9ce">
-    </branch>
-  </autotools>
-
-  <autotools id="clang"
-             skip-autogen="true">
-    <dependencies>
-      <dep package="llvm"/>
-    </dependencies>
-    <branch repo="llvm.org" module="/cfe/tags/RELEASE_350/final" version="3.5.0" checkoutdir="llvm/tools/clang">
-    </branch>
-  </autotools>
-
-  <autotools id="fontconfig" 
+  <autotools id="fontconfig"
              autogen-sh="configure"
              autogenargs="--enable-libxml2">
     <dependencies>
diff --git a/Tools/efl/patches/llvm-elf-add-stackmaps-arm64.patch b/Tools/efl/patches/llvm-elf-add-stackmaps-arm64.patch
deleted file mode 100644 (file)
index 821fd56..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
-index df5787c..da707d8 100644
---- a/lib/MC/MCObjectFileInfo.cpp
-+++ b/lib/MC/MCObjectFileInfo.cpp
-@@ -583,6 +583,12 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) {
-   DwarfAddrSection =
-     Ctx->getELFSection(".debug_addr", ELF::SHT_PROGBITS, 0,
-                        SectionKind::getMetadata());
-+
-+  StackMapSection =
-+    Ctx->getELFSection(".llvm_stackmaps", ELF::SHT_PROGBITS,
-+                       ELF::SHF_ALLOC,
-+                       SectionKind::getMetadata());
-+
- }
-diff --git a/lib/Target/AArch64/AArch64AsmPrinter.cpp b/lib/Target/AArch64/AArch64AsmPrinter.cpp
-index 8bee4f5..bfbbaac 100644
---- a/lib/Target/AArch64/AArch64AsmPrinter.cpp
-+++ b/lib/Target/AArch64/AArch64AsmPrinter.cpp
-@@ -154,6 +154,8 @@ void AArch64AsmPrinter::EmitEndOfAsmFile(Module &M) {
-       }
-       Stubs.clear();
-     }
-+
-+    SM.serializeToStackMapSection();
-   }
- }
diff --git a/Tools/efl/patches/llvm-elf-allow-fde-references-outside-the-2gb-range-arm64.patch b/Tools/efl/patches/llvm-elf-allow-fde-references-outside-the-2gb-range-arm64.patch
deleted file mode 100644 (file)
index be4412a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
-index 7886ab6..96929e5 100644
---- a/lib/MC/MCObjectFileInfo.cpp
-+++ b/lib/MC/MCObjectFileInfo.cpp
-@@ -284,6 +284,17 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) {
-         ? dwarf::DW_EH_PE_udata4 : dwarf::DW_EH_PE_absptr;
-     }
-     break;
-+  case Triple::aarch64:
-+    if (RelocM == Reloc::PIC_) {
-+      FDECFIEncoding = dwarf::DW_EH_PE_pcrel |
-+        ((CMModel == CodeModel::Small || CMModel == CodeModel::Medium)
-+         ? dwarf::DW_EH_PE_sdata4 : dwarf::DW_EH_PE_sdata8);
-+    } else {
-+      FDECFIEncoding =
-+        (CMModel == CodeModel::Small || CMModel == CodeModel::Medium)
-+        ? dwarf::DW_EH_PE_udata4 : dwarf::DW_EH_PE_absptr;
-+    }
-+    break;
-   default:
-     FDECFIEncoding = dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4;
-     break;
diff --git a/Tools/efl/patches/llvm-version-arm64.patch b/Tools/efl/patches/llvm-version-arm64.patch
deleted file mode 100644 (file)
index a446eda..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index c11c395..24e9494 100755
---- a/configure
-+++ b/configure
-@@ -561,7 +561,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
- # Identity of this package.
- PACKAGE_NAME='LLVM'
- PACKAGE_TARNAME='llvm'
--PACKAGE_VERSION='3.5.0'
-+PACKAGE_VERSION='3.5.0ftl'
- PACKAGE_STRING='LLVM 3.5.0'
- PACKAGE_BUGREPORT='http://llvm.org/bugs/'