diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/gdb | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/gdb')
-rw-r--r-- | poky/meta/recipes-devtools/gdb/gdb-8.2.1.inc (renamed from poky/meta/recipes-devtools/gdb/gdb-8.2.inc) | 5 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/gdb/gdb-common.inc | 3 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.1.bb (renamed from poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/gdb/gdb-cross_8.2.1.bb (renamed from poky/meta/recipes-devtools/gdb/gdb-cross_8.2.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/gdb/gdb/0001-Fix-build-with-latest-GCC-9.0-tree.patch | 50 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/gdb/gdb_8.2.1.bb (renamed from poky/meta/recipes-devtools/gdb/gdb_8.2.bb) | 0 |
7 files changed, 55 insertions, 5 deletions
diff --git a/poky/meta/recipes-devtools/gdb/gdb-8.2.inc b/poky/meta/recipes-devtools/gdb/gdb-8.2.1.inc index 7e0809de7..1fc1ec0da 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-8.2.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-8.2.1.inc @@ -16,7 +16,8 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \ file://0010-resolve-restrict-keyword-conflict.patch \ file://0011-Fix-invalid-sigprocmask-call.patch \ file://gdbserver-ctrl-c-handling.patch \ + file://0001-Fix-build-with-latest-GCC-9.0-tree.patch \ " -SRC_URI[md5sum] = "b5a49dbff00d9a87fbe114d14b3101c0" -SRC_URI[sha256sum] = "c3a441a29c7c89720b734e5a9c6289c0a06be7e0c76ef538f7bbcef389347c39" +SRC_URI[md5sum] = "f8b2562e830a4098dd5b5ea9e9296c70" +SRC_URI[sha256sum] = "0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202" diff --git a/poky/meta/recipes-devtools/gdb/gdb-common.inc b/poky/meta/recipes-devtools/gdb/gdb-common.inc index fa64939f2..08f615add 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-common.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-common.inc @@ -4,11 +4,10 @@ SECTION = "devel" DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native" LTTNGUST = "lttng-ust" +LTTNGUST_arc = "" LTTNGUST_aarch64 = "" -LTTNGUST_riscv64 = "" LTTNGUST_mipsarch = "" LTTNGUST_sh4 = "" -LTTNGUST_libc-musl = "" inherit autotools texinfo diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 4fc6747d9..475e4f08e 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -6,7 +6,7 @@ PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gdb" DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext \ - virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc" + virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-libc" GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.1.bb index 301035940..301035940 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb +++ b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.1.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb-cross_8.2.bb b/poky/meta/recipes-devtools/gdb/gdb-cross_8.2.1.bb index 50cf159fd..50cf159fd 100644 --- a/poky/meta/recipes-devtools/gdb/gdb-cross_8.2.bb +++ b/poky/meta/recipes-devtools/gdb/gdb-cross_8.2.1.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb/0001-Fix-build-with-latest-GCC-9.0-tree.patch b/poky/meta/recipes-devtools/gdb/gdb/0001-Fix-build-with-latest-GCC-9.0-tree.patch new file mode 100644 index 000000000..2a962929d --- /dev/null +++ b/poky/meta/recipes-devtools/gdb/gdb/0001-Fix-build-with-latest-GCC-9.0-tree.patch @@ -0,0 +1,50 @@ +From 7406a50077773e78282a495cb32ef5b8179f6a33 Mon Sep 17 00:00:00 2001 +From: Dimitar Dimitrov <dimitar@dinux.eu> +Date: Mon, 17 Dec 2018 21:30:52 +0200 +Subject: [PATCH] Fix build with latest GCC 9.0 tree + +A recent patch [1] to fix a GCC PR [2] actually broke the GDB build. +To fix, remove the stack pointer clobber. GCC will ignore the clobber +marker, and will not save or restore the stack pointer. + +I ran "make check-gdb" on x86_64 to ensure there are no regressions. + +gdb/ChangeLog: + +2018-12-17 Dimitar Dimitrov <dimitar@dinux.eu> + + * nat/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Remove sp clobbers. + +[1] https://gcc.gnu.org/ml/gcc-patches/2018-12/msg00532.html +[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813 + +Upstream-Status: Backport +Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu> +--- + gdb/ChangeLog | 5 +++++ + gdb/nat/linux-ptrace.c | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c +index d4c1b8f9fd..187cfeb9bc 100644 +--- a/gdb/nat/linux-ptrace.c ++++ b/gdb/nat/linux-ptrace.c +@@ -161,14 +161,14 @@ linux_ptrace_test_ret_to_nx (void) + ".globl linux_ptrace_test_ret_to_nx_instr;" + "linux_ptrace_test_ret_to_nx_instr:" + "ret" +- : : "r" (return_address) : "%esp", "memory"); ++ : : "r" (return_address) : "memory"); + #elif defined __x86_64__ + asm volatile ("pushq %0;" + ".globl linux_ptrace_test_ret_to_nx_instr;" + "linux_ptrace_test_ret_to_nx_instr:" + "ret" + : : "r" ((uint64_t) (uintptr_t) return_address) +- : "%rsp", "memory"); ++ : "memory"); + #else + # error "!__i386__ && !__x86_64__" + #endif +-- +2.20.1 diff --git a/poky/meta/recipes-devtools/gdb/gdb_8.2.bb b/poky/meta/recipes-devtools/gdb/gdb_8.2.1.bb index c6eac84dd..c6eac84dd 100644 --- a/poky/meta/recipes-devtools/gdb/gdb_8.2.bb +++ b/poky/meta/recipes-devtools/gdb/gdb_8.2.1.bb |