From 3be4ca8c1220785a08cce0af64a437cc767f312e Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 16 Aug 2014 13:32:03 +0200 Subject: [PATCH] gdb: Updated (7.6.2 -> 7.7.1) and remove obsolete musl patches Signed-off-by: Alejandro Mery --- .../pkg/gdb/gdb-76-linux-low-threaddb.patch | 51 ------------------ base/musl/pkg/gdb/gdb-threaddb.patch | 54 ------------------- develop/gdb/gdb.desc | 4 +- 3 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 base/musl/pkg/gdb/gdb-76-linux-low-threaddb.patch delete mode 100644 base/musl/pkg/gdb/gdb-threaddb.patch diff --git a/base/musl/pkg/gdb/gdb-76-linux-low-threaddb.patch b/base/musl/pkg/gdb/gdb-76-linux-low-threaddb.patch deleted file mode 100644 index 5ae5f77d0..000000000 --- a/base/musl/pkg/gdb/gdb-76-linux-low-threaddb.patch +++ /dev/null @@ -1,51 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../musl/pkg/gdb/gdb-76-linux-low-threaddb.patch -# Copyright (C) 2014 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -This is a patch from sabotage-linux -https://github.com/sabotage-linux/sabotage/blob/master/KEEP/gdb-76-linux-low-threaddb.patch - -this patch fixes compilation of gdbserver on systems that don't have -thread_db.h. in that case we fall back to gdb's own copy -"gdb_thread_db.h", so the typedef of the td_thrhandle_t member is -available, which is accessed in other parts of the code without -checking whether thread_db.h is available. -this is by far the cleaner solution, removing the accesses to the -th member in other parts of the source would either litter it with -ifdefs or cripple the functionality. - ---- gdb-7.6.2.org/gdb/gdbserver/linux-low.h -+++ gdb-7.6.2/gdb/gdbserver/linux-low.h -@@ -18,6 +18,8 @@ - - #ifdef HAVE_THREAD_DB_H - #include -+#else -+#include "gdb_thread_db.h" - #endif - #include - -@@ -270,11 +272,9 @@ - int need_step_over; - - int thread_known; --#ifdef HAVE_THREAD_DB_H - /* The thread handle, used for e.g. TLS access. Only valid if - THREAD_KNOWN is set. */ - td_thrhandle_t th; --#endif - - /* Arch-specific additions. */ - struct arch_lwp_info *arch_private; diff --git a/base/musl/pkg/gdb/gdb-threaddb.patch b/base/musl/pkg/gdb/gdb-threaddb.patch deleted file mode 100644 index 3cf3ad13f..000000000 --- a/base/musl/pkg/gdb/gdb-threaddb.patch +++ /dev/null @@ -1,54 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../musl/pkg/gdb/gdb-threaddb.patch -# Copyright (C) 2014 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -This is a patch from sabotage-linux -https://github.com/sabotage-linux/sabotage/blob/master/KEEP/gdb-threaddb.patch ---- gdb-7.4.org/gdb/common/gdb_thread_db.h -+++ gdb-7.4/gdb/common/gdb_thread_db.h -@@ -1,17 +1,5 @@ - #ifdef HAVE_THREAD_DB_H - #include -- --#ifndef LIBTHREAD_DB_SO --#define LIBTHREAD_DB_SO "libthread_db.so.1" --#endif -- --#ifndef LIBTHREAD_DB_SEARCH_PATH --/* $sdir appears before $pdir for some minimal security protection: -- we trust the system libthread_db.so a bit more than some random -- libthread_db associated with whatever libpthread the app is using. */ --#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir" --#endif -- - #else - - /* Copyright (C) 1999-2000, 2007-2012 Free Software Foundation, Inc. -@@ -453,3 +441,15 @@ - #endif /* thread_db.h */ - - #endif /* HAVE_THREAD_DB_H */ -+ -+#ifndef LIBTHREAD_DB_SO -+#define LIBTHREAD_DB_SO "libthread_db.so.1" -+#endif -+ -+#ifndef LIBTHREAD_DB_SEARCH_PATH -+/* $sdir appears before $pdir for some minimal security protection: -+ we trust the system libthread_db.so a bit more than some random -+ libthread_db associated with whatever libpthread the app is using. */ -+#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir" -+#endif -+ diff --git a/develop/gdb/gdb.desc b/develop/gdb/gdb.desc index 3a6462af8..95e4d2554 100644 --- a/develop/gdb/gdb.desc +++ b/develop/gdb/gdb.desc @@ -31,8 +31,8 @@ [L] GPL [S] Stable -[V] 7.6.2 +[V] 7.7.1 [P] X -?-3-----9 500.500 -[D] 1640549052 gdb-7.6.2.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/ +[D] 2946293482 gdb-7.7.1.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/