From 71db5ef174bff8b6323364979e0d9f6dbe90d5f5 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Mar 27 2019 06:59:01 +0000 Subject: Synchronize with f31 version --- diff --git a/0001-Partial-support-of-SHT_GROUP-without-flag.patch b/0001-Partial-support-of-SHT_GROUP-without-flag.patch deleted file mode 100644 index 218da0a..0000000 --- a/0001-Partial-support-of-SHT_GROUP-without-flag.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -ru --new-file lld-8.0.0rc1.src.orig/ELF/InputFiles.cpp lld-8.0.0rc1.src/ELF/InputFiles.cpp ---- lld-8.0.0rc1.src.orig/ELF/InputFiles.cpp 2019-02-12 08:09:21.746416886 +0000 -+++ lld-8.0.0rc1.src/ELF/InputFiles.cpp 2019-02-13 10:41:49.565275043 +0000 -@@ -320,17 +320,6 @@ - return Signature; - } - --template --ArrayRef::Elf_Word> --ObjFile::getShtGroupEntries(const Elf_Shdr &Sec) { -- const ELFFile &Obj = this->getObj(); -- ArrayRef Entries = -- CHECK(Obj.template getSectionContentsAsArray(&Sec), this); -- if (Entries.empty() || Entries[0] != GRP_COMDAT) -- fatal(toString(this) + ": unsupported SHT_GROUP format"); -- return Entries.slice(1); --} -- - template bool ObjFile::shouldMerge(const Elf_Shdr &Sec) { - // On a regular link we don't merge sections if -O0 (default is -O1). This - // sometimes makes the linker significantly faster, although the output will -@@ -440,18 +429,24 @@ - case SHT_GROUP: { - // De-duplicate section groups by their signatures. - StringRef Signature = getShtGroupSignature(ObjSections, Sec); -- bool IsNew = ComdatGroups.insert(CachedHashStringRef(Signature)).second; - this->Sections[I] = &InputSection::Discarded; - -- // We only support GRP_COMDAT type of group. Get the all entries of the -- // section here to let getShtGroupEntries to check the type early for us. -- ArrayRef Entries = getShtGroupEntries(Sec); -- -- // If it is a new section group, we want to keep group members. -- // Group leader sections, which contain indices of group members, are -- // discarded because they are useless beyond this point. The only -- // exception is the -r option because in order to produce re-linkable -- // object files, we want to pass through basically everything. -+ ArrayRef Entries = -+ CHECK(Obj.template getSectionContentsAsArray(&Sec), this); -+ if (Entries.empty()) -+ fatal(toString(this) + ": empty SHT_GROUP"); -+ -+ // The first word of a SHT_GROUP section contains flags. Currently, -+ // the standard defines only "GRP_COMDAT" flag for the COMDAT group. -+ // An group with the empty flag doesn't define anything; such sections -+ // are just skipped. -+ if (Entries[0] == 0) -+ continue; -+ -+ if (Entries[0] != GRP_COMDAT) -+ fatal(toString(this) + ": unsupported SHT_GROUP format"); -+ -+ bool IsNew = ComdatGroups.insert(CachedHashStringRef(Signature)).second; - if (IsNew) { - if (Config->Relocatable) - this->Sections[I] = createInputSection(Sec); -@@ -459,7 +454,7 @@ - } - - // Otherwise, discard group members. -- for (uint32_t SecIndex : Entries) { -+ for (uint32_t SecIndex : Entries.slice(1)) { - if (SecIndex >= Size) - fatal(toString(this) + - ": invalid section index in group: " + Twine(SecIndex)); -diff -ru --new-file lld-8.0.0rc1.src.orig/test/ELF/sht-group-empty.test lld-8.0.0rc1.src/test/ELF/sht-group-empty.test ---- lld-8.0.0rc1.src.orig/test/ELF/sht-group-empty.test 1970-01-01 00:00:00.000000000 +0000 -+++ lld-8.0.0rc1.src/test/ELF/sht-group-empty.test 2019-02-13 10:40:11.958253274 +0000 -@@ -0,0 +1,55 @@ -+# RUN: yaml2obj %s -o %t.o -+# RUN: ld.lld %t.o %t.o -o %t -r -+# RUN: llvm-readobj -s %t | FileCheck %s -+ -+# CHECK: Name: .text.foo -+# CHECK: Name: .rela.text.foo -+ -+--- !ELF -+FileHeader: -+ Class: ELFCLASS64 -+ Data: ELFDATA2LSB -+ Type: ET_REL -+ Machine: EM_X86_64 -+Sections: -+ - Name: .group -+ Type: SHT_GROUP -+ Link: .symtab -+ Info: foo -+ Members: -+ - SectionOrType: GRP_COMDAT -+ - SectionOrType: .text.foo -+ - SectionOrType: .text.bar -+ - SectionOrType: .note -+ - Name: .note -+ Type: SHT_NOTE -+ Flags: [ SHF_GROUP ] -+ - Name: .text.foo -+ Type: SHT_PROGBITS -+ Flags: [ SHF_ALLOC, SHF_EXECINSTR, SHF_GROUP ] -+ - Name: .text.bar -+ Type: SHT_PROGBITS -+ Flags: [ SHF_ALLOC, SHF_EXECINSTR, SHF_GROUP ] -+ - Name: .rela.text.foo -+ Type: SHT_RELA -+ Flags: [ SHF_INFO_LINK, SHF_GROUP ] -+ Link: .symtab -+ Info: .text.foo -+ Relocations: -+ - Offset: 0x0000000000000000 -+ Symbol: foo -+ Type: R_X86_64_64 -+ - Name: .rela.text.bar -+ Type: SHT_RELA -+ Flags: [ SHF_INFO_LINK, SHF_GROUP ] -+ Link: .symtab -+ Info: .text.bar -+ Relocations: -+ - Offset: 0x0000000000000000 -+ Symbol: bar -+ Type: R_X86_64_64 -+Symbols: -+ Global: -+ - Name: foo -+ - Name: bar -+ diff --git a/lld.spec b/lld.spec index 2f110e7..bbca57e 100644 --- a/lld.spec +++ b/lld.spec @@ -12,12 +12,12 @@ Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver} Patch0: 0001-CMake-Check-for-gtest-headers-even-if-lit.py-is-not-.patch Patch1: 0001-lld-Prefer-using-the-newest-installed-python-version.patch -Patch2: 0001-Partial-support-of-SHT_GROUP-without-flag.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: llvm-devel = %{version} +BuildRequires: llvm-test = %{version} BuildRequires: ncurses-devel BuildRequires: zlib-devel BuildRequires: chrpath @@ -58,11 +58,7 @@ cd %{_target_platform} -DLLVM_INCLUDE_TESTS=ON \ -DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ - -DLLVM_TABLEGEN_EXE=%{_libdir}/llvm/llvm-tblgen\ -DLLVM_LIT_ARGS="-sv \ - -DFileCheck=%{_libdir}/llvm/FileCheck \ - -Dcount=%{_libdir}/llvm/count \ - -Dnot=%{_libdir}/llvm/not \ --path %{_libdir}/llvm" \ %if 0%{?__isa_bits} == 64 -DLLVM_LIBDIR_SUFFIX=64 @@ -80,18 +76,11 @@ cd %{_target_platform} chrpath --delete %{buildroot}%{_bindir}/* chrpath --delete %{buildroot}%{_libdir}/*.so* -for target in ld.lld ld64.lld wasm-ld -do - ln -s lld %{buildroot}%{_bindir}/${target} -done - %check # armv7lhl tests disabled because of arm issue, see https://koji.fedoraproject.org/koji/taskinfo?taskID=33660162 -%ifarch armv7lhl -true -%else +%ifnarch %{arm} make -C %{_target_platform} %{?_smp_mflags} check-lld %endif @@ -114,7 +103,19 @@ make -C %{_target_platform} %{?_smp_mflags} check-lld * Wed Mar 20 2019 sguelton@redhat.com - 8.0.0-1 - 8.0.0 final -* Mon Feb 11 2019 sguelton@redhat.com - 8.0.0-1.rc1 +* Tue Mar 12 2019 sguelton@redhat.com - 8.0.0-0.4.rc4 +- 8.0.0 Release candidate 4 + +* Tue Mar 5 2019 sguelton@redhat.com - 8.0.0-0.4.rc3 +- Cleanup specfile after llvm specfile update + +* Mon Mar 4 2019 sguelton@redhat.com - 8.0.0-0.3.rc3 +- 8.0.0 Release candidate 3 + +* Fri Feb 22 2019 sguelton@redhat.com - 8.0.0-0.2.rc2 +- 8.0.0 Release candidate 2 + +* Mon Feb 11 2019 sguelton@redhat.com - 8.0.0-0.1.rc1 - 8.0.0 Release candidate 1 * Fri Feb 01 2019 Fedora Release Engineering - 7.0.1-3.1