diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/gdb/APKBUILD | 44 | ||||
-rw-r--r-- | main/gdb/cpuid-pic.patch | 41 | ||||
-rw-r--r-- | main/gdb/gdb-amd64-debugreg.patch | 64 | ||||
-rw-r--r-- | main/gdb/gdb-linux_nat.patch | 46 | ||||
-rw-r--r-- | main/gdb/gdb-linux_osdata.patch | 10 | ||||
-rw-r--r-- | main/gdb/gdb-linux_threaddb.patch | 28 |
6 files changed, 36 insertions, 197 deletions
diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD index 6b63328252..468a1a63c4 100644 --- a/main/gdb/APKBUILD +++ b/main/gdb/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gdb -pkgver=7.6.2 -pkgrel=1 +pkgver=7.9 +pkgrel=0 pkgdesc="The GNU Debugger" url="http://sources.redhat.com/gdb/" arch="all" @@ -10,14 +10,15 @@ depends= makedepends="ncurses-dev expat-dev texinfo readline-dev python-dev autoconf automake libtool linux-headers" subpackages="$pkgname-doc" -source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 - 05_all_readline-headers.patch - cpuid-pic.patch +source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz gdb-linux_nat.patch - gdb-linux_osdata.patch - gdb-linux_threaddb.patch - gdb-amd64-debugreg.patch " +# 05_all_readline-headers.patch +# cpuid-pic.patch +# gdb-linux_nat.patch +# gdb-linux_osdata.patch +# gdb-linux_threaddb.patch +# gdb-amd64-debugreg.patch # patches were found here: # http://distfiles.gentoo.org/distfiles/gdb-7.4-patches-1.tar.xz _builddir="$srcdir"/$pkgname-$pkgver @@ -66,24 +67,9 @@ package() { rm -rf "$pkgdir"/usr/lib } -md5sums="496399e96654fc0f899a5c964bc1f0f8 gdb-7.6.2.tar.bz2 -701b030be4c141eab6409d37f5afa11b 05_all_readline-headers.patch -a679796124dc56798cdebffa524f661c cpuid-pic.patch -fa690484f7cdd2d552216d515653b97f gdb-linux_nat.patch -58e5c62bd1104f61d1f01809aab55abb gdb-linux_osdata.patch -70777c7a82f3cbab0a70a9088feea4ac gdb-linux_threaddb.patch -c66ba0aa72baea5bea429461607c5664 gdb-amd64-debugreg.patch" -sha256sums="2f6a0e2ce1c66c9dedeb7f58a8d1298ad602ddcdaf15d23104e1f7832b96d0e8 gdb-7.6.2.tar.bz2 -390a88feac5f1d3980458057e1903a3fa104edb32daa6bb76396af1cb91cefc2 05_all_readline-headers.patch -d22ce97b01c3bb25cc17831c60b984eebe2c1fe573b04a0d87e535794294e399 cpuid-pic.patch -15eef2bf2679353de30e31f6b60b1045e453519f4f2e9fc84472b68a0c35d83d gdb-linux_nat.patch -9d92d4e760d604771a835181b35930b960abdaa9aaee699544484602cc09dfb5 gdb-linux_osdata.patch -0ec1c6c3fa09ecce7872bf1ba8a40b06238f62b4587b4d15fe29229f75cbc997 gdb-linux_threaddb.patch -ab242331458c8a0c1bb99e8fe0d53ff5dd5d443cbe2ee67668b2bdbabb5c5019 gdb-amd64-debugreg.patch" -sha512sums="e72e9c2abb58cc08c38841380270fe783f26baf62798171d21cf0843e6c9a81d285f424dc6229ea7b1c6c957d999c8aa75c2bd15076817abb9caab28c4eb7666 gdb-7.6.2.tar.bz2 -dfb7f7272305779599d3da51ce1158628473534a96f2721d7060930c94800a4efc061321bc5a9e455c72f670cfb77f0eb01cb696da55a4accf96f555377f551f 05_all_readline-headers.patch -10551a28767b270ff5107fde595ad8877f3f2d684edccc85c18d08e3a9a2c4afe48da804adf9f8e716b666817906b22565a614d22fbc91e4ee650e1ecdb8fb0e cpuid-pic.patch -c61cdf6a0b518125d977a26f8929948a47205a396e011730719b49d1395d4889a03e216108c00b1ffe28fc4ac9a820e1cdf55b69fa246d2b2f890b8da46d8508 gdb-linux_nat.patch -209de5ce0f2c01e313fc39f97576e67b8a98a991d45d302906e4b85f2e21e2948e76d530f2554964042e53d827af0414aee64a30bfa176e77815658fbc11ea0b gdb-linux_osdata.patch -af29422ef3b5bf2d95868532a1054a50141dd072c061003e6b86ac922e20d2e16baabb9eeb92c06734ae5ee86cdd40f1ef8e807fe258b56ad6b3513ad7915523 gdb-linux_threaddb.patch -6e88171db53bb9e62cbfb5e75a2df17ebd577c85c04965bc6bf93db99ccc51663d0c14edd77bf59cf88bdab73cda37e0d15600770872451d45ffe11bbd591d2b gdb-amd64-debugreg.patch" +md5sums="e6279f26559d839f0b4218a482bcb43e gdb-7.9.tar.xz +4e9d84600ca314ab4db8baf8f8ffe297 gdb-linux_nat.patch" +sha256sums="9b315651a16528f7af8c7d8284699fb0c965df316cc7339bb0b7bae335848392 gdb-7.9.tar.xz +dcef02741f402ad34c658a90b85667e93e1d3293fe2941acd5b6821b349a1532 gdb-linux_nat.patch" +sha512sums="850202a477b486a75dc8196efead79c95bc675e348064a5eefee2a50215d40f62e9e052e9b8df29f997f91430f6e7454883652c701f5b1e688d9e2c575876c83 gdb-7.9.tar.xz +1d5ecce8c1b597f12298d17bae308e332cb0dbae56b08c3da7829ab6a473f1b20e8e6572bab45bce5942771753604b7a9541c809f2a86d4beb38ff98b0be4bfe gdb-linux_nat.patch" diff --git a/main/gdb/cpuid-pic.patch b/main/gdb/cpuid-pic.patch deleted file mode 100644 index e250a95098..0000000000 --- a/main/gdb/cpuid-pic.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./gdb/common/linux-btrace.c.orig 2013-04-29 07:44:49.320273451 +0000 -+++ ./gdb/common/linux-btrace.c 2013-04-29 08:05:02.111631215 +0000 -@@ -342,10 +342,12 @@ - #if defined __i386__ || defined __x86_64__ - unsigned int cpuid, model, family; - -- __asm__ __volatile__ ("movl $1, %%eax;" -+ __asm__ __volatile__ ("movl %%ebx, %%edi;" -+ "movl $1, %%eax;" - "cpuid;" -+ "movl %%edi, %%ebx;" - : "=a" (cpuid) -- :: "%ebx", "%ecx", "%edx"); -+ :: "%ecx", "%edx", "%edi"); - - family = (cpuid >> 8) & 0xf; - model = (cpuid >> 4) & 0xf; -@@ -392,7 +394,8 @@ - #if defined __i386__ || defined __x86_64__ - char vendor[13]; - -- __asm__ __volatile__ ("xorl %%ebx, %%ebx;" -+ __asm__ __volatile__ ("movl %%ebx, %%edi;" -+ "xorl %%ebx, %%ebx;" - "xorl %%ecx, %%ecx;" - "xorl %%edx, %%edx;" - "movl $0, %%eax;" -@@ -400,11 +403,12 @@ - "movl %%ebx, %0;" - "movl %%edx, %1;" - "movl %%ecx, %2;" -+ "movl %%edi, %%ebx;" - : "=m" (vendor[0]), - "=m" (vendor[4]), - "=m" (vendor[8]) - : -- : "%eax", "%ebx", "%ecx", "%edx"); -+ : "%eax", "%ecx", "%edx", "%edi"); - vendor[12] = '\0'; - - if (strcmp (vendor, "GenuineIntel") == 0) diff --git a/main/gdb/gdb-amd64-debugreg.patch b/main/gdb/gdb-amd64-debugreg.patch deleted file mode 100644 index e7d380ee18..0000000000 --- a/main/gdb/gdb-amd64-debugreg.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -u -r -N gdb-7.3.1-org//gdb/amd64-linux-nat.c gdb-7.3.1-patched//gdb/amd64-linux-nat.c ---- gdb-7.3.1-org//gdb/amd64-linux-nat.c 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.3.1-patched//gdb/amd64-linux-nat.c 2011-09-22 22:20:23.438841813 +0000 -@@ -32,7 +32,7 @@ - #include "elf/common.h" - #include <sys/uio.h> - #include <sys/ptrace.h> --#include <sys/debugreg.h> -+#include "debugreg.h" - #include <sys/syscall.h> - #include <sys/procfs.h> - #include <asm/prctl.h> -diff -u -r -N gdb-7.3.1-org//gdb/debugreg.h gdb-7.3.1-patched//gdb/debugreg.h ---- gdb-7.3.1-org//gdb/debugreg.h 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.3.1-patched//gdb/debugreg.h 2011-09-22 22:20:01.381841813 +0000 -@@ -0,0 +1,48 @@ -+#ifndef SYS_DEBUGREG_H -+#define SYS_DEBUGREG_H -+ -+#include <stdint.h> -+ -+#define DR_FIRSTADDR 0 -+#define DR_LASTADDR 3 -+ -+#define DR_STATUS 6 -+#define DR_CONTROL 7 -+ -+#define DR_TRAP0 (0x1) -+#define DR_TRAP1 (0x2) -+#define DR_TRAP2 (0x4) -+#define DR_TRAP3 (0x8) -+ -+#define DR_STEP (0x4000) -+#define DR_SWITCH (0x8000) -+ -+#define DR_CONTROL_SHIFT 16 -+#define DR_CONTROL_SIZE 4 -+ -+#define DR_RW_EXECUTE (0x0) -+#define DR_RW_WRITE (0x1) -+#define DR_RW_READ (0x3) -+ -+#define DR_LEN_1 (0x0) -+#define DR_LEN_2 (0x4) -+#define DR_LEN_4 (0xC) -+#define DR_LEN_8 (0x8) -+ -+#define DR_LOCAL_ENABLE_SHIFT 0 -+#define DR_GLOBAL_ENABLE_SHIFT 1 -+#define DR_ENABLE_SIZE 2 -+ -+#define DR_LOCAL_ENABLE_MASK (0x55) -+#define DR_GLOBAL_ENABLE_MASK (0xAA) -+ -+ -+#if SIZE_MAX > 4294967295 -+# define DR_CONTROL_RESERVED (0xFFFFFFFF0000FC00UL) -+#else -+# define DR_CONTROL_RESERVED (0x00FC00U) -+#endif -+#define DR_LOCAL_SLOWDOWN (0x100) -+#define DR_GLOBAL_SLOWDOWN (0x200) -+ -+#endif diff --git a/main/gdb/gdb-linux_nat.patch b/main/gdb/gdb-linux_nat.patch index ba947ad07a..6a7276cc41 100644 --- a/main/gdb/gdb-linux_nat.patch +++ b/main/gdb/gdb-linux_nat.patch @@ -1,30 +1,26 @@ -diff -u -r -N gdb-7.3.1-org//gdb/linux-nat.c gdb-7.3.1-patched//gdb/linux-nat.c ---- gdb-7.3.1-org//gdb/linux-nat.c 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.3.1-patched//gdb/linux-nat.c 2011-09-22 22:17:38.647841814 +0000 -@@ -18,6 +18,7 @@ - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ +--- ./gdb/linux-nat.c.orig ++++ ./gdb/linux-nat.c +@@ -169,6 +169,10 @@ + #define O_LARGEFILE 0 + #endif -+#include "stopcode.h" - #include "defs.h" - #include "inferior.h" - #include "target.h" -@@ -68,6 +69,10 @@ - # endif - #endif /* HAVE_PERSONALITY */ - -+#ifndef __SIGRTMIN -+#define __SIGRTMIN SIGRTMIN -+#endif -+ - /* This comment documents high-level logic of this file. - - Waiting for events in sync mode -diff -u -r -N gdb-7.3.1-org//gdb/stopcode.h gdb-7.3.1-patched//gdb/stopcode.h ---- gdb-7.3.1-org//gdb/stopcode.h 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.3.1-patched//gdb/stopcode.h 2011-09-22 22:17:38.648841814 +0000 -@@ -0,0 +1,4 @@ +#ifndef W_STOPCODE +#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) +#endif + + /* The single-threaded native GNU/Linux target_ops. We save a pointer for + the use of the multi-threaded target. */ + static struct target_ops *linux_ops; +@@ -4875,10 +4879,10 @@ + fortunately they don't change! */ + + if (restart == 0) +- restart = __SIGRTMIN; ++ restart = SIGRTMIN; + + if (cancel == 0) +- cancel = __SIGRTMIN + 1; ++ cancel = SIGRTMIN + 1; + + sigaddset (set, restart); + sigaddset (set, cancel); diff --git a/main/gdb/gdb-linux_osdata.patch b/main/gdb/gdb-linux_osdata.patch deleted file mode 100644 index aa2a392f4c..0000000000 --- a/main/gdb/gdb-linux_osdata.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gdb-7.6/gdb/common/linux-osdata.c.orig -+++ gdb-7.6/gdb/common/linux-osdata.c -@@ -27,6 +27,7 @@ - - #include <sys/types.h> - #include <sys/sysinfo.h> -+#include <sys/socket.h> - #include <ctype.h> - #include <stdlib.h> - #include <string.h> diff --git a/main/gdb/gdb-linux_threaddb.patch b/main/gdb/gdb-linux_threaddb.patch deleted file mode 100644 index 4148a1a263..0000000000 --- a/main/gdb/gdb-linux_threaddb.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -u -r -N gdb-7.3.1-org//gdb/linux-thread-db.c gdb-7.3.1-patched//gdb/linux-thread-db.c ---- gdb-7.3.1-org//gdb/linux-thread-db.c 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.3.1-patched//gdb/linux-thread-db.c 2011-09-22 22:17:38.648841814 +0000 -@@ -47,6 +47,8 @@ - #include <gnu/libc-version.h> - #endif - -+#include "threadpathhack.h" -+ - /* GNU/Linux libthread_db support. - - libthread_db is a library, provided along with libpthread.so, which -diff -u -r -N gdb-7.3.1-org//gdb/threadpathhack.h gdb-7.3.1-patched//gdb/threadpathhack.h ---- gdb-7.3.1-org//gdb/threadpathhack.h 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-7.3.1-patched//gdb/threadpathhack.h 2011-09-22 22:17:38.648841814 +0000 -@@ -0,0 +1,12 @@ -+#ifndef HACK_PATH_SO -+#define HACK_PATH_SO -+ -+#ifndef LIBTHREAD_DB_SO -+#define LIBTHREAD_DB_SO "bug.so" -+#endif -+#ifndef LIBTHREAD_DB_SEARCH_PATH -+#define LIBTHREAD_DB_SEARCH_PATH "/lib" -+#endif -+ -+#endif -+ |