(no commit message)

[lldb-experimental.git] / lldb-experimental.spec

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 721fef2..64c627a 100644 (file)
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -1,6 +1,5 @@
 %global fast 0
 %global use_jankratochvil_dwz 1
-%global use_jankratochvil_rnglist 1
 %global use_jankratochvil_uniqaddr 1
 %global use_jankratochvil_rust 0
 %global pkg_prefix /opt/%{name}
@@ -19,7 +18,7 @@
 %endif
 Name: lldb-experimental
 Version: 13.0.0
-Release: 0.20210425snap0%{?dist}
+Release: 0.20210602snap0%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
@@ -89,10 +88,6 @@ This package is an experimental trunk snapshot.
 This package contains off-trunk DWZ support for Fedora debuginfos such as:
   unsupported DW_FORM values: 0x1f20 0x1f21
 %endif
-%if %{use_jankratochvil_rnglist}
-This package contains off-trunk:
-  Fix DW_AT_ranges DW_FORM_sec_offset not using DW_AT_rnglists_base (used by GCC)
-%endif
 %if %{use_jankratochvil_uniqaddr}
 This package contains off-trunk:
   Support for libstdc++11 std::unique_ptr: [[no_unique_address]]
@@ -179,9 +174,6 @@ git config user.name jankratochvil
 %if %{use_jankratochvil_dwz}
 git merge jankratochvil/dwz
 %endif
-%if %{use_jankratochvil_rnglist}
-git merge jankratochvil/rnglist0-1-2
-%endif
 %if %{use_jankratochvil_uniqaddr}
 git merge jankratochvil/layout3
 %endif
@@ -207,16 +199,16 @@ FLAGS="$FLAGS -g0"
 # -fno-reorder-blocks-and-partition:
 # -gsplit-dwarf: Error: can't resolve `.text.unlikely' - `.LVL414'
 # https://bugzilla.redhat.com/show_bug.cgi?id=1573647
+%if 0%{?fedora} != 35
 FLAGS="$FLAGS -fdebug-types-section"
 %endif
+%endif
 
 CFLAGS="$FLAGS"
 CXXFLAGS="$FLAGS"
 
 # This is default - changing it breaks the testsuite: -DLLVM_LINK_LLVM_DYLIB=OFF
 # It does not work: -DDCMAKE_EXECUTABLE_SUFFIX=-experimental
-# -fdebug-types-section && -DLLVM_USE_LINKER=gold:
-# ../../../../lib64/libclangLex.a(PreprocessingRecord.cpp.o)(.debug_types+0xfe): error: undefined reference to 'clang::SourceRange::getBegin() const'
 %cmake llvm \
   -DCMAKE_INSTALL_PREFIX=%{pkg_prefix} \
 %if %{fast}
@@ -227,7 +219,7 @@ CXXFLAGS="$FLAGS"
   -DLLVM_ENABLE_PROJECTS="lldb;clang;lld" \
   -DLLVM_TARGETS_TO_BUILD=X86 \
   -DLLVM_BUILD_TOOLS=OFF \
-  -DLLVM_USE_LINKER=gold \
+  -DLLVM_USE_LINKER=lld \
   $(: file INSTALL cannot find build-release/lib/python3.6 ) \
 %if 0%{?__isa_bits} == 64
   -DLLVM_LIBDIR_SUFFIX=64 \