#216 Remove some dead code
Merged 6 months ago by nikic. Opened 7 months ago by nikic.
rpms/ nikic/clang cleanup  into  rawhide

file modified
+3 -26
@@ -205,11 +205,6 @@ 

  Recommends: libomp-devel%{_isa} = %{version}

  Recommends: libomp%{_isa} = %{version}

  

- # Use lld as the default linker on ARM due to rhbz#1918924

- %ifarch %{arm}

- Requires: lld

- %endif

- 

  %description libs

  Runtime library for clang.

  
@@ -327,8 +322,6 @@ 

  

  %build

  

- # Use ThinLTO to limit build time.

- %define _lto_cflags -flto=thin

  # And disable LTO on AArch64 entirely.

  %ifarch aarch64

  %define _lto_cflags %{nil}
@@ -339,14 +332,7 @@ 

  %global _lto_cflags %nil

  %endif

  

- 

- %if 0%{?__isa_bits} == 64

- sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py

- %else

- sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py

- %endif

- 

- %ifarch s390 s390x %{arm} aarch64 %ix86 ppc64le

+ %ifarch s390 s390x aarch64 %ix86 ppc64le

  # Decrease debuginfo verbosity to reduce memory consumption during final library linking

  %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')

  %endif
@@ -368,7 +354,7 @@ 

  	-DCMAKE_BUILD_TYPE=RelWithDebInfo \

  	-DPYTHON_EXECUTABLE=%{__python3} \

  	-DCMAKE_SKIP_RPATH:BOOL=ON \

- %ifarch s390 s390x %{arm} %ix86 ppc64le

+ %ifarch s390 s390x %ix86 ppc64le

  	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \

  	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \

  %endif
@@ -418,9 +404,6 @@ 

  	-DBUILD_SHARED_LIBS=OFF \

  	-DCLANG_REPOSITORY_STRING="%{?dist_vendor} %{version}-%{release}" \

  	-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \

- %ifarch %{arm}

- 	-DCLANG_DEFAULT_LINKER=lld \

- %endif

  	-DCLANG_DEFAULT_UNWINDLIB=libgcc

  

  %cmake_build
@@ -514,13 +497,7 @@ 

  %cmake_build --target clang-test-depends \

      ExtraToolsUnitTests ClangdUnitTests ClangIncludeCleanerUnitTests ClangPseudoUnitTests

  # requires lit.py from LLVM utilities

- # FIXME: Fix failing ARM tests

- LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} check-all -C %{__cmake_builddir} || \

- %ifarch %{arm}

- :

- %else

- false

- %endif

+ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} check-all -C %{__cmake_builddir}

  %endif

  %endif

  

  • Remove handling for %{arm}, which is no longer supported.
  • _lto_cflags already defaults to ThinLTO.
  • FEDORA_LLVM_LIB_SUFFIX was handling for a patch that hasn't existed for a long time.

Same here, I see value in keeping the flag for LTO.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/b21557d00dd34d3bbd0548c9fedc84b9

rebased onto 6f21bc0

6 months ago

Pull-Request has been merged by nikic

6 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/b50a4e50dea943d5977afa261923adee

Metadata