From b171f30701aae36f8512ed0b7472984671589c5f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 4 Nov 2014 11:39:08 +0000 Subject: gdb: 7.7.1 -> 7.8.1 Drop patch merged upstream. Also drop old arm/thumb patch which breaks the compile on arm. We've had this since 2010 (or longer) and the issue has likely been fixed upstream by now. If not someone with more knowledge will need to figure out the fix against the current codebase. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gdb/gdb-7.7.1.inc | 10 -------- meta/recipes-devtools/gdb/gdb-7.8.1.inc | 11 ++++++++ .../gdb/gdb-cross-canadian_7.7.1.bb | 3 --- .../gdb/gdb-cross-canadian_7.8.1.bb | 3 +++ meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb | 4 --- meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb | 4 +++ meta/recipes-devtools/gdb/gdb.inc | 4 +-- .../gdb/gdb/include_asm_ptrace.patch | 30 ---------------------- .../gdb/gdb/kill_arm_map_symbols.patch | 26 ------------------- meta/recipes-devtools/gdb/gdb_7.7.1.bb | 24 ----------------- meta/recipes-devtools/gdb/gdb_7.8.1.bb | 24 +++++++++++++++++ 11 files changed, 43 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-devtools/gdb/gdb-7.7.1.inc create mode 100644 meta/recipes-devtools/gdb/gdb-7.8.1.inc delete mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.1.bb delete mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb delete mode 100644 meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch delete mode 100644 meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch delete mode 100644 meta/recipes-devtools/gdb/gdb_7.7.1.bb create mode 100644 meta/recipes-devtools/gdb/gdb_7.8.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-7.7.1.inc b/meta/recipes-devtools/gdb/gdb-7.7.1.inc deleted file mode 100644 index aa16d5a09f..0000000000 --- a/meta/recipes-devtools/gdb/gdb-7.7.1.inc +++ /dev/null @@ -1,10 +0,0 @@ -LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "45b07b53d81832d32ccd4829465d4886" -SRC_URI[sha256sum] = "eefadb9831e3695d1eaef34e98b8f1fb441df6fe5071317ea49c6bd6ba213eff" diff --git a/meta/recipes-devtools/gdb/gdb-7.8.1.inc b/meta/recipes-devtools/gdb/gdb-7.8.1.inc new file mode 100644 index 0000000000..6fa13bc582 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-7.8.1.inc @@ -0,0 +1,11 @@ +LICENSE = "GPLv2 & GPLv3 & LGPLv2 & LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "997492cc3475c96f35ecc8775248c9b1" +SRC_URI[sha256sum] = "d7a923d876ecfa1cec4c1c79c014c9d8e58783a25855a95cf260275f61990647" + diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb deleted file mode 100644 index 301035940c..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gdb-common.inc -require gdb-cross-canadian.inc -require gdb-${PV}.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.1.bb new file mode 100644 index 0000000000..301035940c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.8.1.bb @@ -0,0 +1,3 @@ +require gdb-common.inc +require gdb-cross-canadian.inc +require gdb-${PV}.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb deleted file mode 100644 index f9da486d7d..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require gdb-cross.inc -require gdb-${PV}.inc - -SRC_URI += "file://sim-install-6.6.patch" diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb new file mode 100644 index 0000000000..f9da486d7d --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross_7.8.1.bb @@ -0,0 +1,4 @@ +require gdb-cross.inc +require gdb-${PV}.inc + +SRC_URI += "file://sim-install-6.6.patch" diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 7b3e59af62..2c95e03b1b 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc @@ -2,10 +2,8 @@ require gdb-common.inc inherit gettext -SRC_URI += "file://kill_arm_map_symbols.patch \ - file://gdbserver-cflags-last.diff;striplevel=0 \ +SRC_URI += "file://gdbserver-cflags-last.diff;striplevel=0 \ file://renesas-sh-native-support.patch \ - file://include_asm_ptrace.patch \ " #LDFLAGS_append = " -s" #export CFLAGS_append=" -L${STAGING_LIBDIR}" diff --git a/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch b/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch deleted file mode 100644 index 85e0147665..0000000000 --- a/meta/recipes-devtools/gdb/gdb/include_asm_ptrace.patch +++ /dev/null @@ -1,30 +0,0 @@ -gdb: include asm/ptrace.h in two aarch64 source files - -Both sys/ptrace.h and asm/ptrace.h need to be included. - -Upstream-Status: Pending - -Signed-off-by: joe.slater@windriver.com - - ---- a/gdb/aarch64-linux-nat.c -+++ b/gdb/aarch64-linux-nat.c -@@ -32,6 +32,8 @@ - #include "elf/common.h" - - #include -+#include -+ - #include - - #include "gregset.h" ---- a/gdb/gdbserver/linux-aarch64-low.c -+++ b/gdb/gdbserver/linux-aarch64-low.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - - #include "gdb_proc_service.h" diff --git a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch b/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch deleted file mode 100644 index 9fc45b9f2a..0000000000 --- a/meta/recipes-devtools/gdb/gdb/kill_arm_map_symbols.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Index: gdb-7.3/gdb/arm-tdep.c -=================================================================== ---- gdb-7.3.orig/gdb/arm-tdep.c 2011-05-17 14:27:01.000000000 -0700 -+++ gdb-7.3/gdb/arm-tdep.c 2011-08-05 22:29:58.784201850 -0700 -@@ -7806,6 +7806,19 @@ - static void - arm_elf_make_msymbol_special(asymbol *sym, struct minimal_symbol *msym) - { -+ -+ /* FIXME: We want gdb to ignore the ARM ELF mapping symbols when -+ displaying disassembly so we use this horrible hack here to -+ artifically set their address to the highest possible value. -+ This is wrong of course, and it prevents the symbols from being -+ used for their intended purpose - to distinguish between ARM -+ and THUMB code. So we ought to find a better way to do this. */ -+ if (bfd_asymbol_name (sym) -+ && bfd_asymbol_name (sym)[0] == '$' -+ && bfd_asymbol_name (sym)[1] != 0 -+ && bfd_asymbol_name (sym)[2] == 0) -+ SYMBOL_VALUE_ADDRESS(msym) = (CORE_ADDR) 0x7ffffffc; -+ - if (ARM_SYM_BRANCH_TYPE (&((elf_symbol_type *)sym)->internal_elf_sym) - == ST_BRANCH_TO_THUMB) - MSYMBOL_SET_SPECIAL (msym); diff --git a/meta/recipes-devtools/gdb/gdb_7.7.1.bb b/meta/recipes-devtools/gdb/gdb_7.7.1.bb deleted file mode 100644 index 1abc9d8e76..0000000000 --- a/meta/recipes-devtools/gdb/gdb_7.7.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -require gdb.inc -require gdb-${PV}.inc - -inherit python-dir - -PACKAGECONFIG ??= "" -PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python" -PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" - -do_configure_prepend() { - if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then - cat > ${WORKDIR}/python << EOF -#!/bin/sh -case "\$2" in - --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; - --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; - --exec-prefix) echo "${exec_prefix}" ;; - *) exit 1 ;; -esac -exit 0 -EOF - chmod +x ${WORKDIR}/python - fi -} diff --git a/meta/recipes-devtools/gdb/gdb_7.8.1.bb b/meta/recipes-devtools/gdb/gdb_7.8.1.bb new file mode 100644 index 0000000000..1abc9d8e76 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb_7.8.1.bb @@ -0,0 +1,24 @@ +require gdb.inc +require gdb-${PV}.inc + +inherit python-dir + +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python" +PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace" + +do_configure_prepend() { + if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then + cat > ${WORKDIR}/python << EOF +#!/bin/sh +case "\$2" in + --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;; + --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;; + --exec-prefix) echo "${exec_prefix}" ;; + *) exit 1 ;; +esac +exit 0 +EOF + chmod +x ${WORKDIR}/python + fi +} -- cgit 1.2.3-korg