CVS commit: pkgsrc/devel/lld

["Robert Swindells" <rjs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rjs
Date:           Sun Sep  8 20:49:11 UTC 2019

Modified Files:
        pkgsrc/devel/lld: Makefile distinfo
        pkgsrc/devel/lld/patches: patch-ELF_Driver.cpp

Log Message:
Fix setting configuration.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/lld/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/lld/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp

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

Modified files:

Index: pkgsrc/devel/lld/Makefile
diff -u pkgsrc/devel/lld/Makefile:1.5 pkgsrc/devel/lld/Makefile:1.6
--- pkgsrc/devel/lld/Makefile:1.5       Mon Aug  5 19:06:50 2019
+++ pkgsrc/devel/lld/Makefile   Sun Sep  8 20:49:11 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2019/08/05 19:06:50 adam Exp $
+# $NetBSD: Makefile,v 1.6 2019/09/08 20:49:11 rjs Exp $
 
 DISTNAME=      lld-8.0.1.src
 PKGNAME=       ${DISTNAME:S/.src//}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=llvm/}
 GITHUB_PROJECT=        llvm-project

Index: pkgsrc/devel/lld/distinfo
diff -u pkgsrc/devel/lld/distinfo:1.3 pkgsrc/devel/lld/distinfo:1.4
--- pkgsrc/devel/lld/distinfo:1.3       Mon Aug  5 19:06:50 2019
+++ pkgsrc/devel/lld/distinfo   Sun Sep  8 20:49:11 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2019/08/05 19:06:50 adam Exp $
+$NetBSD: distinfo,v 1.4 2019/09/08 20:49:11 rjs Exp $
 
 SHA1 (lld-8.0.1.src.tar.xz) = 67d84c054c8b858d29389aa8ad47a25f632e4a3a
 RMD160 (lld-8.0.1.src.tar.xz) = eb28179fe500862f1ccffe1633b6b1af7239d190
@@ -6,7 +6,7 @@ SHA512 (lld-8.0.1.src.tar.xz) = 646418d4
 Size (lld-8.0.1.src.tar.xz) = 996440 bytes
 SHA1 (patch-CMakeLists.txt) = df8e32f5f23bf2f2615a891177f61dc65359e955
 SHA1 (patch-ELF_Config.h) = de2578f6c447aade843c59f78189da4f1d79b29a
-SHA1 (patch-ELF_Driver.cpp) = abb0cf1fb577cc6df04f5ca7d7edab17d27e3217
+SHA1 (patch-ELF_Driver.cpp) = 4ea55eb73e29dd90d369487528899d7e5930f2af
 SHA1 (patch-ELF_Driver.h) = e100fb0c86cc7d20b0f64919e73888a81a4836df
 SHA1 (patch-ELF_Options.td) = c8107a2c599b2444e52bdefe5f2dc539d277a092
 SHA1 (patch-ELF_Writer.cpp) = ab4ca25f832f20a5b4c80fe0f5f28822c09fb4ee

Index: pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp
diff -u pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp:1.2 pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp:1.3
--- pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp:1.2   Sun Jun  2 08:37:39 2019
+++ pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp       Sun Sep  8 20:49:11 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-ELF_Driver.cpp,v 1.2 2019/06/02 08:37:39 adam Exp $
+$NetBSD: patch-ELF_Driver.cpp,v 1.3 2019/09/08 20:49:11 rjs Exp $
 
 Add support for customizing LLD behavior on target triple.
 https://reviews.llvm.org/D56650
@@ -101,7 +101,7 @@ Alter defaults for NetBSD targets:
      return;
    }
  
-+  appendDefaultSearchPaths();
++  setTargetTriple(ArgsArr[0], Args);
 +
    // Handle -v or -version.
    //
@@ -118,7 +118,15 @@ Alter defaults for NetBSD targets:
  
    if (const char *Path = getReproduceOption(Args)) {
      // Note that --reproduce is a debug option so you can ignore it
-@@ -746,6 +805,34 @@ static void parseClangOption(StringRef O
+@@ -412,6 +471,7 @@ void LinkerDriver::main(ArrayRef<const c
+ 
+   readConfigs(Args);
+   checkZOptions(Args);
++  appendDefaultSearchPaths();
+ 
+   // The behavior of -v or --version is a bit strange, but this is
+   // needed for compatibility with GNU linkers.
+@@ -746,6 +806,34 @@ static void parseClangOption(StringRef O
    error(Msg + ": " + StringRef(Err).trim());
  }
  
@@ -153,7 +161,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);
-@@ -779,7 +866,8 @@ void LinkerDriver::readConfigs(opt::Inpu
+@@ -779,7 +867,8 @@ void LinkerDriver::readConfigs(opt::Inpu
    Config->CallGraphProfileSort = Args.hasFlag(
        OPT_call_graph_profile_sort, OPT_no_call_graph_profile_sort, true);
    Config->EnableNewDtags =
@@ -163,7 +171,7 @@ Alter defaults for NetBSD targets:
    Config->Entry = Args.getLastArgValue(OPT_entry);
    Config->ExecuteOnly =
        Args.hasFlag(OPT_execute_only, OPT_no_execute_only, false);
-@@ -869,6 +957,8 @@ void LinkerDriver::readConfigs(opt::Inpu
+@@ -869,6 +958,8 @@ 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);
@@ -172,7 +180,7 @@ Alter defaults for NetBSD targets:
    Config->ZGlobal = hasZOption(Args, "global");
    Config->ZHazardplt = hasZOption(Args, "hazardplt");
    Config->ZInitfirst = hasZOption(Args, "initfirst");
-@@ -1173,7 +1263,7 @@ void LinkerDriver::inferMachineType() {
+@@ -1173,7 +1264,7 @@ void LinkerDriver::inferMachineType() {
  // each target.
  static uint64_t getMaxPageSize(opt::InputArgList &Args) {
    uint64_t Val = args::getZOptionValue(Args, OPT_z, "max-page-size",