lld-netbsd: Update to SVN r. 354151

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: lld-netbsd: Update to SVN r. 354151
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Fri, 15 Feb 2019 21:12:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Feb 15 22:12:52 2019 +0100
Changeset:	152206e32024cda46ce849d9b844ce93ef04b0df

Modified Files:
	lld-netbsd/Makefile
	lld-netbsd/distinfo
	lld-netbsd/patches/patch-CMakeLists.txt
	lld-netbsd/patches/patch-ELF_Config.h
	lld-netbsd/patches/patch-ELF_Driver.cpp
	lld-netbsd/patches/patch-ELF_Driver.h
	lld-netbsd/patches/patch-ELF_Options.td
	lld-netbsd/patches/patch-ELF_Writer.cpp
	lld-netbsd/patches/patch-docs_ld.lld.1
	lld-netbsd/patches/patch-test_ELF_gnustack.s

Log Message:
lld-netbsd: Update to SVN r. 354151

Blindly rebase lld patches just to make them apply.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=152206e32024cda46ce849d9b844ce93ef04b0df

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lld-netbsd/Makefile                          |  2 +-
 lld-netbsd/distinfo                          | 16 +++++++-------
 lld-netbsd/patches/patch-CMakeLists.txt      |  8 ++-----
 lld-netbsd/patches/patch-ELF_Config.h        | 14 ++++---------
 lld-netbsd/patches/patch-ELF_Driver.cpp      | 31 ++++++++--------------------
 lld-netbsd/patches/patch-ELF_Driver.h        | 12 +++--------
 lld-netbsd/patches/patch-ELF_Options.td      |  9 +++-----
 lld-netbsd/patches/patch-ELF_Writer.cpp      | 12 +++--------
 lld-netbsd/patches/patch-docs_ld.lld.1       |  9 +++-----
 lld-netbsd/patches/patch-test_ELF_gnustack.s |  7 ++-----
 10 files changed, 38 insertions(+), 82 deletions(-)

diffs:
diff --git a/lld-netbsd/Makefile b/lld-netbsd/Makefile
index e924b3dc92..06d8c98282 100644
--- a/lld-netbsd/Makefile
+++ b/lld-netbsd/Makefile
@@ -2,7 +2,7 @@
 
 SVN_REPOSITORIES=	lld
 SVN_REPO.lld=		http://llvm.org/svn/llvm-project/lld/trunk
-SVN_REVISION.lld=	352933
+SVN_REVISION.lld=	354151
 
 PKGNAME=		lld-9.0.0
 #DISTNAME=		${PKGNAME}.src
diff --git a/lld-netbsd/distinfo b/lld-netbsd/distinfo
index 5321b695fe..cf1cd6510b 100644
--- a/lld-netbsd/distinfo
+++ b/lld-netbsd/distinfo
@@ -8,11 +8,11 @@ SHA1 (llvm-7.0.1.src.tar.xz) = f97632fcc3186eb0d396492ef8acfc807648580f
 RMD160 (llvm-7.0.1.src.tar.xz) = dae96c6f85afb60e73564dc40d02171d01ffdb8f
 SHA512 (llvm-7.0.1.src.tar.xz) = ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
 Size (llvm-7.0.1.src.tar.xz) = 28311056 bytes
