From a0eb64ad33b187d8782a342e5e4f00605e632180 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Sun, 24 May 2020 15:03:33 +0200 Subject: crossgcc: Upgrade GDB to version 9.2 Change-Id: I30dae356ec3b373ac036c7eced7d6e89ddd08246 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/38787 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- util/crossgcc/buildgcc | 2 +- util/crossgcc/patches/gdb-8.3.1_amd64.patch | 14 -------------- util/crossgcc/patches/gdb-8.3.1_no-doc.patch | 12 ------------ util/crossgcc/patches/gdb-8.3.1_pythonhome.patch | 19 ------------------- util/crossgcc/patches/gdb-9.2_amd64.patch | 14 ++++++++++++++ util/crossgcc/patches/gdb-9.2_no-doc.patch | 11 +++++++++++ util/crossgcc/patches/gdb-9.2_pythonhome.patch | 19 +++++++++++++++++++ util/crossgcc/sum/gdb-8.3.1.tar.xz.cksum | 1 - util/crossgcc/sum/gdb-9.2.tar.xz.cksum | 1 + 9 files changed, 46 insertions(+), 47 deletions(-) delete mode 100644 util/crossgcc/patches/gdb-8.3.1_amd64.patch delete mode 100644 util/crossgcc/patches/gdb-8.3.1_no-doc.patch delete mode 100644 util/crossgcc/patches/gdb-8.3.1_pythonhome.patch create mode 100644 util/crossgcc/patches/gdb-9.2_amd64.patch create mode 100644 util/crossgcc/patches/gdb-9.2_no-doc.patch create mode 100644 util/crossgcc/patches/gdb-9.2_pythonhome.patch delete mode 100644 util/crossgcc/sum/gdb-8.3.1.tar.xz.cksum create mode 100644 util/crossgcc/sum/gdb-9.2.tar.xz.cksum diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 180ac1a268..2e5b2d0756 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -39,7 +39,7 @@ MPC_VERSION=1.1.0 GCC_VERSION=8.3.0 GCC_AUTOCONF_VERSION=2.69 BINUTILS_VERSION=2.33.1 -GDB_VERSION=8.3.1 +GDB_VERSION=9.2 IASL_VERSION=20200110 PYTHON_VERSION=3.8.1 EXPAT_VERSION=2.2.9 diff --git a/util/crossgcc/patches/gdb-8.3.1_amd64.patch b/util/crossgcc/patches/gdb-8.3.1_amd64.patch deleted file mode 100644 index 47d9a72a66..0000000000 --- a/util/crossgcc/patches/gdb-8.3.1_amd64.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN gdb-3.orig/gdb/configure.tgt gdb-8.3/gdb/configure.tgt ---- gdb-8.3.orig/gdb/configure.tgt 2019-02-27 05:51:48.000000000 +0100 -+++ gdb-8.3/gdb/configure.tgt 2019-05-12 08:07:45.624984535 +0200 -@@ -772,6 +772,10 @@ - x86_64-*-rtems*) - gdb_target_obs="${amd64_tobjs} ${i386_tobjs} i386-bsd-tdep.o" - ;; -+x86_64-*-*) -+ # Target: amd6 -+ gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o" -+ ;; - xtensa*-*-*linux*) - # Target: GNU/Linux Xtensa - gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o" diff --git a/util/crossgcc/patches/gdb-8.3.1_no-doc.patch b/util/crossgcc/patches/gdb-8.3.1_no-doc.patch deleted file mode 100644 index 80dd349bc4..0000000000 --- a/util/crossgcc/patches/gdb-8.3.1_no-doc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN gdb-8.0.orig/gdb/Makefile.in gdb-8.0/gdb/Makefile.in ---- gdb-8.2.1.orig/gdb/Makefile.in 2019-01-04 12:58:10.227572419 +0100 -+++ gdb-8.2.1/gdb/Makefile.in 2019-01-04 12:59:00.539134274 +0100 -@@ -1568,7 +1568,7 @@ - - TSOBS = inflow.o - --SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR) -+SUBDIRS = @subdirs@ data-directory $(GNULIB_BUILDDIR) - CLEANDIRS = $(SUBDIRS) - - # List of subdirectories in the build tree that must exist. diff --git a/util/crossgcc/patches/gdb-8.3.1_pythonhome.patch b/util/crossgcc/patches/gdb-8.3.1_pythonhome.patch deleted file mode 100644 index 51f74dbe2a..0000000000 --- a/util/crossgcc/patches/gdb-8.3.1_pythonhome.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN gdb-8.2.1.orig/gdb/python/python.c gdb-8.2.1/gdb/python/python.c ---- gdb-8.2.1.org/gdb/python/python.c 2019-01-04 12:48:32.440687758 +0100 -+++ gdb-8.2.1/gdb/python/python.c 2019-01-04 12:54:09.917677688 +0100 -@@ -1727,6 +1727,15 @@ - #endif - #endif - -+ char readlinkbuffer[BUFSIZ]; -+ int readlinks = readlink("/proc/self/exe", readlinkbuffer, BUFSIZ - 1); -+ readlinkbuffer[readlinks] = 0; -+ char *executeablepath = dirname(readlinkbuffer); -+ char *pythonhome = malloc(strlen(executeablepath) + strlen("/../") + 2); -+ strcpy(pythonhome, executeablepath); -+ strcat(pythonhome, "/../"); -+ setenv("PYTHONHOME", pythonhome, 1); -+ - Py_Initialize (); - PyEval_InitThreads (); - diff --git a/util/crossgcc/patches/gdb-9.2_amd64.patch b/util/crossgcc/patches/gdb-9.2_amd64.patch new file mode 100644 index 0000000000..47d9a72a66 --- /dev/null +++ b/util/crossgcc/patches/gdb-9.2_amd64.patch @@ -0,0 +1,14 @@ +diff -urN gdb-3.orig/gdb/configure.tgt gdb-8.3/gdb/configure.tgt +--- gdb-8.3.orig/gdb/configure.tgt 2019-02-27 05:51:48.000000000 +0100 ++++ gdb-8.3/gdb/configure.tgt 2019-05-12 08:07:45.624984535 +0200 +@@ -772,6 +772,10 @@ + x86_64-*-rtems*) + gdb_target_obs="${amd64_tobjs} ${i386_tobjs} i386-bsd-tdep.o" + ;; ++x86_64-*-*) ++ # Target: amd6 ++ gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o" ++ ;; + xtensa*-*-*linux*) + # Target: GNU/Linux Xtensa + gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o" diff --git a/util/crossgcc/patches/gdb-9.2_no-doc.patch b/util/crossgcc/patches/gdb-9.2_no-doc.patch new file mode 100644 index 0000000000..59ca998051 --- /dev/null +++ b/util/crossgcc/patches/gdb-9.2_no-doc.patch @@ -0,0 +1,11 @@ +--- gdb-9.1.orig/gdb/Makefile.in 2020-02-08 13:50:14.000000000 +0100 ++++ gdb-9.1/gdb/Makefile.in 2020-02-08 20:11:17.201244042 +0100 +@@ -1606,7 +1606,7 @@ + $(SUBDIR_TARGET_OBS) \ + $(SUBDIR_GCC_COMPILE_OBS) + +-SUBDIRS = doc @subdirs@ data-directory ++SUBDIRS = @subdirs@ data-directory + CLEANDIRS = $(SUBDIRS) + + # List of subdirectories in the build tree that must exist. diff --git a/util/crossgcc/patches/gdb-9.2_pythonhome.patch b/util/crossgcc/patches/gdb-9.2_pythonhome.patch new file mode 100644 index 0000000000..51f74dbe2a --- /dev/null +++ b/util/crossgcc/patches/gdb-9.2_pythonhome.patch @@ -0,0 +1,19 @@ +diff -urN gdb-8.2.1.orig/gdb/python/python.c gdb-8.2.1/gdb/python/python.c +--- gdb-8.2.1.org/gdb/python/python.c 2019-01-04 12:48:32.440687758 +0100 ++++ gdb-8.2.1/gdb/python/python.c 2019-01-04 12:54:09.917677688 +0100 +@@ -1727,6 +1727,15 @@ + #endif + #endif + ++ char readlinkbuffer[BUFSIZ]; ++ int readlinks = readlink("/proc/self/exe", readlinkbuffer, BUFSIZ - 1); ++ readlinkbuffer[readlinks] = 0; ++ char *executeablepath = dirname(readlinkbuffer); ++ char *pythonhome = malloc(strlen(executeablepath) + strlen("/../") + 2); ++ strcpy(pythonhome, executeablepath); ++ strcat(pythonhome, "/../"); ++ setenv("PYTHONHOME", pythonhome, 1); ++ + Py_Initialize (); + PyEval_InitThreads (); + diff --git a/util/crossgcc/sum/gdb-8.3.1.tar.xz.cksum b/util/crossgcc/sum/gdb-8.3.1.tar.xz.cksum deleted file mode 100644 index c36285846f..0000000000 --- a/util/crossgcc/sum/gdb-8.3.1.tar.xz.cksum +++ /dev/null @@ -1 +0,0 @@ -d403ba208945bbf04f8130ea4853730cdf0c8fc7 tarballs/gdb-8.3.1.tar.xz diff --git a/util/crossgcc/sum/gdb-9.2.tar.xz.cksum b/util/crossgcc/sum/gdb-9.2.tar.xz.cksum new file mode 100644 index 0000000000..8bbc4489d8 --- /dev/null +++ b/util/crossgcc/sum/gdb-9.2.tar.xz.cksum @@ -0,0 +1 @@ +356ee474a24bfb2f133894730916557dfea9da2e tarballs/gdb-9.2.tar.xz -- cgit v1.2.3