CVS commit: pkgsrc/devel/binutils

["Frederic Cambus" <fcambus%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fcambus
Date:           Sun Dec 20 19:07:05 UTC 2020

Modified Files:
        pkgsrc/devel/binutils: Makefile distinfo
        pkgsrc/devel/binutils/patches: patch-gold_options.h

Log Message:
binutils: remove now unneeded OpenBSD specific checks in gold.

Support for DT_INIT_ARRAY, DT_FINI_ARRAY and DT_PREINIT_ARRAY was added
in 2016 [1], and support for DT_RUNPATH in 2017 [2].

[1] https://marc.info/?l=openbsd-cvs&m=147193481229072&w=2
[2] https://marc.info/?l=openbsd-cvs&m=148504804104054&w=2


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/devel/binutils/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/binutils/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/binutils/patches/patch-gold_options.h

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

Modified files:

Index: pkgsrc/devel/binutils/Makefile
diff -u pkgsrc/devel/binutils/Makefile:1.91 pkgsrc/devel/binutils/Makefile:1.92
--- pkgsrc/devel/binutils/Makefile:1.91 Tue Dec 15 09:18:14 2020
+++ pkgsrc/devel/binutils/Makefile      Sun Dec 20 19:07:05 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2020/12/15 09:18:14 fcambus Exp $
+# $NetBSD: Makefile,v 1.92 2020/12/20 19:07:05 fcambus Exp $
 
 DISTNAME=      binutils-2.35.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=binutils/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/devel/binutils/distinfo
diff -u pkgsrc/devel/binutils/distinfo:1.37 pkgsrc/devel/binutils/distinfo:1.38
--- pkgsrc/devel/binutils/distinfo:1.37 Mon Dec 14 16:19:59 2020
+++ pkgsrc/devel/binutils/distinfo      Sun Dec 20 19:07:05 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2020/12/14 16:19:59 fcambus Exp $
+$NetBSD: distinfo,v 1.38 2020/12/20 19:07:05 fcambus Exp $
 
 SHA1 (binutils-2.35.1.tar.bz2) = df4eb943bf65df4bbbd0a001efcc98113423c5dd
 RMD160 (binutils-2.35.1.tar.bz2) = ed8ad923db716388b83b0234d41abc6beb01c9d6
@@ -6,7 +6,7 @@ SHA512 (binutils-2.35.1.tar.bz2) = 2828c
 Size (binutils-2.35.1.tar.bz2) = 32892584 bytes
 SHA1 (patch-bfd_cache.c) = e2d96bad350552eacdffa83532f9dc9e15ee9be9
 SHA1 (patch-gold_Makefile.in) = e01d973f9625a1653851f796c123efec37102fbd
-SHA1 (patch-gold_options.h) = cdb27cb5c967a873535ce5c63026c6ace3538fd6
+SHA1 (patch-gold_options.h) = 65a4cdb67cb4bef6a1891ca66a5fc80c5493c24e
 SHA1 (patch-gold_system.h) = 9b4130b5315763daa66e0a91a8be6d1df0d10344
 SHA1 (patch-gold_testsuite_Makefile.in) = 4babdbb89a989f3f1de66ad44a9603cbd9656f89
 SHA1 (patch-include_safe-ctype.h) = 66e636f8200ff5e9b4bfa0a5aee13cd072a23887

Index: pkgsrc/devel/binutils/patches/patch-gold_options.h
diff -u pkgsrc/devel/binutils/patches/patch-gold_options.h:1.4 pkgsrc/devel/binutils/patches/patch-gold_options.h:1.5
--- pkgsrc/devel/binutils/patches/patch-gold_options.h:1.4      Sun Dec  6 18:07:53 2020
+++ pkgsrc/devel/binutils/patches/patch-gold_options.h  Sun Dec 20 19:07:05 2020
@@ -1,8 +1,9 @@
-$NetBSD: patch-gold_options.h,v 1.4 2020/12/06 18:07:53 fcambus Exp $
+$NetBSD: patch-gold_options.h,v 1.5 2020/12/20 19:07:05 fcambus Exp $
 
- The NetBSD and OpenBSD real-time linkers do not understand DT_RUNPATH
- or DT_INIT_ARRAY.  The current gold defaults are not suitable for them.
- The last couple of DragonFly and FreeBSD releases do support these tags.
+ The NetBSD real-time linker do not understand DT_RUNPATH or
+ DT_INIT_ARRAY.  The current gold defaults are not suitable for it.
+ The last couple of DragonFly, FreeBSD, and OpenBSD releases do
+ support these tags.
 
 --- gold/options.h.orig        2020-07-24 09:12:20.000000000 +0000
 +++ gold/options.h
@@ -10,7 +11,7 @@ $NetBSD: patch-gold_options.h,v 1.4 2020
              N_("Output cross reference table"),
              N_("Do not output cross reference table"));
  
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__)
 +  DEFINE_bool(ctors_in_init_array, options::TWO_DASHES, '\0', false,
 +#else
    DEFINE_bool(ctors_in_init_array, options::TWO_DASHES, '\0', true,
@@ -22,7 +23,7 @@ $NetBSD: patch-gold_options.h,v 1.4 2020
              N_("Do not create exception frame header"));
  
    // Alphabetized under 'e' because the option is spelled --enable-new-dtags.
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__)
 +  DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', false,
 +#else
    DEFINE_enable(new_dtags, options::EXACTLY_TWO_DASHES, '\0', true,