-SHA1 (patch-CMakeLists.txt) = df8e32f5f23bf2f2615a891177f61dc65359e955
-SHA1 (patch-ELF_Config.h) = bade1445bbe11d881881dfd1164529e508913b5b
-SHA1 (patch-ELF_Driver.cpp) = 323ec3ceb6d9baea6296fc2472c03c2e89ac5c2b
-SHA1 (patch-ELF_Driver.h) = e100fb0c86cc7d20b0f64919e73888a81a4836df
-SHA1 (patch-ELF_Options.td) = c8107a2c599b2444e52bdefe5f2dc539d277a092
-SHA1 (patch-ELF_Writer.cpp) = ab4ca25f832f20a5b4c80fe0f5f28822c09fb4ee
-SHA1 (patch-docs_ld.lld.1) = 204ea3263b6ac9de92a60bfec3a4fc5add9f3046
-SHA1 (patch-test_ELF_gnustack.s) = b3827436dcfc67d51b8d293b11538808537ddeec
+SHA1 (patch-CMakeLists.txt) = 723f9cbc55f7b94e584ca44f61b4d800be496318
+SHA1 (patch-ELF_Config.h) = 51a7bcd6ce475a23726d06a3133d747e4116b490
+SHA1 (patch-ELF_Driver.cpp) = bb78b6c4137990d41c8586137c2ff792ad1ee684
+SHA1 (patch-ELF_Driver.h) = cf2278adc6ab0b18d95876d554cf88dcd16732b5
+SHA1 (patch-ELF_Options.td) = 04b115a03368cf81a14ed2e136bf1a7d40578135
+SHA1 (patch-ELF_Writer.cpp) = 900537f010b6392f1f9ef3bb0e413950ee06b17d
+SHA1 (patch-docs_ld.lld.1) = c4bbd07322c1dec8dae36cd9e1c8b89ea2bb4ea9
+SHA1 (patch-test_ELF_gnustack.s) = 11189af40f1bddd8d04ae3126e6b14fd03879b30
diff --git a/lld-netbsd/patches/patch-CMakeLists.txt b/lld-netbsd/patches/patch-CMakeLists.txt
index 211f3f1cfa..4e83268c98 100644
--- a/lld-netbsd/patches/patch-CMakeLists.txt
+++ b/lld-netbsd/patches/patch-CMakeLists.txt
@@ -1,10 +1,6 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/02/01 16:30:00 mgorny Exp $
+$NetBSD$
 
-LLD 7.0.1 is incompatible with gtest version in pkgsrc.  Remove
-the condition that prevents it from building its own copy when system
-version is installed.
-
---- CMakeLists.txt.orig	2017-11-17 18:14:09.000000000 +0000
+--- CMakeLists.txt.orig	2019-02-01 23:06:35.000000000 +0000
 +++ CMakeLists.txt
 @@ -86,7 +86,6 @@ Please install Python or specify the PYT
        endif()
diff --git a/lld-netbsd/patches/patch-ELF_Config.h b/lld-netbsd/patches/patch-ELF_Config.h
index f047cfe4cd..007f4c6289 100644
--- a/lld-netbsd/patches/patch-ELF_Config.h
+++ b/lld-netbsd/patches/patch-ELF_Config.h
@@ -1,12 +1,6 @@
-$NetBSD: patch-ELF_Config.h,v 1.1 2019/02/01 16:30:00 mgorny Exp $
+$NetBSD$
 
-Add support for customizing LLD behavior on target triple.
-https://reviews.llvm.org/D56650
-
-Add '-z nognustack' option to disable emitting PT_GNU_STACK.
-https://reviews.llvm.org/D56554
-
---- ELF/Config.h.orig	2019-02-01 23:06:35.000000000 +0000
+--- ELF/Config.h.orig	2019-02-15 21:11:17.982194121 +0000
 +++ ELF/Config.h
 @@ -13,6 +13,7 @@
  #include "llvm/ADT/MapVector.h"
@@ -16,7 +10,7 @@ https://reviews.llvm.org/D56554
  #include "llvm/BinaryFormat/ELF.h"
  #include "llvm/Support/CachePruning.h"
  #include "llvm/Support/CodeGen.h"
