From 3393364d1b365226d15042f20f0e6c56a439225b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 13 Feb 2017 10:00:11 -0800 Subject: gdb: Upgrade to 7.12.1 Drop already applied patches (From OE-Core rev: 233641857bdc4071e5cb9a25206def880eb2754d) Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/gdb/gdb-7.12.1.inc | 21 +++++++++++ meta/recipes-devtools/gdb/gdb-7.12.inc | 22 ----------- .../gdb/gdb-cross-canadian_7.12.1.bb | 3 ++ .../gdb/gdb-cross-canadian_7.12.bb | 3 -- meta/recipes-devtools/gdb/gdb-cross_7.12.1.bb | 2 + meta/recipes-devtools/gdb/gdb-cross_7.12.bb | 2 - .../cb93dc7f262978bafe36397a41a56e409a302042.patch | 43 ---------------------- meta/recipes-devtools/gdb/gdb_7.12.1.bb | 27 ++++++++++++++ meta/recipes-devtools/gdb/gdb_7.12.bb | 27 -------------- 9 files changed, 53 insertions(+), 97 deletions(-) create mode 100644 meta/recipes-devtools/gdb/gdb-7.12.1.inc delete mode 100644 meta/recipes-devtools/gdb/gdb-7.12.inc create mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.12.1.bb delete mode 100644 meta/recipes-devtools/gdb/gdb-cross-canadian_7.12.bb create mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.12.1.bb delete mode 100644 meta/recipes-devtools/gdb/gdb-cross_7.12.bb delete mode 100644 meta/recipes-devtools/gdb/gdb/cb93dc7f262978bafe36397a41a56e409a302042.patch create mode 100644 meta/recipes-devtools/gdb/gdb_7.12.1.bb delete mode 100644 meta/recipes-devtools/gdb/gdb_7.12.bb (limited to 'meta') diff --git a/meta/recipes-devtools/gdb/gdb-7.12.1.inc b/meta/recipes-devtools/gdb/gdb-7.12.1.inc new file mode 100644 index 0000000000..b15a2b5832 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-7.12.1.inc @@ -0,0 +1,21 @@ +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" + +SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \ + file://0001-include-sys-types.h-for-mode_t.patch \ + file://0002-make-man-install-relative-to-DESTDIR.patch \ + file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ + file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ + file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ + file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ + file://0007-use-asm-sgidefs.h.patch \ + file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ + file://0009-Change-order-of-CFLAGS.patch \ + file://0010-resolve-restrict-keyword-conflict.patch \ +" +SRC_URI[md5sum] = "193453347ddced7acb6b1cd2ee8f2e4b" +SRC_URI[sha256sum] = "4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186" + diff --git a/meta/recipes-devtools/gdb/gdb-7.12.inc b/meta/recipes-devtools/gdb/gdb-7.12.inc deleted file mode 100644 index 7eea65f4fa..0000000000 --- a/meta/recipes-devtools/gdb/gdb-7.12.inc +++ /dev/null @@ -1,22 +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" - -SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \ - file://0001-include-sys-types.h-for-mode_t.patch \ - file://0002-make-man-install-relative-to-DESTDIR.patch \ - file://0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch \ - file://0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch \ - file://0005-Add-support-for-Renesas-SH-sh4-architecture.patch \ - file://0006-Dont-disable-libreadline.a-when-using-disable-static.patch \ - file://0007-use-asm-sgidefs.h.patch \ - file://0008-Use-exorted-definitions-of-SIGRTMIN.patch \ - file://0009-Change-order-of-CFLAGS.patch \ - file://0010-resolve-restrict-keyword-conflict.patch \ - file://cb93dc7f262978bafe36397a41a56e409a302042.patch \ -" -SRC_URI[md5sum] = "a0a3a00f7499b0c5278ba8676745d180" -SRC_URI[sha256sum] = "834ff3c5948b30718343ea57b11cbc3235d7995c6a4f3a5cecec8c8114164f94" - diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.12.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.12.1.bb new file mode 100644 index 0000000000..301035940c --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.12.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-canadian_7.12.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.12.bb deleted file mode 100644 index 301035940c..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.12.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_7.12.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.12.1.bb new file mode 100644 index 0000000000..50cf159fdb --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross_7.12.1.bb @@ -0,0 +1,2 @@ +require gdb-cross.inc +require gdb-${PV}.inc diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.12.bb b/meta/recipes-devtools/gdb/gdb-cross_7.12.bb deleted file mode 100644 index 50cf159fdb..0000000000 --- a/meta/recipes-devtools/gdb/gdb-cross_7.12.bb +++ /dev/null @@ -1,2 +0,0 @@ -require gdb-cross.inc -require gdb-${PV}.inc diff --git a/meta/recipes-devtools/gdb/gdb/cb93dc7f262978bafe36397a41a56e409a302042.patch b/meta/recipes-devtools/gdb/gdb/cb93dc7f262978bafe36397a41a56e409a302042.patch deleted file mode 100644 index 3a42f0a770..0000000000 --- a/meta/recipes-devtools/gdb/gdb/cb93dc7f262978bafe36397a41a56e409a302042.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cb93dc7f262978bafe36397a41a56e409a302042 Mon Sep 17 00:00:00 2001 -From: Yao Qi -Date: Mon, 24 Oct 2016 10:59:11 +0100 -Subject: [PATCH] [GDBserver] Fix conversion warning - -I got the following warning if I build GDBserver for aarch64_be-linux-gnu, - -git/gdb/gdbserver/linux-aarch64-low.c:1539:39: error: invalid conversion from 'void*' to 'uint32_t* {aka unsigned int*}' [-fpermissive] - uint32_t *le_buf = xmalloc (byte_len); - ^ -The patch is to fix the warning. - -gdb/gdbserver: - -2016-10-24 Yao Qi - - PR server/20733 - * linux-aarch64-low.c (append_insns): Cast the return value to - 'uint32_t *'. - -Upstream-status: Backport -Signed-off-by: Koen Kooi - ---- - gdb/gdbserver/linux-aarch64-low.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c -index e54a8ba..ae80cdd 100644 ---- a/gdb/gdbserver/linux-aarch64-low.c -+++ b/gdb/gdbserver/linux-aarch64-low.c -@@ -1536,7 +1536,7 @@ append_insns (CORE_ADDR *to, size_t len, const uint32_t *buf) - { - size_t byte_len = len * sizeof (uint32_t); - #if (__BYTE_ORDER == __BIG_ENDIAN) -- uint32_t *le_buf = xmalloc (byte_len); -+ uint32_t *le_buf = (uint32_t *) xmalloc (byte_len); - size_t i; - - for (i = 0; i < len; i++) --- -2.9.3 - diff --git a/meta/recipes-devtools/gdb/gdb_7.12.1.bb b/meta/recipes-devtools/gdb/gdb_7.12.1.bb new file mode 100644 index 0000000000..4fddf81ffa --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb_7.12.1.bb @@ -0,0 +1,27 @@ +require gdb.inc +require gdb-${PV}.inc + +inherit python3-dir + +EXTRA_OEMAKE_append_libc-musl = "\ + gt_cv_func_gnugettext1_libc=yes \ + gt_cv_func_gnugettext2_libc=yes \ + gl_cv_func_gettimeofday_clobber=no \ + " + +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}${PYTHON_ABI}/" ;; + --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;; + --exec-prefix) echo "${exec_prefix}" ;; + *) exit 1 ;; +esac +exit 0 +EOF + chmod +x ${WORKDIR}/python + fi +} +CFLAGS_append_libc-musl = " -Drpl_gettimeofday=gettimeofday" diff --git a/meta/recipes-devtools/gdb/gdb_7.12.bb b/meta/recipes-devtools/gdb/gdb_7.12.bb deleted file mode 100644 index 4fddf81ffa..0000000000 --- a/meta/recipes-devtools/gdb/gdb_7.12.bb +++ /dev/null @@ -1,27 +0,0 @@ -require gdb.inc -require gdb-${PV}.inc - -inherit python3-dir - -EXTRA_OEMAKE_append_libc-musl = "\ - gt_cv_func_gnugettext1_libc=yes \ - gt_cv_func_gnugettext2_libc=yes \ - gl_cv_func_gettimeofday_clobber=no \ - " - -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}${PYTHON_ABI}/" ;; - --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" ;; - --exec-prefix) echo "${exec_prefix}" ;; - *) exit 1 ;; -esac -exit 0 -EOF - chmod +x ${WORKDIR}/python - fi -} -CFLAGS_append_libc-musl = " -Drpl_gettimeofday=gettimeofday" -- cgit v1.2.3