gdb: Update to gdb-9.2

galak · galak · commit ef3a4e7d4832 · 2020-09-16T13:12:36.000-05:00
This update pulls in some of the changes made for gdb-8.3.1 on xtensa but is missing: commit 9c24353 Author: Daniel Leung <daniel.leung@intel.com> Date: Wed Feb 26 22:22:09 2020 -0800 xtensa: intel_s1000: update to GDB 8.3.1 Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
diff --git a/configs/arc.config b/configs/arc.config
@@ -42,6 +42,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/arm.config b/configs/arm.config
@@ -43,6 +43,6 @@ CT_CC_GCC_MULTILIB_LIST="rmprofile"
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/arm64.config b/configs/arm64.config
@@ -42,7 +42,7 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
 CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--enable-targets=arm-zephyr-eabi"
diff --git a/configs/i586.config b/configs/i586.config
@@ -43,6 +43,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/iamcu.config b/configs/iamcu.config
@@ -43,6 +43,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/mips.config b/configs/mips.config
@@ -41,6 +41,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/nios2.config b/configs/nios2.config
@@ -42,6 +42,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/riscv64.config b/configs/riscv64.config
@@ -44,6 +44,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/sparc.config b/configs/sparc.config
@@ -41,6 +41,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/x86_64-zephyr-elf.config b/configs/x86_64-zephyr-elf.config
@@ -43,6 +43,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/xtensa_intel_apl_adsp.config b/configs/xtensa_intel_apl_adsp.config
@@ -44,6 +44,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/xtensa_intel_bdw_adsp.config b/configs/xtensa_intel_bdw_adsp.config
@@ -44,6 +44,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/xtensa_intel_byt_adsp.config b/configs/xtensa_intel_byt_adsp.config
@@ -44,6 +44,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/xtensa_intel_s1000.config b/configs/xtensa_intel_s1000.config
@@ -43,7 +43,7 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--enable-xtensa-use-target-regnum --disable-xtensa-remote-g-packet"
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/xtensa_nxp_imx8m_adsp.config b/configs/xtensa_nxp_imx8m_adsp.config
@@ -44,6 +44,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/xtensa_nxp_imx_adsp.config b/configs/xtensa_nxp_imx_adsp.config
@@ -44,6 +44,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/configs/xtensa_sample_controller.config b/configs/xtensa_sample_controller.config
@@ -43,6 +43,6 @@ CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-arra
 CT_CC_LANG_CXX=y
 CT_CC_GCC_LIBSTDCXX_NANO=y
 CT_DEBUG_GDB=y
-CT_GDB_V_8_3=y
+CT_GDB_V_9_2=y
 CT_GDB_CROSS_PYTHON_BINARY="python3.8"
 CT_GDB_CROSS_BUILD_NO_PYTHON=y
diff --git a/go.sh b/go.sh
@@ -12,7 +12,7 @@ if [ "$TARGETS" == "all" ]; then
 	TARGETS=${TARGETS}" tools"
 fi
 
-COMMIT="e5929d195ddd9ae719b14302af91ab96b4694ae5"
+COMMIT="b76f096f7fc21c7011f696a5fe8712819b312f0b"
 GITDIR=${PWD}
 JOBS=$(python -c 'import multiprocessing as mp; print(mp.cpu_count())')
 
