From ad4fd8f04b50a70569609fa0a3f5139a41e6f84123f77ae04442ff5fd3f89abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Li=C5=A1ka?= <martin.liska@suse.com>
Date: Mon, 8 Aug 2022 14:03:30 +0000
Subject: [PATCH] Accepting request 993764 from home:marxin:branches:devel:gcc

- Add binutils-2.39-branch.diff.gz.
- Explicitly enable --enable-warn-execstack=yes and	--enable-warn-rwx-segments=yes.
- Add gprofng subpackage.

OBS-URL: https://build.opensuse.org/request/show/993764
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=414
---
 binutils-2.39-branch.diff.gz |  3 +++
 binutils.changes             |  7 +++++++
 binutils.spec                | 33 +++++++++++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 binutils-2.39-branch.diff.gz

diff --git a/binutils-2.39-branch.diff.gz b/binutils-2.39-branch.diff.gz
new file mode 100644
index 0000000..a12b939
--- /dev/null
+++ b/binutils-2.39-branch.diff.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:521f0bf2f86ae5682330ac7ca0c55c4098758666a3bd4626bbfa641882e3515e
+size 6851
diff --git a/binutils.changes b/binutils.changes
index 95de410..8fa628b 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug  8 11:43:14 UTC 2022 - Martin Liška <mliska@suse.cz>
+
+- Add binutils-2.39-branch.diff.gz.
+- Explicitly enable --enable-warn-execstack=yes and	--enable-warn-rwx-segments=yes.
+- Add gprofng subpackage.
+
 -------------------------------------------------------------------
 Sat Aug  6 08:41:08 UTC 2022 - Martin Liška <mliska@suse.cz>
 
diff --git a/binutils.spec b/binutils.spec
index 9446e07..d894868 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -117,6 +117,7 @@ Source:         binutils-%{version}.tar.bz2
 Source2:        binutils-%{version}.tar.bz2.sig
 Source3:        binutils.keyring
 Source4:        baselibs.conf
+Patch1:         binutils-2.39-branch.diff.gz
 Patch3:         binutils-skip-rpaths.patch
 Patch4:         s390-biarch.diff
 Patch5:         x86-64-biarch.patch
@@ -203,6 +204,14 @@ Group:          Development/Tools/Building
 This package includes the libctf-nobfd shared library.
 The Compact C Type Format (CTF) is a way of representing information about a binary program
 
+%package -n gprofng
+Summary:        The next generation profiling tool for Linux
+License:        GFDL-1.3-only AND GPL-3.0-or-later
+Group:          Development/Tools/Building
+
+%description -n gprofng
+The next generation profiling tool for Linux
+
 %ifarch %arm
 %define HOST %{_target_cpu}-suse-linux-gnueabi
 %else
@@ -225,7 +234,7 @@ cp ld/ldgram.y ld/ldgram.y.orig
 
 # Patch is outside test_vanilla because it's supposed to be the
 # patch bringing the tarball to the newest upstream version
-# %patch1 -p1
+%patch1 -p1
 %if !%{test_vanilla}
 %patch3 -p1
 %patch4
@@ -312,6 +321,10 @@ EXTRA_TARGETS="$EXTRA_TARGETS,aarch64-suse-linux"
 # rebuilding the same archive from unchanged .o files recreates
 # it, because timestamps in the .a are 0, unequal to the actual timestamp
 # of the .o files :-/
+#
+# Enable the following 2 configure options explicitly
+# (--enable-warn-execstack=yes, --enable-warn-rwx-segments=yes)
+# as they are not enabled by default for some targets (and we use --enable-targets=[many]).
 %define common_flags CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" \\\
 	--prefix=%{_prefix} --libdir=%{_libdir} \\\
 	--infodir=%{_infodir} --mandir=%{_mandir} \\\
@@ -346,9 +359,13 @@ cd build-dir
 	--enable-shared \
 %if %{suse_version} > 1500
 	--enable-pgo-build=lto \
+%endif
+%if %{suse_version} <= 1500
+	--disable-gprofng \
 %endif
 	--enable-obsolete \
-	--disable-gprofng
+	--enable-warn-execstack=yes \
+	--enable-warn-rwx-segments=yes
 
 # we patch headers (bfd-in.h) that are input to other headers
 # which are generated only with --enable-maintainer-mode (which we
@@ -671,6 +688,18 @@ fi;
 %files -n libctf-nobfd0
 %defattr(-,root,root)
 %{_libdir}/libctf-nobfd.so.*
+
+%if %{suse_version} > 1500
+%ifarch %ix86 x86_64 aarch64
+%files -n gprofng
+%defattr(-,root,root)
+%dir %{_libdir}/gprofng/
+%{_libdir}/gprofng/lib*.so
+%{_libdir}/gprofng/lib*.so.*
+%{_distconfdir}/gprofng.rc
+%endif
+%endif
+
 %endif
 
 %changelog