From d93d4a27d276796f79e589dcb2253e0febccfaa7 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 20 Jun 2018 18:30:08 +0200
Subject: [PATCH] Update to 1.10.0

- Enable bootstrap
---
 .gitignore                                    |  1 +
 ...LVM-6-Default-to-Dwarf-debuginfos-v3.patch | 30 -------------------
 ldc.spec                                      | 18 +++++------
 sources                                       |  2 +-
 4 files changed, 11 insertions(+), 40 deletions(-)
 delete mode 100644 0001-LLVM-6-Default-to-Dwarf-debuginfos-v3.patch

diff --git a/.gitignore b/.gitignore
index 648d564..dd9457c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /ldc-1.4.0-src.tar.gz
 /ldc-1.8.0-beta1-src.tar.gz
 /ldc-1.8.0-src.tar.gz
+/ldc-1.10.0-src.tar.gz
diff --git a/0001-LLVM-6-Default-to-Dwarf-debuginfos-v3.patch b/0001-LLVM-6-Default-to-Dwarf-debuginfos-v3.patch
deleted file mode 100644
index ab30a10..0000000
--- a/0001-LLVM-6-Default-to-Dwarf-debuginfos-v3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 18cf4196f66c9e11ff744d85d2803af8d593dbe3 Mon Sep 17 00:00:00 2001
-From: Martin <noone@nowhere.com>
-Date: Sun, 25 Mar 2018 17:37:34 +0200
-Subject: [PATCH] LLVM 6+: Default to Dwarf debuginfos v3
-
-At least on Linux it appears to default to v4 or newer, which druntime's
-rt.backtrace.dwarf doesn't handle yet.
-
-This fixes tests/codegen/exception_stack_trace.d on Linux.
----
- driver/targetmachine.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/driver/targetmachine.cpp b/driver/targetmachine.cpp
-index d75a31b2c..70a09127c 100644
---- a/driver/targetmachine.cpp
-+++ b/driver/targetmachine.cpp
-@@ -458,6 +458,12 @@ createTargetMachine(const std::string targetTriple, const std::string arch,
-   if (targetOptions.MCOptions.ABIName.empty())
-     targetOptions.MCOptions.ABIName = getABI(triple);
- 
-+#if LDC_LLVM_VER >= 600
-+  // druntime isn't ready for Dwarf v4+ debuginfos (e.g., in rt.backtrace.dwarf).
-+  if (targetOptions.MCOptions.DwarfVersion == 0)
-+    targetOptions.MCOptions.DwarfVersion = 3;
-+#endif
-+
-   auto ldcFloatABI = floatABI;
-   if (ldcFloatABI == FloatABI::Default) {
-     switch (triple.getArch()) {
diff --git a/ldc.spec b/ldc.spec
index 96a6e00..91afd19 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -1,6 +1,6 @@
 %global dmdfe_major 2
 %global dmdfe_minor 0
-%global dmdfe_bump  78
+%global dmdfe_bump  80
 %global dmdfe       %dmdfe_major.%dmdfe_minor.%dmdfe_bump
 
 #global pre beta1
@@ -9,15 +9,15 @@
 
 # Enable this for bootstrapping with an older version that doesn't require a
 # working D compiler to build itself
-%global bootstrap 0
+%global bootstrap 1
 %global bootstrap_version 0.17.4
 
 %undefine _hardened_build
 
 Name:           ldc
 Epoch:          1
-Version:        1.8.0
-Release:        2%{?pre:.%{pre}}%{?dist}
+Version:        1.10.0
+Release:        1%{?pre:.%{pre}}%{?dist}
 Summary:        A compiler for the D programming language
 
 # The DMD frontend in dmd/* GPL version 1 or artistic license
@@ -30,9 +30,6 @@ Source1:        https://github.com/ldc-developers/ldc/releases/download/v%{boots
 %endif
 Source3:        macros.%{name}
 
-# https://github.com/ldc-developers/ldc/pull/2608
-Patch0:         0001-LLVM-6-Default-to-Dwarf-debuginfos-v3.patch
-
 ExclusiveArch:  %{ldc_arches}
 
 %if ! 0%{?bootstrap}
@@ -193,7 +190,6 @@ pushd build
               -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir}             \
               -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}                \
               -DLLVM_CONFIG:PATH=%{_bindir}/llvm-config-%{__isa_bits} \
-              -DLDC_WITH_LLD:BOOL=OFF                               \
 %if 0%{?bootstrap}
               -DD_COMPILER:PATH=`pwd`/../build-bootstrap/bin/ldmd2  \
 %endif
@@ -244,7 +240,7 @@ install -m0644 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/
 %{_libdir}/libldc-jit.so
 
 %files druntime
-%license runtime/druntime/LICENSE
+%license runtime/druntime/LICENSE.txt
 %doc runtime/druntime/README.md runtime/README
 %{_libdir}/libdruntime-ldc-debug-shared.so.%dmdfe
 %{_libdir}/libdruntime-ldc-debug-shared.so.%dmdfe_bump
@@ -275,6 +271,10 @@ install -m0644 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/
 %{_datadir}/geany/tags/phobos.d.tags
 
 %changelog
+* Wed Jun 20 2018 Kalev Lember <klember@redhat.com> - 1:1.10.0-1
+- Update to 1.10.0
+- Enable bootstrap
+
 * Mon Mar 19 2018 Tom Stellard <tstellar@redhat.com> - 1:1.8.0-2
 - Rebuild for LLVM 6.0.0 and re-enable JIT libraries.
 
diff --git a/sources b/sources
index b342168..c27c81f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ldc-0.17.4-src.tar.gz) = d45abd1506387dca8d2eef6b5afe41b3015d362d09c7fc26c6ee861140d67690ee3db31cc06ca313ba39d5f75b9620db870410140e0dd78b9038361432b238ba
-SHA512 (ldc-1.8.0-src.tar.gz) = de99fc7d1a879b31825509d85dbbc4e8470526e380417ea7ee47cb34f952775b42588fe8080e5e388dbc746417c0c096c9f1e39dc1287263737b7fe33dcd6f60
+SHA512 (ldc-1.10.0-src.tar.gz) = 6f46889dce6a4ba8450146b1e4929a73d9dee3b233f29e6054d3123ec370eb0155770686a27cc40d510fb777b12c00a7d70e255ad8265320b97cca8b47efe1ee