commit: 3963b591fec2204ebb8c0952b0f2ff6b942a711c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Dec 8 09:43:10 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Dec 9 19:20:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3963b591
sys-devel/llvm: Remove 6* Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-devel/llvm/Manifest | 2 - ...pend-Wl-rpath-link-conditionally-to-GNULD.patch | 38 --- ...c-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch | 314 --------------------- ...6DomainReassignment-from-creating-copies-.patch | 110 -------- sys-devel/llvm/llvm-6.0.1-r2.ebuild | 272 ------------------ sys-devel/llvm/llvm-6.0.1.ebuild | 264 ----------------- 6 files changed, 1000 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 5c7b9c94b5b..ac97f87f99b 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -1,5 +1,3 @@ -DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3 -DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073 diff --git a/sys-devel/llvm/files/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch b/sys-devel/llvm/files/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch deleted file mode 100644 index 5d1f042164e..00000000000 --- a/sys-devel/llvm/files/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a7c94b20187a60cf1508ce882ee37b3a056eb0bd Mon Sep 17 00:00:00 2001 -From: Michal Gorny <[email protected]> -Date: Thu, 8 Mar 2018 15:09:38 +0000 -Subject: [PATCH] [cmake] Append -Wl,-rpath-link conditionally to GNULD - -Append -Wl,-rpath-link conditionally to whether GNU ld.bfd is used -rather than the Linux+!gold conditionals. Also move it out of 'else' -branch of *BSD handling. This fixes build failures with ld.bfd -on Gentoo/FreeBSD, and should cause no harm on other systems using -ld.bfd. - -This patch improves the original logic by reusing results of linker -detection introduced in r307852. - -Differential Revision: https://reviews.llvm.org/D43751 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327007 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - cmake/modules/AddLLVM.cmake | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 20166d2cd30..95d47d00e51 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -1589,7 +1589,8 @@ function(llvm_setup_rpath name) - if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-z,origin ") -- elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT LLVM_LINKER_IS_GOLD) -+ endif() -+ if(LLVM_LINKER_IS_GNULD) - # $ORIGIN is not interpreted at link time by ld.bfd - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-rpath-link,${LLVM_LIBRARY_OUTPUT_INTDIR} ") --- -2.16.2 - diff --git a/sys-devel/llvm/files/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch b/sys-devel/llvm/files/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch deleted file mode 100644 index eac5fe44178..00000000000 --- a/sys-devel/llvm/files/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch +++ /dev/null @@ -1,314 +0,0 @@ -From 9ff352cb602d5dd68bcd7bf2ba4711c8568271a9 Mon Sep 17 00:00:00 2001 -From: George Rimar <[email protected]> -Date: Tue, 20 Feb 2018 10:17:57 +0000 -Subject: [PATCH] [llvm-mc] - Produce R_X86_64_PLT32 for "call/jmp foo". - -For instructions like call foo and jmp foo patch changes -relocation produced from R_X86_64_PC32 to R_X86_64_PLT32. -Relocation can be used as a marker for 32-bit PC-relative branches. -Linker will reduce PLT32 relocation to PC32 if function is defined locally. - -Differential revision: https://reviews.llvm.org/D43383 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@325569 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp | 3 ++ - .../X86/MCTargetDesc/X86ELFObjectWriter.cpp | 3 ++ - lib/Target/X86/MCTargetDesc/X86FixupKinds.h | 1 + - .../X86/MCTargetDesc/X86MCCodeEmitter.cpp | 32 +++++++++++++++++-- - .../X86/MCTargetDesc/X86MachObjectWriter.cpp | 1 + - .../MCTargetDesc/X86WinCOFFObjectWriter.cpp | 1 + - test/CodeGen/X86/cmp.ll | 2 +- - test/CodeGen/X86/fma.ll | 8 ++--- - test/MC/ELF/basic-elf-64.s | 18 ++++++----- - test/MC/ELF/ifunc-reloc.s | 2 +- - test/MC/ELF/weak-diff.s | 2 +- - test/MC/ELF/weak-relocation.s | 2 +- - test/MC/ELF/weakref-reloc.s | 2 +- - 13 files changed, 58 insertions(+), 19 deletions(-) - -diff --git a/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp -index 34db5918926..b301722b535 100644 ---- a/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp -+++ b/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp -@@ -46,6 +46,7 @@ static unsigned getFixupKindLog2Size(unsigned Kind) { - case X86::reloc_signed_4byte: - case X86::reloc_signed_4byte_relax: - case X86::reloc_global_offset_table: -+ case X86::reloc_branch_4byte_pcrel: - case FK_SecRel_4: - case FK_Data_4: - return 2; -@@ -95,6 +96,7 @@ public: - {"reloc_signed_4byte_relax", 0, 32, 0}, - {"reloc_global_offset_table", 0, 32, 0}, - {"reloc_global_offset_table8", 0, 64, 0}, -+ {"reloc_branch_4byte_pcrel", 0, 32, MCFixupKindInfo::FKF_IsPCRel}, - }; - - if (Kind < FirstTargetFixupKind) -@@ -102,6 +104,7 @@ public: - - assert(unsigned(Kind - FirstTargetFixupKind) < getNumFixupKinds() && - "Invalid kind!"); -+ assert(Infos[Kind - FirstTargetFixupKind].Name && "Empty fixup name!"); - return Infos[Kind - FirstTargetFixupKind]; - } - -diff --git a/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp b/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp -index 4cdbae4d0d9..2ecbb80cd06 100644 ---- a/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp -+++ b/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp -@@ -75,6 +75,9 @@ static X86_64RelType getType64(unsigned Kind, - case X86::reloc_riprel_4byte_relax_rex: - case X86::reloc_riprel_4byte_movq_load: - return RT64_32; -+ case X86::reloc_branch_4byte_pcrel: -+ Modifier = MCSymbolRefExpr::VK_PLT; -+ return RT64_32; - case FK_PCRel_2: - case FK_Data_2: - return RT64_16; -diff --git a/lib/Target/X86/MCTargetDesc/X86FixupKinds.h b/lib/Target/X86/MCTargetDesc/X86FixupKinds.h -index dfdc9ec29ae..3c04b13e002 100644 ---- a/lib/Target/X86/MCTargetDesc/X86FixupKinds.h -+++ b/lib/Target/X86/MCTargetDesc/X86FixupKinds.h -@@ -30,6 +30,7 @@ enum Fixups { - // of the instruction. Used only - // for _GLOBAL_OFFSET_TABLE_. - reloc_global_offset_table8, // 64-bit variant. -+ reloc_branch_4byte_pcrel, // 32-bit PC relative branch. - // Marker - LastTargetFixupKind, - NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind -diff --git a/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp b/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp -index 4ddc1f0ba42..608dc4acb04 100644 ---- a/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp -+++ b/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp -@@ -152,6 +152,8 @@ public: - - uint8_t DetermineREXPrefix(const MCInst &MI, uint64_t TSFlags, - int MemOperand, const MCInstrDesc &Desc) const; -+ -+ bool isPCRel32Branch(const MCInst &MI) const; - }; - - } // end anonymous namespace -@@ -276,6 +278,22 @@ static bool HasSecRelSymbolRef(const MCExpr *Expr) { - return false; - } - -+bool X86MCCodeEmitter::isPCRel32Branch(const MCInst &MI) const { -+ unsigned Opcode = MI.getOpcode(); -+ const MCInstrDesc &Desc = MCII.get(Opcode); -+ if ((Opcode != X86::CALL64pcrel32 && Opcode != X86::JMP_4) || -+ getImmFixupKind(Desc.TSFlags) != FK_PCRel_4) -+ return false; -+ -+ unsigned CurOp = X86II::getOperandBias(Desc); -+ const MCOperand &Op = MI.getOperand(CurOp); -+ if (!Op.isExpr()) -+ return false; -+ -+ const MCSymbolRefExpr *Ref = dyn_cast<MCSymbolRefExpr>(Op.getExpr()); -+ return Ref && Ref->getKind() == MCSymbolRefExpr::VK_None; -+} -+ - void X86MCCodeEmitter:: - EmitImmediate(const MCOperand &DispOp, SMLoc Loc, unsigned Size, - MCFixupKind FixupKind, unsigned &CurByte, raw_ostream &OS, -@@ -331,7 +349,8 @@ EmitImmediate(const MCOperand &DispOp, SMLoc Loc, unsigned Size, - FixupKind == MCFixupKind(X86::reloc_riprel_4byte) || - FixupKind == MCFixupKind(X86::reloc_riprel_4byte_movq_load) || - FixupKind == MCFixupKind(X86::reloc_riprel_4byte_relax) || -- FixupKind == MCFixupKind(X86::reloc_riprel_4byte_relax_rex)) -+ FixupKind == MCFixupKind(X86::reloc_riprel_4byte_relax_rex) || -+ FixupKind == MCFixupKind(X86::reloc_branch_4byte_pcrel)) - ImmOffset -= 4; - if (FixupKind == FK_PCRel_2) - ImmOffset -= 2; -@@ -1287,9 +1306,18 @@ encodeInstruction(const MCInst &MI, raw_ostream &OS, - EmitByte(BaseOpcode, CurByte, OS); - break; - } -- case X86II::RawFrm: -+ case X86II::RawFrm: { - EmitByte(BaseOpcode, CurByte, OS); -+ -+ if (!is64BitMode(STI) || !isPCRel32Branch(MI)) -+ break; -+ -+ const MCOperand &Op = MI.getOperand(CurOp++); -+ EmitImmediate(Op, MI.getLoc(), X86II::getSizeOfImm(TSFlags), -+ MCFixupKind(X86::reloc_branch_4byte_pcrel), CurByte, OS, -+ Fixups); - break; -+ } - case X86II::RawFrmMemOffs: - // Emit segment override opcode prefix as needed. - EmitSegmentOverridePrefix(CurByte, 1, MI, OS); -diff --git a/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp b/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp -index 965f7de809b..22773e64409 100644 ---- a/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp -+++ b/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp -@@ -94,6 +94,7 @@ static unsigned getFixupKindLog2Size(unsigned Kind) { - case X86::reloc_riprel_4byte_movq_load: - case X86::reloc_signed_4byte: - case X86::reloc_signed_4byte_relax: -+ case X86::reloc_branch_4byte_pcrel: - case FK_Data_4: return 2; - case FK_Data_8: return 3; - } -diff --git a/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp b/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp -index 5139bb46b56..291056e3526 100644 ---- a/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp -+++ b/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp -@@ -62,6 +62,7 @@ unsigned X86WinCOFFObjectWriter::getRelocType(MCContext &Ctx, - case X86::reloc_riprel_4byte_movq_load: - case X86::reloc_riprel_4byte_relax: - case X86::reloc_riprel_4byte_relax_rex: -+ case X86::reloc_branch_4byte_pcrel: - return COFF::IMAGE_REL_AMD64_REL32; - case FK_Data_4: - case X86::reloc_signed_4byte: -diff --git a/test/CodeGen/X86/cmp.ll b/test/CodeGen/X86/cmp.ll -index 1ab8421638d..244e651e182 100644 ---- a/test/CodeGen/X86/cmp.ll -+++ b/test/CodeGen/X86/cmp.ll -@@ -240,7 +240,7 @@ define i32 @test12() ssp uwtable { - ; CHECK-NEXT: pushq %rax # encoding: [0x50] - ; CHECK-NEXT: .cfi_def_cfa_offset 16 - ; CHECK-NEXT: callq test12b # encoding: [0xe8,A,A,A,A] --; CHECK-NEXT: # fixup A - offset: 1, value: test12b-4, kind: FK_PCRel_4 -+; CHECK-NEXT: # fixup A - offset: 1, value: test12b-4, kind: reloc_branch_4byte_pcrel - ; CHECK-NEXT: testb %al, %al # encoding: [0x84,0xc0] - ; CHECK-NEXT: je .LBB12_2 # encoding: [0x74,A] - ; CHECK-NEXT: # fixup A - offset: 1, value: .LBB12_2-1, kind: FK_PCRel_1 -diff --git a/test/CodeGen/X86/fma.ll b/test/CodeGen/X86/fma.ll -index 611f707d64c..2c919e3ebc9 100644 ---- a/test/CodeGen/X86/fma.ll -+++ b/test/CodeGen/X86/fma.ll -@@ -137,7 +137,7 @@ define x86_fp80 @test_f80(x86_fp80 %a, x86_fp80 %b, x86_fp80 %c) #0 { - ; FMA64-NEXT: fstpt {{[0-9]+}}(%rsp) ## encoding: [0xdb,0x7c,0x24,0x10] - ; FMA64-NEXT: fstpt (%rsp) ## encoding: [0xdb,0x3c,0x24] - ; FMA64-NEXT: callq _fmal ## encoding: [0xe8,A,A,A,A] --; FMA64-NEXT: ## fixup A - offset: 1, value: _fmal-4, kind: FK_PCRel_4 -+; FMA64-NEXT: ## fixup A - offset: 1, value: _fmal-4, kind: reloc_branch_4byte_pcrel - ; FMA64-NEXT: addq $56, %rsp ## encoding: [0x48,0x83,0xc4,0x38] - ; FMA64-NEXT: retq ## encoding: [0xc3] - ; -@@ -151,7 +151,7 @@ define x86_fp80 @test_f80(x86_fp80 %a, x86_fp80 %b, x86_fp80 %c) #0 { - ; FMACALL64-NEXT: fstpt {{[0-9]+}}(%rsp) ## encoding: [0xdb,0x7c,0x24,0x10] - ; FMACALL64-NEXT: fstpt (%rsp) ## encoding: [0xdb,0x3c,0x24] - ; FMACALL64-NEXT: callq _fmal ## encoding: [0xe8,A,A,A,A] --; FMACALL64-NEXT: ## fixup A - offset: 1, value: _fmal-4, kind: FK_PCRel_4 -+; FMACALL64-NEXT: ## fixup A - offset: 1, value: _fmal-4, kind: reloc_branch_4byte_pcrel - ; FMACALL64-NEXT: addq $56, %rsp ## encoding: [0x48,0x83,0xc4,0x38] - ; FMACALL64-NEXT: retq ## encoding: [0xc3] - ; -@@ -165,7 +165,7 @@ define x86_fp80 @test_f80(x86_fp80 %a, x86_fp80 %b, x86_fp80 %c) #0 { - ; AVX512-NEXT: fstpt {{[0-9]+}}(%rsp) ## encoding: [0xdb,0x7c,0x24,0x10] - ; AVX512-NEXT: fstpt (%rsp) ## encoding: [0xdb,0x3c,0x24] - ; AVX512-NEXT: callq _fmal ## encoding: [0xe8,A,A,A,A] --; AVX512-NEXT: ## fixup A - offset: 1, value: _fmal-4, kind: FK_PCRel_4 -+; AVX512-NEXT: ## fixup A - offset: 1, value: _fmal-4, kind: reloc_branch_4byte_pcrel - ; AVX512-NEXT: addq $56, %rsp ## encoding: [0x48,0x83,0xc4,0x38] - ; AVX512-NEXT: retq ## encoding: [0xc3] - ; -@@ -179,7 +179,7 @@ define x86_fp80 @test_f80(x86_fp80 %a, x86_fp80 %b, x86_fp80 %c) #0 { - ; AVX512VL-NEXT: fstpt {{[0-9]+}}(%rsp) ## encoding: [0xdb,0x7c,0x24,0x10] - ; AVX512VL-NEXT: fstpt (%rsp) ## encoding: [0xdb,0x3c,0x24] - ; AVX512VL-NEXT: callq _fmal ## encoding: [0xe8,A,A,A,A] --; AVX512VL-NEXT: ## fixup A - offset: 1, value: _fmal-4, kind: FK_PCRel_4 -+; AVX512VL-NEXT: ## fixup A - offset: 1, value: _fmal-4, kind: reloc_branch_4byte_pcrel - ; AVX512VL-NEXT: addq $56, %rsp ## encoding: [0x48,0x83,0xc4,0x38] - ; AVX512VL-NEXT: retq ## encoding: [0xc3] - entry: -diff --git a/test/MC/ELF/basic-elf-64.s b/test/MC/ELF/basic-elf-64.s -index 01f020bd64b..ae0903ec8cd 100644 ---- a/test/MC/ELF/basic-elf-64.s -+++ b/test/MC/ELF/basic-elf-64.s -@@ -13,6 +13,7 @@ main: # @main - callq puts - xorl %eax, %eax - addq $8, %rsp -+ call foo@GOTPCREL - ret - .Ltmp0: - .size main, .Ltmp0-main -@@ -44,14 +45,15 @@ main: # @main - - // CHECK: Name: .rela.text - --// CHECK: Relocations [ --// CHECK: Section {{.*}} .rela.text { --// CHECK: 0x5 R_X86_64_32 .rodata.str1.1 0x0 --// CHECK: 0xA R_X86_64_PC32 puts 0xFFFFFFFFFFFFFFFC --// CHECK: 0xF R_X86_64_32 .rodata.str1.1 0x6 --// CHECK: 0x14 R_X86_64_PC32 puts 0xFFFFFFFFFFFFFFFC --// CHECK: } --// CHECK: ] -+// CHECK: Relocations [ -+// CHECK: Section {{.*}} .rela.text { -+// CHECK-NEXT: 0x5 R_X86_64_32 .rodata.str1.1 0x0 -+// CHECK-NEXT: 0xA R_X86_64_PLT32 puts 0xFFFFFFFFFFFFFFFC -+// CHECK-NEXT: 0xF R_X86_64_32 .rodata.str1.1 0x6 -+// CHECK-NEXT: 0x14 R_X86_64_PLT32 puts 0xFFFFFFFFFFFFFFFC -+// CHECK-NEXT: 0x1F R_X86_64_GOTPCREL foo 0xFFFFFFFFFFFFFFFC -+// CHECK-NEXT: } -+// CHECK-NEXT: ] - - // CHECK: Symbol { - // CHECK: Binding: Local -diff --git a/test/MC/ELF/ifunc-reloc.s b/test/MC/ELF/ifunc-reloc.s -index 6f1d79b22c4..b4917371b0f 100644 ---- a/test/MC/ELF/ifunc-reloc.s -+++ b/test/MC/ELF/ifunc-reloc.s -@@ -11,6 +11,6 @@ alias: - - // CHECK: Relocations [ - // CHECK-NEXT: Section {{.*}} .rela.text { --// CHECK-NEXT: 0x1 R_X86_64_PC32 sym 0xFFFFFFFFFFFFFFFC -+// CHECK-NEXT: 0x1 R_X86_64_PLT32 sym 0xFFFFFFFFFFFFFFFC - // CHECK-NEXT: } - // CHECK-NEXT: ] -diff --git a/test/MC/ELF/weak-diff.s b/test/MC/ELF/weak-diff.s -index ded89b8f833..9785a2befb1 100644 ---- a/test/MC/ELF/weak-diff.s -+++ b/test/MC/ELF/weak-diff.s -@@ -2,7 +2,7 @@ - - // CHECK: Relocations [ - // CHECK-NEXT: Section ({{.*}}) .rela.text { --// CHECK-NEXT: 0x1D R_X86_64_PC32 f2 0xFFFFFFFFFFFFFFFC -+// CHECK-NEXT: 0x1D R_X86_64_PLT32 f2 0xFFFFFFFFFFFFFFFC - // CHECK-NEXT: } - // CHECK-NEXT: ] - -diff --git a/test/MC/ELF/weak-relocation.s b/test/MC/ELF/weak-relocation.s -index 19153aa50da..defaf4e6a38 100644 ---- a/test/MC/ELF/weak-relocation.s -+++ b/test/MC/ELF/weak-relocation.s -@@ -9,6 +9,6 @@ bar: - - // CHECK: Relocations [ - // CHECK-NEXT: Section ({{[0-9]+}}) .rela.text { --// CHECK-NEXT: 0x1 R_X86_64_PC32 foo 0xFFFFFFFFFFFFFFFC -+// CHECK-NEXT: 0x1 R_X86_64_PLT32 foo 0xFFFFFFFFFFFFFFFC - // CHECK-NEXT: } - // CHECK-NEXT: ] -diff --git a/test/MC/ELF/weakref-reloc.s b/test/MC/ELF/weakref-reloc.s -index baf80060c43..997aea0477a 100644 ---- a/test/MC/ELF/weakref-reloc.s -+++ b/test/MC/ELF/weakref-reloc.s -@@ -9,6 +9,6 @@ - // CHECK: Relocations [ - // CHECK-NEXT: Section ({{[0-9]+}}) {{[^ ]+}} { - // CHECK-NEXT: 0x1 R_X86_64_PLT32 zed 0xFFFFFFFFFFFFFFFC --// CHECK-NEXT: 0x6 R_X86_64_PC32 foo 0xFFFFFFFFFFFFFFFC -+// CHECK-NEXT: 0x6 R_X86_64_PLT32 foo 0xFFFFFFFFFFFFFFFC - // CHECK-NEXT: } - // CHECK-NEXT: ] --- -2.18.0 - diff --git a/sys-devel/llvm/files/6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch b/sys-devel/llvm/files/6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch deleted file mode 100644 index f38907cdd4c..00000000000 --- a/sys-devel/llvm/files/6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 72da952b396f43d2ce6ca20a0f0d75212fea6b28 Mon Sep 17 00:00:00 2001 -From: Craig Topper <[email protected]> -Date: Mon, 1 Oct 2018 07:08:41 +0000 -Subject: [PATCH] [X86] Stop X86DomainReassignment from creating copies between - GR8/GR16 physical registers and k-registers. - -We can only copy between a k-register and a GR32/GR64 register. - -This patch detects that the copy will be illegal and prevents the domain reassignment from happening for that closure. - -This probably isn't the best fix, and we should probably figure out how to handle this correctly. - -Fixes PR38803. - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@343443 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Target/X86/X86DomainReassignment.cpp | 21 +++++++++++ - test/CodeGen/X86/pr38803.ll | 48 ++++++++++++++++++++++++ - 2 files changed, 69 insertions(+) - create mode 100644 test/CodeGen/X86/pr38803.ll - -diff --git a/lib/Target/X86/X86DomainReassignment.cpp b/lib/Target/X86/X86DomainReassignment.cpp -index 5196446b39e..62588e9509d 100644 ---- a/lib/Target/X86/X86DomainReassignment.cpp -+++ b/lib/Target/X86/X86DomainReassignment.cpp -@@ -217,6 +217,27 @@ public: - InstrCOPYReplacer(unsigned SrcOpcode, RegDomain DstDomain, unsigned DstOpcode) - : InstrReplacer(SrcOpcode, DstOpcode), DstDomain(DstDomain) {} - -+ bool isLegal(const MachineInstr *MI, -+ const TargetInstrInfo *TII) const override { -+ if (!InstrConverterBase::isLegal(MI, TII)) -+ return false; -+ -+ // Don't allow copies to/flow GR8/GR16 physical registers. -+ // FIXME: Is there some better way to support this? -+ unsigned DstReg = MI->getOperand(0).getReg(); -+ if (TargetRegisterInfo::isPhysicalRegister(DstReg) && -+ (X86::GR8RegClass.contains(DstReg) || -+ X86::GR16RegClass.contains(DstReg))) -+ return false; -+ unsigned SrcReg = MI->getOperand(1).getReg(); -+ if (TargetRegisterInfo::isPhysicalRegister(SrcReg) && -+ (X86::GR8RegClass.contains(SrcReg) || -+ X86::GR16RegClass.contains(SrcReg))) -+ return false; -+ -+ return true; -+ } -+ - double getExtraCost(const MachineInstr *MI, - MachineRegisterInfo *MRI) const override { - assert(MI->getOpcode() == TargetOpcode::COPY && "Expected a COPY"); -diff --git a/test/CodeGen/X86/pr38803.ll b/test/CodeGen/X86/pr38803.ll -new file mode 100644 -index 00000000000..a1ca27d89b0 ---- /dev/null -+++ b/test/CodeGen/X86/pr38803.ll -@@ -0,0 +1,48 @@ -+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py -+; RUN: llc < %s -mcpu=skylake-avx512 -mtriple=x86_64-unknown-unknown | FileCheck %s -+ -+@b = local_unnamed_addr global i32 0, align 4 -+@c = local_unnamed_addr global i32 0, align 4 -+@d = local_unnamed_addr global float 0.000000e+00, align 4 -+ -+define float @_Z3fn2v() { -+; CHECK-LABEL: _Z3fn2v: -+; CHECK: # %bb.0: # %entry -+; CHECK-NEXT: pushq %rax -+; CHECK-NEXT: .cfi_def_cfa_offset 16 -+; CHECK-NEXT: callq _Z1av -+; CHECK-NEXT: # kill: def $al killed $al def $eax -+; CHECK-NEXT: kmovd %eax, %k1 -+; CHECK-NEXT: vmovss {{.*#+}} xmm0 = mem[0],zero,zero,zero -+; CHECK-NEXT: vmovss %xmm0, %xmm0, %xmm0 {%k1} {z} -+; CHECK-NEXT: cmpl $0, {{.*}}(%rip) -+; CHECK-NEXT: je .LBB0_2 -+; CHECK-NEXT: # %bb.1: # %if.then -+; CHECK-NEXT: vcvtsi2ssl {{.*}}(%rip), %xmm1, %xmm1 -+; CHECK-NEXT: kmovd %eax, %k1 -+; CHECK-NEXT: vxorps %xmm2, %xmm2, %xmm2 -+; CHECK-NEXT: vmovss %xmm2, %xmm0, %xmm1 {%k1} -+; CHECK-NEXT: vmovss %xmm1, {{.*}}(%rip) -+; CHECK-NEXT: .LBB0_2: # %if.end -+; CHECK-NEXT: popq %rax -+; CHECK-NEXT: .cfi_def_cfa_offset 8 -+; CHECK-NEXT: retq -+entry: -+ %call = tail call zeroext i1 @_Z1av() -+ %cond = select i1 %call, float 7.500000e-01, float 0.000000e+00 -+ %0 = load i32, i32* @c, align 4 -+ %tobool2 = icmp eq i32 %0, 0 -+ br i1 %tobool2, label %if.end, label %if.then -+ -+if.then: ; preds = %entry -+ %1 = load i32, i32* @b, align 4 -+ %2 = sitofp i32 %1 to float -+ %conv5 = select i1 %call, float 0.000000e+00, float %2 -+ store float %conv5, float* @d, align 4 -+ br label %if.end -+ -+if.end: ; preds = %entry, %if.then -+ ret float %cond -+} -+ -+declare zeroext i1 @_Z1av() --- -2.19.0 - diff --git a/sys-devel/llvm/llvm-6.0.1-r2.ebuild b/sys-devel/llvm/llvm-6.0.1-r2.ebuild deleted file mode 100644 index d3a922a8bc1..00000000000 --- a/sys-devel/llvm/llvm-6.0.1-r2.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \ - multiprocessing pax-utils python-any-r1 toolchain-funcs - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="https://llvm.org/"; -SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz - !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )" - -# Keep in sync with CMakeLists.txt -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) - -# Additional licenses: -# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. -# 2. ARM backend: LLVM Software Grant by ARM. -# 3. MD5 code: public-domain. -# 4. Tests (not installed): -# a. gtest: BSD. -# b. YAML tests: MIT. - -LICENSE="UoI-NCSA rc BSD public-domain - llvm_targets_ARM? ( LLVM-Grant )" -SLOT="$(ver_cut 1)" -KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="debug doc gold libedit +libffi ncurses test xar xml - kernel_Darwin ${ALL_LLVM_TARGETS[*]}" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib:0=[${MULTILIB_USEDEP}] - gold? ( - || ( - >=sys-devel/binutils-2.31.1-r4:*[plugins] - <sys-devel/binutils-2.31.1-r4:*[cxx] - ) - ) - libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) - libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) - xar? ( app-arch/xar ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - dev-lang/perl - || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 - ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) - ) - kernel_Darwin? ( - <sys-libs/libcxx-$(ver_cut 1-3).9999 - >=sys-devel/binutils-apple-5.1 - ) - doc? ( dev-python/sphinx ) - gold? ( sys-libs/binutils-libs ) - libffi? ( virtual/pkgconfig ) - ${PYTHON_DEPS}" -# There are no file collisions between these versions but having :0 -# installed means llvm-config there will take precedence. -RDEPEND="${RDEPEND} - !sys-devel/llvm:0" -PDEPEND="sys-devel/llvm-common - gold? ( >=sys-devel/llvmgold-${SLOT} )" - -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" - -S=${WORKDIR}/${P/_/}.src - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -src_prepare() { - # Fix llvm-config for shared linking and sane flags - # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch - - # Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD). - eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch - - # Fix assembly compatibility with binutils-2.31.1 - # https://bugs.gentoo.org/663442 - eapply "${FILESDIR}"/6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch - - # Fix x86 codegen bug triggered by Chromium - # https://bugs.gentoo.org/664868 - eapply "${FILESDIR}"/6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch - - # disable use of SDK on OSX, bug #568758 - sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die - - # User patches + QA - cmake-utils_src_prepare -} - -multilib_src_configure() { - local ffi_cflags ffi_ldflags - if use libffi; then - ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) - ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - # disable appending VCS revision to the version to improve - # direct cache hit ratio - -DLLVM_APPEND_VC_REV=OFF - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" - -DLLVM_BUILD_TESTS=$(usex test) - - -DLLVM_ENABLE_FFI=$(usex libffi) - -DLLVM_ENABLE_LIBEDIT=$(usex libedit) - -DLLVM_ENABLE_TERMINFO=$(usex ncurses) - -DLLVM_ENABLE_LIBXML2=$(usex xml) - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DWITH_POLLY=OFF # TODO - - -DLLVM_HOST_TRIPLE="${CHOST}" - - -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" - -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" - # used only for llvm-objdump tool - -DHAVE_LIBXAR=$(multilib_native_usex xar 1 0) - - # disable OCaml bindings (now in dev-ml/llvm-ocaml) - -DOCAMLFIND=NO - ) - -# Note: go bindings have no CMake rules at the moment -# but let's kill the check in case they are introduced -# if ! multilib_is_native_abi || ! use go; then - mycmakeargs+=( - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - ) -# fi - - use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" - ) - - if multilib_is_native_abi; then - mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) - -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=$(usex doc) - -DLLVM_ENABLE_DOXYGEN=OFF - -DLLVM_INSTALL_UTILS=ON - ) - use doc && mycmakeargs+=( - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - ) - use gold && mycmakeargs+=( - -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include - ) - fi - - if tc-is-cross-compiler; then - local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" - [[ -x "${tblgen}" ]] \ - || die "${tblgen} not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN="${tblgen}" - ) - fi - - # workaround BMI bug in gcc-7 (fixed in 7.4) - # https://bugs.gentoo.org/649880 - # apply only to x86, https://bugs.gentoo.org/650506 - if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] && - [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]] - then - local CFLAGS="${CFLAGS} -mno-bmi" - local CXXFLAGS="${CXXFLAGS} -mno-bmi" - fi - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - - pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld - pax-mark m "${BUILD_DIR}"/bin/lli - pax-mark m "${BUILD_DIR}"/bin/lli-child-target - - if use test; then - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests - pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check -} - -src_install() { - local MULTILIB_CHOST_TOOLS=( - /usr/lib/llvm/${SLOT}/bin/llvm-config - ) - - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/llvm/Config/llvm-config.h - ) - - local LLVM_LDPATHS=() - multilib-minimal_src_install - - # move wrapped headers back - mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die -} - -multilib_src_install() { - cmake-utils_src_install - - # move headers to /usr/include for wrapping - rm -rf "${ED%/}"/usr/include || die - mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die - - LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) -} - -multilib_src_install_all() { - local revord=$(( 9999 - ${SLOT} )) - cat <<-_EOF_ > "${T}/10llvm-${revord}" || die - PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" - # we need to duplicate it in ROOTPATH for Portage to respect... - ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" - MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" -_EOF_ - doenvd "${T}/10llvm-${revord}" - - # install pre-generated manpages - if ! use doc; then - # (doman does not support custom paths) - insinto "/usr/lib/llvm/${SLOT}/share/man/man1" - doins "${WORKDIR}/${P}-manpages/llvm"/*.1 - fi - - docompress "/usr/lib/llvm/${SLOT}/share/man" -} - -pkg_postinst() { - elog "You can find additional opt-viewer utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer" - elog "To use these scripts, you will need Python 2.7 along with the following" - elog "packages:" - elog " dev-python/pygments (for opt-viewer)" - elog " dev-python/pyyaml (for all of them)" -} diff --git a/sys-devel/llvm/llvm-6.0.1.ebuild b/sys-devel/llvm/llvm-6.0.1.ebuild deleted file mode 100644 index 3717d1d036f..00000000000 --- a/sys-devel/llvm/llvm-6.0.1.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \ - multiprocessing pax-utils python-any-r1 toolchain-funcs - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="https://llvm.org/"; -SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz - !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )" - -# Keep in sync with CMakeLists.txt -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) - -# Additional licenses: -# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. -# 2. ARM backend: LLVM Software Grant by ARM. -# 3. MD5 code: public-domain. -# 4. Tests (not installed): -# a. gtest: BSD. -# b. YAML tests: MIT. - -LICENSE="UoI-NCSA rc BSD public-domain - llvm_targets_ARM? ( LLVM-Grant )" -SLOT="$(ver_cut 1)" -KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="debug doc gold libedit +libffi ncurses test xar xml - kernel_Darwin ${ALL_LLVM_TARGETS[*]}" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib:0=[${MULTILIB_USEDEP}] - gold? ( - || ( - >=sys-devel/binutils-2.31.1-r4:*[plugins] - <sys-devel/binutils-2.31.1-r4:*[cxx] - ) - ) - libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) - libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) - xar? ( app-arch/xar ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - dev-lang/perl - || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 - ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) - ) - kernel_Darwin? ( - <sys-libs/libcxx-$(ver_cut 1-3).9999 - >=sys-devel/binutils-apple-5.1 - ) - doc? ( dev-python/sphinx ) - gold? ( sys-libs/binutils-libs ) - libffi? ( virtual/pkgconfig ) - ${PYTHON_DEPS}" -# There are no file collisions between these versions but having :0 -# installed means llvm-config there will take precedence. -RDEPEND="${RDEPEND} - !sys-devel/llvm:0" -PDEPEND="sys-devel/llvm-common - gold? ( >=sys-devel/llvmgold-${SLOT} )" - -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" - -S=${WORKDIR}/${P/_/}.src - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -src_prepare() { - # Fix llvm-config for shared linking and sane flags - # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch - - # Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD). - eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch - - # disable use of SDK on OSX, bug #568758 - sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die - - # User patches + QA - cmake-utils_src_prepare -} - -multilib_src_configure() { - local ffi_cflags ffi_ldflags - if use libffi; then - ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) - ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - # disable appending VCS revision to the version to improve - # direct cache hit ratio - -DLLVM_APPEND_VC_REV=OFF - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" - -DLLVM_BUILD_TESTS=$(usex test) - - -DLLVM_ENABLE_FFI=$(usex libffi) - -DLLVM_ENABLE_LIBEDIT=$(usex libedit) - -DLLVM_ENABLE_TERMINFO=$(usex ncurses) - -DLLVM_ENABLE_LIBXML2=$(usex xml) - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DWITH_POLLY=OFF # TODO - - -DLLVM_HOST_TRIPLE="${CHOST}" - - -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" - -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" - # used only for llvm-objdump tool - -DHAVE_LIBXAR=$(multilib_native_usex xar 1 0) - - # disable OCaml bindings (now in dev-ml/llvm-ocaml) - -DOCAMLFIND=NO - ) - -# Note: go bindings have no CMake rules at the moment -# but let's kill the check in case they are introduced -# if ! multilib_is_native_abi || ! use go; then - mycmakeargs+=( - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - ) -# fi - - use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" - ) - - if multilib_is_native_abi; then - mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) - -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=$(usex doc) - -DLLVM_ENABLE_DOXYGEN=OFF - -DLLVM_INSTALL_UTILS=ON - ) - use doc && mycmakeargs+=( - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - ) - use gold && mycmakeargs+=( - -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include - ) - fi - - if tc-is-cross-compiler; then - local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" - [[ -x "${tblgen}" ]] \ - || die "${tblgen} not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN="${tblgen}" - ) - fi - - # workaround BMI bug in gcc-7 (fixed in 7.4) - # https://bugs.gentoo.org/649880 - # apply only to x86, https://bugs.gentoo.org/650506 - if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] && - [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]] - then - local CFLAGS="${CFLAGS} -mno-bmi" - local CXXFLAGS="${CXXFLAGS} -mno-bmi" - fi - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - - pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld - pax-mark m "${BUILD_DIR}"/bin/lli - pax-mark m "${BUILD_DIR}"/bin/lli-child-target - - if use test; then - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests - pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - cmake-utils_src_make check -} - -src_install() { - local MULTILIB_CHOST_TOOLS=( - /usr/lib/llvm/${SLOT}/bin/llvm-config - ) - - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/llvm/Config/llvm-config.h - ) - - local LLVM_LDPATHS=() - multilib-minimal_src_install - - # move wrapped headers back - mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die -} - -multilib_src_install() { - cmake-utils_src_install - - # move headers to /usr/include for wrapping - rm -rf "${ED%/}"/usr/include || die - mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die - - LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) -} - -multilib_src_install_all() { - local revord=$(( 9999 - ${SLOT} )) - cat <<-_EOF_ > "${T}/10llvm-${revord}" || die - PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" - # we need to duplicate it in ROOTPATH for Portage to respect... - ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" - MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" -_EOF_ - doenvd "${T}/10llvm-${revord}" - - # install pre-generated manpages - if ! use doc; then - # (doman does not support custom paths) - insinto "/usr/lib/llvm/${SLOT}/share/man/man1" - doins "${WORKDIR}/${P}-manpages/llvm"/*.1 - fi - - docompress "/usr/lib/llvm/${SLOT}/share/man" -} - -pkg_postinst() { - elog "You can find additional opt-viewer utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer" - elog "To use these scripts, you will need Python 2.7 along with the following" - elog "packages:" - elog " dev-python/pygments (for opt-viewer)" - elog " dev-python/pyyaml (for all of them)" -}