-@@ -194,6 +195,7 @@ struct Configuration {
+@@ -195,6 +196,7 @@ struct Configuration {
    bool ZNodefaultlib;
    bool ZNodelete;
    bool ZNodlopen;
@@ -24,7 +18,7 @@ https://reviews.llvm.org/D56554
    bool ZNow;
    bool ZOrigin;
    bool ZRelro;
-@@ -277,6 +279,10 @@ struct Configuration {
+@@ -292,6 +294,10 @@ struct Configuration {
  
    // 4 for ELF32, 8 for ELF64.
    int Wordsize;
diff --git a/lld-netbsd/patches/patch-ELF_Driver.cpp b/lld-netbsd/patches/patch-ELF_Driver.cpp
index 1e9c933552..43caa08472 100644
--- a/lld-netbsd/patches/patch-ELF_Driver.cpp
+++ b/lld-netbsd/patches/patch-ELF_Driver.cpp
@@ -1,18 +1,6 @@
-$NetBSD: patch-ELF_Driver.cpp,v 1.1 2019/02/01 16:30:00 mgorny Exp $
+$NetBSD$
 
-Add support for customizing LLD behavior on target triple.
-https://reviews.llvm.org/D56650
-
-Add '-z nognustack' option to disable emitting PT_GNU_STACK.
-https://reviews.llvm.org/D56554
-
-Alter defaults for NetBSD targets:
-* add default library search paths
-* force combined RO+RW segment due to ld.elf_so limitations
-* disable PT_GNU_STACK (meaningless on NetBSD)
-* disable 'new dtags', i.e. force RPATH instead of RUNPATH
-
---- ELF/Driver.cpp.orig	2019-02-01 23:06:35.000000000 +0000
+--- ELF/Driver.cpp.orig	2019-02-15 21:11:17.981035137 +0000
 +++ ELF/Driver.cpp
 @@ -53,6 +53,7 @@
  #include "llvm/Support/LEB128.h"
@@ -98,7 +86,7 @@ Alter defaults for NetBSD targets:
  void LinkerDriver::main(ArrayRef<const char *> ArgsArr) {
    ELFOptTable Parser;
    opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
-@@ -377,6 +431,29 @@ void LinkerDriver::main(ArrayRef<const c
+@@ -378,6 +432,29 @@ void LinkerDriver::main(ArrayRef<const c
      return;
    }
  
@@ -128,7 +116,7 @@ Alter defaults for NetBSD targets:
    // Handle -v or -version.
    //
    // A note about "compatible with GNU linkers" message: this is a hack for
-@@ -392,26 +469,11 @@ void LinkerDriver::main(ArrayRef<const c
+@@ -393,25 +470,11 @@ void LinkerDriver::main(ArrayRef<const c
    // lot of "configure" scripts out there that are generated by old version
    // of Libtool. We cannot convince every software developer to migrate to
    // the latest version and re-generate scripts. So we have this hack.
@@ -152,12 +140,11 @@ Alter defaults for NetBSD targets:
    }
  
 -  readConfigs(Args);
--  checkZOptions(Args);
 -
    // The behavior of -v or --version is a bit strange, but this is
    // needed for compatibility with GNU linkers.
    if (Args.hasArg(OPT_v) && !Args.hasArg(OPT_INPUT))
-@@ -419,7 +481,6 @@ void LinkerDriver::main(ArrayRef<const c
+@@ -419,7 +482,6 @@ void LinkerDriver::main(ArrayRef<const c
    if (Args.hasArg(OPT_version))
      return;
  
@@ -165,7 +152,7 @@ Alter defaults for NetBSD targets:
    createFiles(Args);
    if (errorCount())
      return;
-@@ -745,6 +806,34 @@ static void parseClangOption(StringRef O
+@@ -745,6 +807,34 @@ static void parseClangOption(StringRef O
    error(Msg + ": " + StringRef(Err).trim());
  }
  
@@ -200,7 +187,7 @@ Alter defaults for NetBSD targets:
  // Initializes Config members by the command line options.
  void LinkerDriver::readConfigs(opt::InputArgList &Args) {
    errorHandler().Verbose = Args.hasArg(OPT_verbose);
-@@ -780,7 +869,7 @@ void LinkerDriver::readConfigs(opt::Inpu
+@@ -781,7 +871,7 @@ void LinkerDriver::readConfigs(opt::Inpu
    Config->CallGraphProfileSort = Args.hasFlag(
        OPT_call_graph_profile_sort, OPT_no_call_graph_profile_sort, true);
    Config->EnableNewDtags =
@@ -209,7 +196,7 @@ Alter defaults for NetBSD targets:
    Config->Entry = Args.getLastArgValue(OPT_entry);
    Config->ExecuteOnly =
        Args.hasFlag(OPT_execute_only, OPT_no_execute_only, false);
-@@ -870,6 +959,7 @@ void LinkerDriver::readConfigs(opt::Inpu
+@@ -871,6 +961,7 @@ void LinkerDriver::readConfigs(opt::Inpu
    Config->ZCombreloc = getZFlag(Args, "combreloc", "nocombreloc", true);
    Config->ZCopyreloc = getZFlag(Args, "copyreloc", "nocopyreloc", true);
    Config->ZExecstack = getZFlag(Args, "execstack", "noexecstack", false);
@@ -217,7 +204,7 @@ Alter defaults for NetBSD targets:
    Config->ZGlobal = hasZOption(Args, "global");
    Config->ZHazardplt = hasZOption(Args, "hazardplt");
    Config->ZInitfirst = hasZOption(Args, "initfirst");
-@@ -1174,7 +1264,7 @@ void LinkerDriver::inferMachineType() {
+@@ -1175,7 +1266,7 @@ void LinkerDriver::inferMachineType() {
  // each target.
  static uint64_t getMaxPageSize(opt::InputArgList &Args) {
    uint64_t Val = args::getZOptionValue(Args, OPT_z, "max-page-size",
diff --git a/lld-netbsd/patches/patch-ELF_Driver.h b/lld-netbsd/patches/patch-ELF_Driver.h
index 560609c3f9..1613949e21 100644
--- a/lld-netbsd/patches/patch-ELF_Driver.h
+++ b/lld-netbsd/patches/patch-ELF_Driver.h
@@ -1,14 +1,8 @@
-$NetBSD: patch-ELF_Driver.h,v 1.1 2019/02/01 16:30:00 mgorny Exp $
+$NetBSD$
 
-Add support for customizing LLD behavior on target triple.
-https://reviews.llvm.org/D56650
-
-Alter defaults for NetBSD targets:
-* add default library search paths
-
---- ELF/Driver.h.orig	2018-07-25 21:53:18.000000000 +0000
+--- ELF/Driver.h.orig	2019-02-01 23:06:35.000000000 +0000
 +++ ELF/Driver.h
-@@ -31,7 +31,9 @@ public:
+@@ -30,7 +30,9 @@ public:
    void addLibrary(StringRef Name);
  
  private:
diff --git a/lld-netbsd/patches/patch-ELF_Options.td b/lld-netbsd/patches/patch-ELF_Options.td
index e7dd202bb8..82138b76b9 100644
--- a/lld-netbsd/patches/patch-ELF_Options.td
+++ b/lld-netbsd/patches/patch-ELF_Options.td
@@ -1,11 +1,8 @@
-$NetBSD: patch-ELF_Options.td,v 1.1 2019/02/01 16:30:00 mgorny Exp $
+$NetBSD$
 
-Add support for customizing LLD behavior on target triple.
-https://reviews.llvm.org/D56650
-
---- ELF/Options.td.orig	2018-07-30 17:36:38.000000000 +0000
+--- ELF/Options.td.orig	2019-02-15 21:11:17.386739124 +0000
 +++ ELF/Options.td
-@@ -303,6 +303,8 @@ defm symbol_ordering_file:
+@@ -320,6 +320,8 @@ defm symbol_ordering_file:
  
  defm sysroot: Eq<"sysroot", "Set the system root">;
  
diff --git a/lld-netbsd/patches/patch-ELF_Writer.cpp b/lld-netbsd/patches/patch-ELF_Writer.cpp
index 469e4d3fcf..55c663167b 100644
--- a/lld-netbsd/patches/patch-ELF_Writer.cpp
+++ b/lld-netbsd/patches/patch-ELF_Writer.cpp
@@ -1,14 +1,8 @@
-$NetBSD: patch-ELF_Writer.cpp,v 1.1 2019/02/01 16:30:00 mgorny Exp $
+$NetBSD$
 
-Add '-z nognustack' option to disable emitting PT_GNU_STACK.
-https://reviews.llvm.org/D56554
-
-Alter defaults for NetBSD targets:
-* disable PT_GNU_STACK (meaningless on NetBSD)
-
---- ELF/Writer.cpp.orig	2018-10-31 17:14:17.000000000 +0000
+--- ELF/Writer.cpp.orig	2019-02-15 21:11:17.385984659 +0000
 +++ ELF/Writer.cpp
-@@ -1881,14 +1881,16 @@ template <class ELFT> std::vector<PhdrEn
+@@ -2026,14 +2026,16 @@ template <class ELFT> std::vector<PhdrEn
    if (OutputSection *Cmd = findSection(".openbsd.randomdata"))
      AddHdr(PT_OPENBSD_RANDOMIZE, Cmd->getPhdrFlags())->add(Cmd);
  
diff --git a/lld-netbsd/patches/patch-docs_ld.lld.1 b/lld-netbsd/patches/patch-docs_ld.lld.1
index 449cb574b9..5d73102f74 100644
--- a/lld-netbsd/patches/patch-docs_ld.lld.1
+++ b/lld-netbsd/patches/patch-docs_ld.lld.1
@@ -1,11 +1,8 @@
-$NetBSD: patch-docs_ld.lld.1,v 1.1 2019/02/01 16:30:00 mgorny Exp $
+$NetBSD$
 
-Add '-z nognustack' option to disable emitting PT_GNU_STACK.
-https://reviews.llvm.org/D56554
-
---- docs/ld.lld.1.orig	2019-02-01 23:06:51.000000000 +0000
+--- docs/ld.lld.1.orig	2019-02-15 21:11:16.950831955 +0000
 +++ docs/ld.lld.1
-@@ -512,6 +512,10 @@ Set the
+@@ -518,6 +518,10 @@ Set the
  .Dv DF_1_NOOPEN
  flag to indicate that the object may not be opened by
  .Xr dlopen 3 .
diff --git a/lld-netbsd/patches/patch-test_ELF_gnustack.s b/lld-netbsd/patches/patch-test_ELF_gnustack.s
index 9b697c2705..2148d9a5ca 100644
--- a/lld-netbsd/patches/patch-test_ELF_gnustack.s
+++ b/lld-netbsd/patches/patch-test_ELF_gnustack.s
@@ -1,9 +1,6 @@
-$NetBSD: patch-test_ELF_gnustack.s,v 1.1 2019/02/01 16:30:00 mgorny Exp $
+$NetBSD$
 
-Add '-z nognustack' option to disable emitting PT_GNU_STACK.
-https://reviews.llvm.org/D56554
-
---- test/ELF/gnustack.s.orig	2018-04-20 21:24:08.000000000 +0000
+--- test/ELF/gnustack.s.orig	2019-02-01 23:06:36.000000000 +0000
 +++ test/ELF/gnustack.s
 @@ -10,6 +10,9 @@
  # RUN: ld.lld %t1 -o %t -z noexecstack
Prev by Date: libextrator: update to libextractor-1.9.
Next by Date: samtools: Import from biology for repair, cleanup and testing
Previous by Thread: libextrator: update to libextractor-1.9.
Next by Thread: samtools: Import from biology for repair, cleanup and testing
Indexes:
Home | Main Index | Thread Index | Old Index