diff --git a/patches/gdb/9.2/0001-gdb-remote-make-tid-pid-type-long-in-write_ptid.patch b/patches/gdb/9.2/0001-gdb-remote-make-tid-pid-type-long-in-write_ptid.patch
@@ -0,0 +1,53 @@
+From 3b0695d880afaf9ced0b91a8e3dd7b60c82b637f Mon Sep 17 00:00:00 2001
+From: Evgeniy Didin <didin@synopsys.com>
+Date: Thu, 7 Nov 2019 08:58:58 +0300
+Subject: [PATCH 1/2] gdb/remote: make tid/pid type long in write_ptid
+
+In Zephyr RTOS the k_thread_create function returns
+thread ID which is actually pointer to k_thread structure.
+If the memory addressing starts from 0x80000000, passing such
+big values to write_ptid() leads to overflow of "int tid" variable
+and thread ID becomes negative.
+So lets make tid/pid variables type "long", this will prevent overflow
+and should not break any logic.
+
+Signed-off-by: Evgeniy Didin <didin@synopsys.com>
+---
+ gdb/remote.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gdb/remote.c b/gdb/remote.c
+index 4df5c0aef8..a84aefe1a4 100644
+--- a/gdb/remote.c
++++ b/gdb/remote.c
+@@ -2921,22 +2921,22 @@ static int remote_newthread_step (threadref *ref, void *context);
+ char *
+ remote_target::write_ptid (char *buf, const char *endbuf, ptid_t ptid)
+ {
+-  int pid, tid;
++  long pid, tid;
+   struct remote_state *rs = get_remote_state ();
+ 
+   if (remote_multi_process_p (rs))
+     {
+       pid = ptid.pid ();
+       if (pid < 0)
+-	buf += xsnprintf (buf, endbuf - buf, "p-%x.", -pid);
++	buf += xsnprintf (buf, endbuf - buf, "p-%lx.", -pid);
+       else
+-	buf += xsnprintf (buf, endbuf - buf, "p%x.", pid);
++	buf += xsnprintf (buf, endbuf - buf, "p%lx.", pid);
+     }
+   tid = ptid.lwp ();
+   if (tid < 0)
+-    buf += xsnprintf (buf, endbuf - buf, "-%x", -tid);
++    buf += xsnprintf (buf, endbuf - buf, "-%lx", -tid);
+   else
+-    buf += xsnprintf (buf, endbuf - buf, "%x", tid);
++    buf += xsnprintf (buf, endbuf - buf, "%lx", tid);
+ 
+   return buf;
+ }
+-- 
+2.25.4
+
diff --git a/patches/gdb/9.2/0002-gdb-Add-fixes-for-stdint-and-remote-debug-on-xtensa.patch b/patches/gdb/9.2/0002-gdb-Add-fixes-for-stdint-and-remote-debug-on-xtensa.patch
@@ -0,0 +1,56 @@
+From a34f7002c31bb7a908873a6fc65f9aa113859974 Mon Sep 17 00:00:00 2001
+From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+Date: Fri, 11 Sep 2020 16:20:52 -0500
+Subject: [PATCH 2/2] gdb: Add fixes for stdint and remote debug on xtensa.
+
+Take both stdint and remote debug fixes from SOF.
+
+Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
+---
+ gdb/arch/xtensa.h |  2 ++
+ gdb/remote.c      | 16 +++++++++++-----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h
+index 12e26e7693..5555d62200 100644
+--- a/gdb/arch/xtensa.h
++++ b/gdb/arch/xtensa.h
+@@ -20,6 +20,8 @@
+ #ifndef ARCH_XTENSA_H
+ #define ARCH_XTENSA_H
+ 
++#include <stdint.h>
++
+ /* Xtensa ELF core file register set representation ('.reg' section).
+    Copied from target-side ELF header <xtensa/elf.h>.  */
+ 
+diff --git a/gdb/remote.c b/gdb/remote.c
+index a84aefe1a4..4acaf922d6 100644
+--- a/gdb/remote.c
++++ b/gdb/remote.c
+@@ -7980,11 +7980,17 @@ remote_target::process_g_packet (struct regcache *regcache)
+   buf_len = strlen (rs->buf.data ());
+ 
+   /* Further sanity checks, with knowledge of the architecture.  */
+-  if (buf_len > 2 * rsa->sizeof_g_packet)
+-    error (_("Remote 'g' packet reply is too long (expected %ld bytes, got %d "
+-	     "bytes): %s"),
+-	   rsa->sizeof_g_packet, buf_len / 2,
+-	   rs->buf.data ());
++   if(buf_len > 2 * rsa->sizeof_g_packet) {
++        rsa->sizeof_g_packet = buf_len;
++        for(i = 0; i < gdbarch_num_regs(gdbarch); i++){
++            if(rsa->regs[i].pnum == -1)
++               continue;
++            if(rsa->regs[i].offset >= rsa->sizeof_g_packet)
++               rsa->regs[i].in_g_packet = 0;
++            else
++               rsa->regs[i].in_g_packet = 1;
++        }
++  }
+ 
+   /* Save the size of the packet sent to us by the target.  It is used
+      as a heuristic when determining the max size of packets that the
+-- 
+2.25.4
+
