From f5e296327d73c3703da9edb600d49fb19eea04c0 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 15 Oct 2024 10:17:21 +0200 Subject: [PATCH] Revert "gdb: Update to version 15.2" This reverts commit 654983ea1166f53423896688593f6d6a966f1d15. --- package/devel/gdb/Makefile | 4 ++-- .../001-gdb-pr14523-mips-signal-number.patch | 2 +- .../devel/gdb/patches/110-shared_libgcc.patch | 16 ++++++++-------- .../patches/120-sigprocmask-invalid-call.patch | 2 +- package/devel/gdb/patches/130-gdb-ctrl-c.patch | 2 +- package/devel/gdb/patches/140-sgidefs.patch | 2 +- package/devel/gdb/patches/150-mips64.patch | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package/devel/gdb/Makefile b/package/devel/gdb/Makefile index 366746be87..cf897b79f2 100644 --- a/package/devel/gdb/Makefile +++ b/package/devel/gdb/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gdb -PKG_VERSION:=15.2 +PKG_VERSION:=14.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/gdb -PKG_HASH:=83350ccd35b5b5a0cba6b334c41294ea968158c573940904f00b92f76345314d +PKG_HASH:=d66df51276143451fcbff464cc8723d68f1e9df45a6a2d5635a54e71643edb80 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch b/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch index dd6cdbdbc8..b8e7b10fc9 100644 --- a/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch +++ b/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch @@ -2,7 +2,7 @@ See http://sourceware.org/bugzilla/show_bug.cgi?id=14523 --- a/gdbsupport/signals.cc +++ b/gdbsupport/signals.cc -@@ -347,6 +347,11 @@ gdb_signal_from_host (int hostsig) +@@ -348,6 +348,11 @@ gdb_signal_from_host (int hostsig) else if (64 <= hostsig && hostsig <= 127) return (enum gdb_signal) (hostsig - 64 + (int) GDB_SIGNAL_REALTIME_64); diff --git a/package/devel/gdb/patches/110-shared_libgcc.patch b/package/devel/gdb/patches/110-shared_libgcc.patch index d9dcafe0e0..1a02ad1160 100644 --- a/package/devel/gdb/patches/110-shared_libgcc.patch +++ b/package/devel/gdb/patches/110-shared_libgcc.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1401,13 +1401,13 @@ if test -z "$LD"; then +@@ -1400,13 +1400,13 @@ if test -z "$LD"; then fi fi @@ -17,7 +17,7 @@ AC_LANG_PUSH(C++) AC_LINK_IFELSE([AC_LANG_SOURCE([ #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) -@@ -1837,7 +1837,7 @@ AC_ARG_WITH(stage1-ldflags, +@@ -1836,7 +1836,7 @@ AC_ARG_WITH(stage1-ldflags, # trust that they are doing what they want. if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \ -a "$have_static_libs" = yes; then @@ -26,18 +26,18 @@ fi]) AC_SUBST(stage1_ldflags) -@@ -1866,7 +1866,7 @@ AC_ARG_WITH(boot-ldflags, +@@ -1865,7 +1865,7 @@ AC_ARG_WITH(boot-ldflags, # statically. But if the user explicitly specified the libraries to # use, trust that they are doing what they want. if test "$poststage1_libs" = ""; then - poststage1_ldflags="-static-libstdc++ -static-libgcc" + poststage1_ldflags="-static-libstdc++" fi]) - case $target in - *-darwin2* | *-darwin1[[56789]]*) + AC_SUBST(poststage1_ldflags) + --- a/configure +++ b/configure -@@ -5414,14 +5414,14 @@ if test -z "$LD"; then +@@ -5413,14 +5413,14 @@ if test -z "$LD"; then fi fi @@ -56,7 +56,7 @@ ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -8465,7 +8465,7 @@ else +@@ -8464,7 +8464,7 @@ else # trust that they are doing what they want. if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \ -a "$have_static_libs" = yes; then @@ -65,7 +65,7 @@ fi fi -@@ -8501,7 +8501,7 @@ else +@@ -8500,7 +8500,7 @@ else # statically. But if the user explicitly specified the libraries to # use, trust that they are doing what they want. if test "$poststage1_libs" = ""; then diff --git a/package/devel/gdb/patches/120-sigprocmask-invalid-call.patch b/package/devel/gdb/patches/120-sigprocmask-invalid-call.patch index 0796c34c76..1ac8f5f2ce 100644 --- a/package/devel/gdb/patches/120-sigprocmask-invalid-call.patch +++ b/package/devel/gdb/patches/120-sigprocmask-invalid-call.patch @@ -27,7 +27,7 @@ gdb/ChangeLog: --- a/gdbsupport/signals-state-save-restore.cc +++ b/gdbsupport/signals-state-save-restore.cc -@@ -37,7 +37,7 @@ save_original_signals_state (bool quiet) +@@ -38,7 +38,7 @@ save_original_signals_state (bool quiet) int i; int res; diff --git a/package/devel/gdb/patches/130-gdb-ctrl-c.patch b/package/devel/gdb/patches/130-gdb-ctrl-c.patch index 8cb7a021f3..5272b7e969 100644 --- a/package/devel/gdb/patches/130-gdb-ctrl-c.patch +++ b/package/devel/gdb/patches/130-gdb-ctrl-c.patch @@ -24,7 +24,7 @@ Signed-off-by: Khem Raj --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc -@@ -5525,7 +5525,7 @@ linux_process_target::request_interrupt +@@ -5481,7 +5481,7 @@ linux_process_target::request_interrupt { /* Send a SIGINT to the process group. This acts just like the user typed a ^C on the controlling terminal. */ diff --git a/package/devel/gdb/patches/140-sgidefs.patch b/package/devel/gdb/patches/140-sgidefs.patch index 1753e9bb85..05b30f5242 100644 --- a/package/devel/gdb/patches/140-sgidefs.patch +++ b/package/devel/gdb/patches/140-sgidefs.patch @@ -19,7 +19,7 @@ Signed-off-by: Andre McCurdy --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "gdb_proc_service.h" #include "gregset.h" diff --git a/package/devel/gdb/patches/150-mips64.patch b/package/devel/gdb/patches/150-mips64.patch index 41c267bcf6..65418fd290 100644 --- a/package/devel/gdb/patches/150-mips64.patch +++ b/package/devel/gdb/patches/150-mips64.patch @@ -18,7 +18,7 @@ Upstream-Status: Pending --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c -@@ -41,6 +41,11 @@ +@@ -42,6 +42,11 @@ #define PTRACE_GET_THREAD_AREA 25 #endif -- 2.30.2