Skip to contentSkip to conversation

package/gdb: bump to version 8.3

PATCH New Romain Naour 2 participants 6 messages Jun 5, 2019 – Jun 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/gdb: bump to version 8.3

Rebase local patches.

See:
https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00007.html

---
 ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ++++++++++++++++
 ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 +++++++++++++
 package/gdb/8.3/0003-use-asm-sgidefs.h.patch  | 40 ++++++++++++
 .../0004-gdbserver-fix-build-for-m68k.patch   | 62 +++++++++++++++++++
 ...fork-inferior-include-linux-ptrace.h.patch | 53 ++++++++++++++++
 package/gdb/Config.in.host                    |  7 +++
 package/gdb/gdb.hash                          |  1 +
 7 files changed, 261 insertions(+)
 create mode 100644 package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
 create mode 100644 package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
 create mode 100644 package/gdb/8.3/0003-use-asm-sgidefs.h.patch
 create mode 100644 package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch
 create mode 100644 package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch
package/gdb/8.3/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file +55 -0
new file mode 100644
index 0000000000..ab8dc626f0
@@ -0,0 +1,55 @@
+From 72ee19f54fd35595465b2e35eccf1f3d65fe21c6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sat, 6 Aug 2016 17:32:50 -0700
+Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <[email protected]>
+Signed-off-by: Thomas Petazzoni <[email protected]>
+[Rebase on gdb 8.3]
+Signed-off-by: Romain Naour <[email protected]>
+---
+ gdb/gdbserver/linux-ppc-low.c | 6 ++++++
+ gdb/nat/ppc-linux.h           | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
+index 1b695e53fe9..1978347c02c 100644
+--- a/gdb/gdbserver/linux-ppc-low.c
++++ b/gdb/gdbserver/linux-ppc-low.c
+@@ -23,7 +23,13 @@
+ #include "elf/common.h"
+ #include <sys/uio.h>
+ #include <elf.h>
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ 
+ #include "arch/ppc-linux-common.h"
+ #include "arch/ppc-linux-tdesc.h"
+diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
+index f1561b3b357..40399361c09 100644
+--- a/gdb/nat/ppc-linux.h
++++ b/gdb/nat/ppc-linux.h
+@@ -18,7 +18,13 @@
+ #ifndef NAT_PPC_LINUX_H
+ #define NAT_PPC_LINUX_H
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ #include <asm/cputable.h>
+ 
+ /* This sometimes isn't defined.  */
+-- 
+2.21.0
+
package/gdb/8.3/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file +43 -0

43 lines not on this page · raw message

