CVS commit: pkgsrc/devel/lld

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sun Nov  3 12:40:40 UTC 2019

Modified Files:
        pkgsrc/devel/lld: Makefile distinfo
        pkgsrc/devel/lld/patches: patch-ELF_Config.h patch-ELF_Driver.cpp
            patch-ELF_Writer.cpp patch-docs_ld.lld.1 patch-test_ELF_gnustack.s
            patch-tools_nb.lld_nb.lld.cpp

Log Message:
lld: Disable gnustack on NetBSD

Fix corrupted text in description of cherry-picked patch for gnustack.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/lld/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/lld/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/lld/patches/patch-ELF_Config.h \
    pkgsrc/devel/lld/patches/patch-docs_ld.lld.1
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/lld/patches/patch-ELF_Writer.cpp \
    pkgsrc/devel/lld/patches/patch-test_ELF_gnustack.s
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/lld/patches/patch-tools_nb.lld_nb.lld.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.11 pkgsrc/devel/lld/Makefile:1.12
--- pkgsrc/devel/lld/Makefile:1.11      Sun Nov  3 12:10:29 2019
+++ pkgsrc/devel/lld/Makefile   Sun Nov  3 12:40:40 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2019/11/03 12:10:29 kamil Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 12:40:40 kamil Exp $
 
 DISTNAME=      lld-9.0.0.src
 PKGNAME=       ${DISTNAME:S/.src//}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  http://releases.llvm.org/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/lld/distinfo
diff -u pkgsrc/devel/lld/distinfo:1.7 pkgsrc/devel/lld/distinfo:1.8
--- pkgsrc/devel/lld/distinfo:1.7       Sun Nov  3 12:10:29 2019
+++ pkgsrc/devel/lld/distinfo   Sun Nov  3 12:40:40 2019
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.7 2019/11/03 12:10:29 kamil Exp $
+$NetBSD: distinfo,v 1.8 2019/11/03 12:40:40 kamil Exp $
 
 SHA1 (lld-9.0.0.src.tar.xz) = 021a8c38cf27d63db37d939c7cdec46ffd627be2
 RMD160 (lld-9.0.0.src.tar.xz) = d46b068f4de55d174be71e061aa38f7d4d1499dc
 SHA512 (lld-9.0.0.src.tar.xz) = bc4812232840ef5edbd8edf1d1a329e85a4bfd3a7859fe322e11dd053435e722c6f1140a718fd2b3524ee9783a357178d2ba30d12519847bd3acc294698007f3
 Size (lld-9.0.0.src.tar.xz) = 1100608 bytes
 SHA1 (patch-CMakeLists.txt) = 87d32f66488541ba68e219f5fa83646b48bf9c71
-SHA1 (patch-ELF_Config.h) = 6ad0642b602f1bdfead45e3e3d71e9718fdd80b5
-SHA1 (patch-ELF_Driver.cpp) = 113705d763af35635ee69e127c9c757c9d0c2597
+SHA1 (patch-ELF_Config.h) = f5663189adf47a13d2fa0a152ea5df04a3ed247d
+SHA1 (patch-ELF_Driver.cpp) = 4b08b50e75eb90a8703a331efaf4a950098d5a4d
 SHA1 (patch-ELF_Options.td) = 22a1f293681b86a9aac87624efcfeeb20a4ba51c
-SHA1 (patch-ELF_Writer.cpp) = 8c2d794885826a153b3ec6fa3149093036b98750
-SHA1 (patch-docs_ld.lld.1) = c2d156d3d7af6de195f9c2f3eceb978d65c8d883
-SHA1 (patch-test_ELF_gnustack.s) = 58eb43e952a85bb8f2cb7a665a625164ee564dd2
+SHA1 (patch-ELF_Writer.cpp) = b5b995b2566999579a35146a271d099908eb44c3
+SHA1 (patch-docs_ld.lld.1) = 8492f459425a6774d4b3e21c6f0f5d40d7044a1b
+SHA1 (patch-test_ELF_gnustack.s) = d2619221f09d6b40daa9c2206c993cd8342982a5
 SHA1 (patch-tools_lld_lld.cpp) = bc3662191bf6e50c808d188707c9abfdb4786dbf
 SHA1 (patch-tools_nb.lld_CMakeLists.txt) = 231ed112512d23001a8e9d1d1821838a483c2e37
 SHA1 (patch-tools_nb.lld_Options.td) = d56ff977f24d97eda30f10aae5818c618b3c7915
-SHA1 (patch-tools_nb.lld_nb.lld.cpp) = 11a69572b0ec28b9de576249bf3217acdcebee22
+SHA1 (patch-tools_nb.lld_nb.lld.cpp) = 2425426beb2f4d80f96781977e3a4019eed601fc

Index: pkgsrc/devel/lld/patches/patch-ELF_Config.h
diff -u pkgsrc/devel/lld/patches/patch-ELF_Config.h:1.5 pkgsrc/devel/lld/patches/patch-ELF_Config.h:1.6
--- pkgsrc/devel/lld/patches/patch-ELF_Config.h:1.5     Sun Nov  3 12:10:29 2019
+++ pkgsrc/devel/lld/patches/patch-ELF_Config.h Sun Nov  3 12:40:40 2019
@@ -1,7 +1,7 @@
-$NetBSD: patch-ELF_Config.h,v 1.5 2019/11/03 12:10:29 kamil Exp $
+$NetBSD: patch-ELF_Config.h,v 1.6 2019/11/03 12:40:40 kamil Exp $
 
 Cherry-pick upstream patch commit 2a0fcae3d4d1fd85d6ae8378d7c6f12430c0087d
-[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STAC dummy option for an AArch64 erratum.
+[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STACK
 
 Add dummy option for an AArch64 erratum.
 
Index: pkgsrc/devel/lld/patches/patch-docs_ld.lld.1
diff -u pkgsrc/devel/lld/patches/patch-docs_ld.lld.1:1.5 pkgsrc/devel/lld/patches/patch-docs_ld.lld.1:1.6
--- pkgsrc/devel/lld/patches/patch-docs_ld.lld.1:1.5    Sun Nov  3 12:10:29 2019
+++ pkgsrc/devel/lld/patches/patch-docs_ld.lld.1        Sun Nov  3 12:40:40 2019
@@ -1,7 +1,7 @@
-$NetBSD: patch-docs_ld.lld.1,v 1.5 2019/11/03 12:10:29 kamil Exp $
+$NetBSD: patch-docs_ld.lld.1,v 1.6 2019/11/03 12:40:40 kamil Exp $
 
 Cherry-pick upstream patch commit 2a0fcae3d4d1fd85d6ae8378d7c6f12430c0087d
-[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STAC dummy option for an AArch64 erratum.
+[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STACK
 
 --- docs/ld.lld.1.orig 2019-11-03 11:37:33.105878671 +0000
 +++ docs/ld.lld.1

Index: pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp
diff -u pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp:1.6 pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp:1.7
--- pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp:1.6   Sun Nov  3 12:10:29 2019
+++ pkgsrc/devel/lld/patches/patch-ELF_Driver.cpp       Sun Nov  3 12:40:40 2019
@@ -1,7 +1,7 @@
-$NetBSD: patch-ELF_Driver.cpp,v 1.6 2019/11/03 12:10:29 kamil Exp $
+$NetBSD: patch-ELF_Driver.cpp,v 1.7 2019/11/03 12:40:40 kamil Exp $
 
 Cherry-pick upstream patch commit 2a0fcae3d4d1fd85d6ae8378d7c6f12430c0087d
-[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STAC dummy option for an AArch64 erratum.    
+[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STACK
 
 Add dummy option for an AArch64 erratum.
 

Index: pkgsrc/devel/lld/patches/patch-ELF_Writer.cpp
diff -u pkgsrc/devel/lld/patches/patch-ELF_Writer.cpp:1.4 pkgsrc/devel/lld/patches/patch-ELF_Writer.cpp:1.5
--- pkgsrc/devel/lld/patches/patch-ELF_Writer.cpp:1.4   Sun Nov  3 12:10:29 2019
+++ pkgsrc/devel/lld/patches/patch-ELF_Writer.cpp       Sun Nov  3 12:40:40 2019
@@ -1,7 +1,7 @@
-$NetBSD: patch-ELF_Writer.cpp,v 1.4 2019/11/03 12:10:29 kamil Exp $
+$NetBSD: patch-ELF_Writer.cpp,v 1.5 2019/11/03 12:40:40 kamil Exp $
 
 Cherry-pick upstream patch commit 2a0fcae3d4d1fd85d6ae8378d7c6f12430c0087d
-[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STAC dummy option for an AArch64 erratum.
+[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STACK
 
 --- ELF/Writer.cpp.orig        2019-09-06 11:20:15.000000000 +0000
 +++ ELF/Writer.cpp
Index: pkgsrc/devel/lld/patches/patch-test_ELF_gnustack.s
diff -u pkgsrc/devel/lld/patches/patch-test_ELF_gnustack.s:1.4 pkgsrc/devel/lld/patches/patch-test_ELF_gnustack.s:1.5
--- pkgsrc/devel/lld/patches/patch-test_ELF_gnustack.s:1.4      Sun Nov  3 12:10:29 2019
+++ pkgsrc/devel/lld/patches/patch-test_ELF_gnustack.s  Sun Nov  3 12:40:40 2019
@@ -1,7 +1,7 @@
-$NetBSD: patch-test_ELF_gnustack.s,v 1.4 2019/11/03 12:10:29 kamil Exp $
+$NetBSD: patch-test_ELF_gnustack.s,v 1.5 2019/11/03 12:40:40 kamil Exp $
 
 Cherry-pick upstream patch commit 2a0fcae3d4d1fd85d6ae8378d7c6f12430c0087d
-[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STAC dummy option for an AArch64 erratum.
+[lld] [ELF] Add '-z nognustack' opt to suppress emitting PT_GNU_STACK
 
 --- test/ELF/gnustack.s.orig   2019-05-01 05:49:01.000000000 +0000
 +++ test/ELF/gnustack.s

Index: pkgsrc/devel/lld/patches/patch-tools_nb.lld_nb.lld.cpp
diff -u pkgsrc/devel/lld/patches/patch-tools_nb.lld_nb.lld.cpp:1.1 pkgsrc/devel/lld/patches/patch-tools_nb.lld_nb.lld.cpp:1.2
--- pkgsrc/devel/lld/patches/patch-tools_nb.lld_nb.lld.cpp:1.1  Sun Nov  3 12:11:27 2019
+++ pkgsrc/devel/lld/patches/patch-tools_nb.lld_nb.lld.cpp      Sun Nov  3 12:40:40 2019
@@ -1,11 +1,13 @@
-$NetBSD: patch-tools_nb.lld_nb.lld.cpp,v 1.1 2019/11/03 12:11:27 kamil Exp $
+$NetBSD: patch-tools_nb.lld_nb.lld.cpp,v 1.2 2019/11/03 12:40:40 kamil Exp $
 
 [LLD] Add NetBSD support as a new flavor of LLD (nb.lld)
 https://reviews.llvm.org/D69755
 
---- tools/nb.lld/nb.lld.cpp.orig       2019-11-03 11:46:29.311435568 +0000
+Disable gnustack for NetBSD.
+
+--- tools/nb.lld/nb.lld.cpp.orig       2019-11-03 12:31:14.712069007 +0000
 +++ tools/nb.lld/nb.lld.cpp
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,221 @@
 +//===- nb.lld.cpp - NetBSD LLD standalone linker --------------------------===//
 +//
 +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -102,6 +104,9 @@ https://reviews.llvm.org/D69755
 +  // disable superfluous RUNPATH on NetBSD
 +  args.push_back("--disable-new-dtags");
 +
++  // disable gnustack
++  args.push_back("-znognustack");
++
 +  // set default image base address
 +  switch (targetTriple.getArch()) {
 +  case llvm::Triple::aarch64: