[gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/files/

[gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/files/

[Sam James]

commit:     e6ba58de26dea5d91505823ac324ecce27a14cf0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 22:30:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 22:30:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ba58de

sys-devel/gdb: restore verbose-build patch; drop glibc 2.34 patch

Closes: https://bugs.gentoo.org/839060
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/gdb/files/gdb-11.1-glibc-2.34-sim.patch | 110 ----------------------
 sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch |  13 +++
 2 files changed, 13 insertions(+), 110 deletions(-)

diff --git a/sys-devel/gdb/files/gdb-11.1-glibc-2.34-sim.patch b/sys-devel/gdb/files/gdb-11.1-glibc-2.34-sim.patch
deleted file mode 100644
index 15ab45f278f1..000000000000
--- a/sys-devel/gdb/files/gdb-11.1-glibc-2.34-sim.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=39d53d04357606a15efd400147fa7369d71baf2c;hp=46039d3632e32d9a404c1f18cf55f14c894e4627
-https://bugs.gentoo.org/813831
-
-From 39d53d04357606a15efd400147fa7369d71baf2c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 3 Oct 2021 12:02:53 -0400
-Subject: [PATCH 1/1] sim: filter out SIGSTKSZ [PR sim/28302]
-
-We map target signals to host signals so we can propagate signals
-between the host & simulated worlds.  That means we need to know
-the symbolic names & values of all signals that might be sent.
-
-The tools that generate that list use signal.h and include all
-symbols that start with "SIG" so as to automatically include any
-new symbols that the C library might add.  Unfortunately, this
-also picks up "SIGSTKSZ" which is not actually a signal itself,
-but a signal related setting -- it's the size of the stack when
-a signal is handled.
-
-By itself this doesn't super matter as we will never see a signal
-with that same value (since the range of valid signals tend to be
-way less than 1024, and the size of the default signal stack will
-never be that small).  But with recent glibc changes that make this
-into a dynamic value instead of a compile-time constant, some users
-see build failures when building the sim.
-
-As suggested by Adam Sampson, update our scripts to ignore this
-symbol to simplify everything and avoid the build failure.
-
-Bug: https://sourceware.org/PR28302
----
- sim/bfin/linux-targ-map.h | 5 +----
- sim/common/gennltvals.py  | 6 ++++--
- sim/common/nltvals.def    | 1 -
- 3 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h
-index e9c8c8f273b..0340ed54764 100644
---- a/sim/bfin/linux-targ-map.h
-+++ b/sim/bfin/linux-targ-map.h
-@@ -30,6 +30,7 @@ echo
- # XXX: nothing uses this ?
- echo '#include <signal.h>' | \
- bfin-uclinux-gcc -E -dD -P - | \
-+grep -v SIGSTKSZ | \
- sed -r -n \
-     -e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \
-     -e '$i\ \ { 0, -1, -1 }\n};' \
-@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] =
- #ifdef SIG_SETMASK
- # define TARGET_LINUX_SIG_SETMASK 2
-   { "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK },
--#endif
--#ifdef SIGSTKSZ
--# define TARGET_LINUX_SIGSTKSZ 8192
--  { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ },
- #endif
-   { 0, -1, -1 }
- };
-diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py
-index db3ff641d40..955ace34311 100755
---- a/sim/common/gennltvals.py
-+++ b/sim/common/gennltvals.py
-@@ -67,6 +67,7 @@ FILE_HEADER = f"""\
- def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path,
-              headers: Iterable[str],
-              pattern: str,
-+             filter: str = r'^$',
-              target: str = None):
-     """Extract constants from the specified files using a regular expression.
- 
-@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path,
-     srcfile = ''.join(f'#include <{x}>\n' for x in headers)
-     syms = set()
-     define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')')
-+    filter_pattern = re.compile(filter)
-     for header in headers:
-         with open(srcdir / header, 'r', encoding='utf-8') as fp:
-             data = fp.read()
-         for line in data.splitlines():
-             m = define_pattern.match(line)
--            if m:
-+            if m and not filter_pattern.search(line):
-                 syms.add(m.group(1))
-     for sym in sorted(syms):
-         srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n'
-@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str):
-              ('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*')
- 
-     gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include',
--             ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*')
-+             ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ')
- 
-     gentvals(output, cpp, 'open', newlib / 'newlib/libc/include',
-              ('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*')
-diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def
-index 8ae88397249..8bc6ae59026 100644
---- a/sim/common/nltvals.def
-+++ b/sim/common/nltvals.def
-@@ -116,7 +116,6 @@
-  { "SIGPROF", 27 },
-  { "SIGQUIT", 3 },
-  { "SIGSEGV", 11 },
-- { "SIGSTKSZ", 8192 },
-  { "SIGSTOP", 17 },
-  { "SIGSYS", 12 },
-  { "SIGTERM", 15 },
--- 
-2.27.0
-

diff --git a/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch b/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch
new file mode 100644
index 000000000000..06aa6084d2d2
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch
@@ -0,0 +1,13 @@
+Enable verbose build. By default gdb ignores even --disable-silent-rules.
+Override verbosity back to non-silent.
+
+https://bugs.gentoo.org/695936
+--- a/gdb/silent-rules.mk
++++ b/gdb/silent-rules.mk
+@@ -1,5 +1,4 @@
+-# If V is undefined or V=0 is specified, use the silent/verbose/compact mode.
+-V ?= 0
++V ?= 1
+ ifeq ($(V),0)
+ ECHO_CXX =    @echo "  CXX    $@";
+ ECHO_CXXLD =  @echo "  CXXLD  $@";