package/gdb/8.3/0003-use-asm-sgidefs.h.patch new file +40 -0
new file mode 100644
index 0000000000..2909f62c68
@@ -0,0 +1,40 @@
+From 19a0f664809b6858e69aa98188eb739415de044c Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <[email protected]>
+Date: Sat, 30 Apr 2016 15:29:06 -0700
+Subject: [PATCH] use <asm/sgidefs.h>
+
+Build fix for MIPS with musl libc
+
+The MIPS specific header <sgidefs.h> is provided by glibc and uclibc
+but not by musl. Regardless of the libc, the kernel headers provide
+<asm/sgidefs.h> which provides the same definitions, so use that
+instead.
+
+Upstream-Status: Pending
+
+[Vincent:
+Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
+
+Signed-off-by: Andre McCurdy <[email protected]>
+Signed-off-by: Khem Raj <[email protected]>
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+---
+ gdb/mips-linux-nat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
+index e68ed1e4da9..bc42aa59685 100644
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+ 
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
+-- 
+2.21.0
+
package/gdb/8.3/0004-gdbserver-fix-build-for-m68k.patch new file +62 -0

62 lines not on this page · raw message

package/gdb/8.3/0005-nat-fork-inferior-include-linux-ptrace.h.patch new file +53 -0

53 lines not on this page · raw message

package/gdb/Config.in.host +7 -0
index 7ce26c1628..f9a67d18dd 100644
@@ -70,6 +70,11 @@ config BR2_GDB_VERSION_8_2
 	# Needs a C++11 compiler
 	depends on BR2_HOST_GCC_AT_LEAST_4_8
 
+config BR2_GDB_VERSION_8_3
+	bool "gdb 8.3.x"
+	# Needs a C++11 compiler
+	depends on BR2_HOST_GCC_AT_LEAST_4_8
+
 endchoice
 
 endif
@@ -90,6 +95,7 @@ config BR2_PACKAGE_GDB_NEEDS_CXX11
 	default y if BR2_GDB_VERSION_8_0
 	default y if BR2_GDB_VERSION_8_1
 	default y if BR2_GDB_VERSION_8_2
+	default y if BR2_GDB_VERSION_8_3
 	default y if BR2_arc
 
 # If cross-gdb is not enabled, the latest working version is chosen.
@@ -101,4 +107,5 @@ config BR2_GDB_VERSION
 	default "8.0.1"    if BR2_GDB_VERSION_8_0
 	default "8.1.1"    if BR2_GDB_VERSION_8_1 || !BR2_PACKAGE_HOST_GDB
 	default "8.2.1"    if BR2_GDB_VERSION_8_2
+	default "8.3"	   if BR2_GDB_VERSION_8_3
 	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
package/gdb/gdb.hash +1 -0
index f508b6bffc..76404c533d 100644
@@ -3,6 +3,7 @@ sha512  0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7
 sha512  5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1	gdb-8.0.1.tar.xz
 sha512  7dcd5e8c90de92f577834d887b5f54edb93a07083bfe661bc46c270a6cc4919f0b348e7e2fe8ae4511298a570ef150eeefdc667ef7cf527f0cf60943177ab6c9	gdb-8.1.1.tar.xz
 sha512  2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11	gdb-8.2.1.tar.xz
+sha512  47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1	gdb-8.3.tar.xz
 
 # Locally calculated (fetched from Github)
 sha512  bc6dcd92991222418795c49b8fc13df7354b34ba7a7f1e4214b108776da0dad730259aa4611086694bc9291126f5182b449bbc22409aeadc44b89e7a42fb4e00 	gdb-arc-2019.03-rc1-gdb.tar.gz
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/3 package/gdb: switch to 8.2 as the default version

8.3 is around, 8.2 has already seen a point release, so it's time to make 8.2 the default version for gdb.

---
 package/gdb/Config.in.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/gdb/Config.in.host +1 -1
index f9a67d18dd..a395016082 100644
@@ -46,7 +46,7 @@ config BR2_PACKAGE_HOST_GDB_SIM
 
 choice
 	prompt "GDB debugger Version"
-	default BR2_GDB_VERSION_8_1
+	default BR2_GDB_VERSION_8_2
 	depends on !BR2_arc
 	depends on !BR2_csky
 	help
Signature · 1 line
2.21.0
#2 lore raw

PATCH 2/3 package/gdb: switch to 8.2 as the default version

Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

8.3 is around, 8.2 has already seen a point release, so it's time to make 8.2 the default version for gdb.

---
 package/gdb/Config.in.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/gdb/Config.in.host +0 -0
index f9a67d18dd..a395016082 100644

package/gdb/Config.in.host config BR2_PACKAGE_HOST_GDB_SIM · line 52

Quoted 8 lines
package/gdb/Config.in.host +1 -1
@@ -46,7 +46,7 @@ config BR2_PACKAGE_HOST_GDB_SIM
 
 choice
 	prompt "GDB debugger Version"
-	default BR2_GDB_VERSION_8_1
+	default BR2_GDB_VERSION_8_2
 	depends on !BR2_arc
 	depends on !BR2_csky
 	help

You forgot to also update the BR2_GDB_VERSION logic. Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 3/3 package/gdb: remove gdb 8.0.x

In reply to Romain Naour

8.3 is around and 8.2 is the default version, so drop 8.0. Keep 7.12 which is the latest version that doesn't requires C++11 support.

---
 Config.in.legacy                              |  9 +++
 ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 55 ----------------
 ...-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 43 -------------
 .../gdb/8.0.1/0003-use-asm-sgidefs.h.patch    | 40 ------------
 ...x-ptrace.c-add-missing-gdb_byte-cast.patch | 41 ------------
 .../0005-gdbserver-fix-build-for-m68k.patch   | 62 -------------------
 ...P_HWBKPT-before-including-gdb_wait-h.patch | 54 ----------------
 package/gdb/Config.in.host                    |  7 ---
 package/gdb/gdb.hash                          |  1 -
 9 files changed, 9 insertions(+), 303 deletions(-)
 delete mode 100644 package/gdb/8.0.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
 delete mode 100644 package/gdb/8.0.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
 delete mode 100644 package/gdb/8.0.1/0003-use-asm-sgidefs.h.patch
 delete mode 100644 package/gdb/8.0.1/0004-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch
 delete mode 100644 package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch
 delete mode 100644 package/gdb/8.0.1/0006-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch
Config.in.legacy +9 -0
index c13399acda..75d6c723a9 100644
@@ -144,6 +144,15 @@ endif
 
 ###############################################################################
 
+comment "Legacy options removed in 2019.08"
+
+config BR2_GDB_VERSION_8_0
+	bool "gdb 8.0.x has been removed"
+	select BR2_LEGACY
+	help
+	  The 8.0.x version of gdb has been removed. Use a newer
+	  version instead.
+
 comment "Legacy options removed in 2019.05"
 
 config BR2_CSKY_DSP
package/gdb/8.0.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted +0 -55

55 lines not on this page · raw message

package/gdb/8.0.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted +0 -43

43 lines not on this page · raw message

package/gdb/8.0.1/0003-use-asm-sgidefs.h.patch deleted +0 -40
deleted file mode 100644
index d30336904f..0000000000
@@ -1,40 +0,0 @@
-From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-Date: Sat, 30 Apr 2016 15:29:06 -0700
-Subject: [PATCH] use <asm/sgidefs.h>
-
-Build fix for MIPS with musl libc
-
-The MIPS specific header <sgidefs.h> is provided by glibc and uclibc
-but not by musl. Regardless of the libc, the kernel headers provide
-<asm/sgidefs.h> which provides the same definitions, so use that
-instead.
-
-Upstream-Status: Pending
-
-[Vincent:
-Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
-
-Signed-off-by: Andre McCurdy <[email protected]>
-Signed-off-by: Khem Raj <[email protected]>
-Signed-off-by: Vicente Olivert Riera <[email protected]>
----
- gdb/mips-linux-nat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
-index f2df1b9907..d24664cb56 100644
---- a/gdb/mips-linux-nat.c
-+++ b/gdb/mips-linux-nat.c
-@@ -31,7 +31,7 @@
- #include "gdb_proc_service.h"
- #include "gregset.h"
- 
--#include <sgidefs.h>
-+#include <asm/sgidefs.h>
- #include "nat/gdb_ptrace.h"
- #include <asm/ptrace.h>
- #include "inf-ptrace.h"
--- 
-2.13.1
-
package/gdb/8.0.1/0004-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch deleted +0 -41

41 lines not on this page · raw message

package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch deleted +0 -62

62 lines not on this page · raw message

package/gdb/8.0.1/0006-gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-gdb_wait-h.patch deleted +0 -54

54 lines not on this page · raw message

package/gdb/Config.in.host +0 -7
index a395016082..9d3bc0f8a0 100644
@@ -55,11 +55,6 @@ choice
 config BR2_GDB_VERSION_7_12
 	bool "gdb 7.12.x"
 
-config BR2_GDB_VERSION_8_0
-	bool "gdb 8.0.x"
-	# Needs a C++11 compiler
-	depends on BR2_HOST_GCC_AT_LEAST_4_8
-
 config BR2_GDB_VERSION_8_1
 	bool "gdb 8.1.x"
 	# Needs a C++11 compiler
@@ -92,7 +87,6 @@ endif
 config BR2_PACKAGE_GDB_NEEDS_CXX11
 	bool
 	default y if !BR2_PACKAGE_HOST_GDB
-	default y if BR2_GDB_VERSION_8_0
 	default y if BR2_GDB_VERSION_8_1
 	default y if BR2_GDB_VERSION_8_2
 	default y if BR2_GDB_VERSION_8_3
@@ -104,7 +98,6 @@ config BR2_GDB_VERSION
 	default "arc-2019.03-rc1-gdb" if BR2_arc
 	default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky
 	default "7.12.1"   if BR2_GDB_VERSION_7_12
-	default "8.0.1"    if BR2_GDB_VERSION_8_0
 	default "8.1.1"    if BR2_GDB_VERSION_8_1 || !BR2_PACKAGE_HOST_GDB
 	default "8.2.1"    if BR2_GDB_VERSION_8_2
 	default "8.3"	   if BR2_GDB_VERSION_8_3
package/gdb/gdb.hash +0 -1
index 76404c533d..e032cc8f70 100644
@@ -1,6 +1,5 @@
 # From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum
 sha512  0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8	gdb-7.12.1.tar.xz
-sha512  5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1	gdb-8.0.1.tar.xz
 sha512  7dcd5e8c90de92f577834d887b5f54edb93a07083bfe661bc46c270a6cc4919f0b348e7e2fe8ae4511298a570ef150eeefdc667ef7cf527f0cf60943177ab6c9	gdb-8.1.1.tar.xz
 sha512  2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11	gdb-8.2.1.tar.xz
 sha512  47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1	gdb-8.3.tar.xz
Signature · 1 line
2.21.0
#4 lore raw

PATCH 3/3 package/gdb: remove gdb 8.0.x

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

8.3 is around and 8.2 is the default version, so drop 8.0. Keep 7.12 which is the latest version that doesn't requires C++11 support.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard