From 4fb0c302e0809c1f88a8573e87ce46da1d821a8f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Wed, 28 Oct 2009 18:55:40 +0100 Subject: config: rip-out versions marked as OBSOLETE --- config/debug/dmalloc.in | 6 ------ config/debug/gdb.in | 12 ------------ config/debug/strace.in | 12 ------------ 3 files changed, 30 deletions(-) (limited to 'config/debug') diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in index 7e026d03..fa6bdbda 100644 --- a/config/debug/dmalloc.in +++ b/config/debug/dmalloc.in @@ -13,11 +13,6 @@ config DMALLOC_V_5_5_2 bool prompt "5.5.2" -config DMALLOC_V_5_4_3 - bool - prompt "5.4.3 (OBSOLETE)" - depends on OBSOLETE - endchoice config DMALLOC_VERSION @@ -25,4 +20,3 @@ config DMALLOC_VERSION # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW default "5.5.2" if DMALLOC_V_5_5_2 - default "5.4.3" if DMALLOC_V_5_4_3 diff --git a/config/debug/gdb.in b/config/debug/gdb.in index b5673352..19414082 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -117,16 +117,6 @@ config GDB_V_6_6 bool prompt "6.6" -config GDB_V_6_5 - bool - prompt "6.5 (OBSOLETE)" - depends on OBSOLETE - -config GDB_V_6_4 - bool - prompt "6.4 (OBSOLETE)" - depends on OBSOLETE - config GDB_V_snapshot bool prompt "snapshot (EXPERIMENTAL)" @@ -143,8 +133,6 @@ config GDB_VERSION default "6.7.1" if GDB_V_6_7_1 default "6.7" if GDB_V_6_7 default "6.6" if GDB_V_6_6 - default "6.5" if GDB_V_6_5 - default "6.4" if GDB_V_6_4 default "snapshot" if GDB_V_snapshot if GDB_NATIVE diff --git a/config/debug/strace.in b/config/debug/strace.in index 4fcaa735..8f6ce0de 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -25,16 +25,6 @@ config STRACE_V_4_5_15 bool prompt "4.5.15" -config STRACE_V_4_5_14 - bool - prompt "4.5.14 (OBSOLETE)" - depends on OBSOLETE - -config STRACE_V_4_5 - bool - prompt "4.5 (OBSOLETE)" - depends on OBSOLETE - endchoice config STRACE_VERSION @@ -45,5 +35,3 @@ config STRACE_VERSION default "4.5.17" if STRACE_V_4_5_17 default "4.5.16" if STRACE_V_4_5_16 default "4.5.15" if STRACE_V_4_5_15 - default "4.5.14" if STRACE_V_4_5_14 - default "4.5" if STRACE_V_4_5 -- cgit v1.2.3 From 14f607d3a993cec5b4926abd21971648bb3542a4 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Wed, 28 Oct 2009 18:59:09 +0100 Subject: debug/gdb: remove old versions --- config/debug/gdb.in | 17 -- patches/gdb/6.6/100-uclibc-conf.patch | 82 ------- .../gdb/6.6/110-fix-compile-flag-mismatch.patch | 69 ------ .../gdb/6.7.1/100-security-errata-20050610.patch | 205 ---------------- patches/gdb/6.7.1/110-hppa-offsets.patch | 272 --------------------- patches/gdb/6.7.1/120-deleted-children.patch | 26 -- patches/gdb/6.7.1/130-dwarf-stack-overflow.patch | 52 ---- patches/gdb/6.7/100-security-errata-20050610.patch | 205 ---------------- patches/gdb/6.7/110-hppa-offsets.patch | 272 --------------------- patches/gdb/6.7/120-dwarf-stack-overflow.patch | 52 ---- 10 files changed, 1252 deletions(-) delete mode 100644 patches/gdb/6.6/100-uclibc-conf.patch delete mode 100644 patches/gdb/6.6/110-fix-compile-flag-mismatch.patch delete mode 100644 patches/gdb/6.7.1/100-security-errata-20050610.patch delete mode 100644 patches/gdb/6.7.1/110-hppa-offsets.patch delete mode 100644 patches/gdb/6.7.1/120-deleted-children.patch delete mode 100644 patches/gdb/6.7.1/130-dwarf-stack-overflow.patch delete mode 100644 patches/gdb/6.7/100-security-errata-20050610.patch delete mode 100644 patches/gdb/6.7/110-hppa-offsets.patch delete mode 100644 patches/gdb/6.7/120-dwarf-stack-overflow.patch (limited to 'config/debug') diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 19414082..4914e908 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -103,20 +103,6 @@ config GDB_V_6_8 bool prompt "6.8" -config GDB_V_6_7_1 - bool - prompt "6.7.1 (EXPERIMENTAL)" - depends on EXPERIMENTAL - -config GDB_V_6_7 - bool - prompt "6.7 (EXPERIMENTAL)" - depends on EXPERIMENTAL - -config GDB_V_6_6 - bool - prompt "6.6" - config GDB_V_snapshot bool prompt "snapshot (EXPERIMENTAL)" @@ -130,9 +116,6 @@ config GDB_VERSION # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW default "6.8" if GDB_V_6_8 - default "6.7.1" if GDB_V_6_7_1 - default "6.7" if GDB_V_6_7 - default "6.6" if GDB_V_6_6 default "snapshot" if GDB_V_snapshot if GDB_NATIVE diff --git a/patches/gdb/6.6/100-uclibc-conf.patch b/patches/gdb/6.6/100-uclibc-conf.patch deleted file mode 100644 index a790b6f0..00000000 --- a/patches/gdb/6.6/100-uclibc-conf.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -rNdup gdb-6.6.orig/bfd/configure gdb-6.6/bfd/configure ---- gdb-6.6.orig/bfd/configure 2006-10-25 08:49:20.000000000 +0200 -+++ gdb-6.6/bfd/configure 2007-05-14 10:35:50.000000000 +0200 -@@ -3579,6 +3579,11 @@ linux-gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' -diff -rNdup gdb-6.6.orig/libtool.m4 gdb-6.6/libtool.m4 ---- gdb-6.6.orig/libtool.m4 2005-12-27 17:37:57.000000000 +0100 -+++ gdb-6.6/libtool.m4 2007-05-14 10:35:50.000000000 +0200 -@@ -751,6 +751,11 @@ netbsd* | knetbsd*-gnu) - fi - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - newsos6) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] - lt_cv_file_magic_cmd=/usr/bin/file -diff -rNdup gdb-6.6.orig/ltconfig gdb-6.6/ltconfig ---- gdb-6.6.orig/ltconfig 2006-07-04 22:31:03.000000000 +0200 -+++ gdb-6.6/ltconfig 2007-05-14 10:35:50.000000000 +0200 -@@ -602,7 +602,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- - - # Transform linux* to *-*-linux-gnu*, to support old configure scripts. - case $host_os in --linux-gnu*) ;; -+linux-gnu*|linux-uclibc*) ;; - linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` - esac - -@@ -1270,6 +1270,24 @@ linux-gnu*) - dynamic_linker='GNU/Linux ld.so' - ;; - -+linux-uclibc*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ soname_spec='${libname}${release}.so$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ # Note: copied from linux-gnu, and may not be appropriate. -+ hardcode_into_libs=yes -+ # Assume using the uClibc dynamic linker. -+ dynamic_linker="uClibc ld.so" -+ ;; -+ - netbsd*) - need_lib_prefix=no - need_version=no -diff -rNdup gdb-6.6.orig/opcodes/configure gdb-6.6/opcodes/configure ---- gdb-6.6.orig/opcodes/configure 2006-10-25 08:49:20.000000000 +0200 -+++ gdb-6.6/opcodes/configure 2007-05-14 10:35:50.000000000 +0200 -@@ -3590,6 +3590,11 @@ netbsd* | knetbsd*-gnu) - fi - ;; - -+linux-uclibc*) -+ lt_cv_deplibs_check_method=pass_all -+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` -+ ;; -+ - newsos6) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file diff --git a/patches/gdb/6.6/110-fix-compile-flag-mismatch.patch b/patches/gdb/6.6/110-fix-compile-flag-mismatch.patch deleted file mode 100644 index 60f0ace6..00000000 --- a/patches/gdb/6.6/110-fix-compile-flag-mismatch.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -rduNp gdb-6.6-100/Makefile.in gdb-6.6/Makefile.in ---- gdb-6.6-100/Makefile.in 2006-12-18 08:21:19.000000000 +0100 -+++ gdb-6.6/Makefile.in 2007-05-14 10:54:29.000000000 +0200 -@@ -331,7 +331,7 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_ - # CFLAGS will be just -g. We want to ensure that TARGET libraries - # (which we know are built with gcc) are built with optimizations so - # prepend -O2 when setting CFLAGS_FOR_TARGET. --CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) -+CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)) - SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) -diff -rduNp gdb-6.6-100/Makefile.tpl gdb-6.6/Makefile.tpl ---- gdb-6.6-100/Makefile.tpl 2006-11-15 00:26:39.000000000 +0100 -+++ gdb-6.6/Makefile.tpl 2007-05-14 10:54:29.000000000 +0200 -@@ -334,7 +334,7 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_ - # CFLAGS will be just -g. We want to ensure that TARGET libraries - # (which we know are built with gcc) are built with optimizations so - # prepend -O2 when setting CFLAGS_FOR_TARGET. --CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) -+CFLAGS_FOR_TARGET = $(strip $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)) - SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ - CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) -diff -rduNp gdb-6.6-100/gdb/configure gdb-6.6/gdb/configure ---- gdb-6.6-100/gdb/configure 2006-12-17 16:38:59.000000000 +0100 -+++ gdb-6.6/gdb/configure 2007-05-14 10:55:41.000000000 +0200 -@@ -272,7 +272,7 @@ PACKAGE_STRING= - PACKAGE_BUGREPORT= - - ac_unique_file="main.c" --ac_subdirs_all="$ac_subdirs_all doc testsuite" -+ac_subdirs_all="$ac_subdirs_all doc" - # Factoring default headers for most tests. - ac_includes_default="\ - #include -@@ -3055,7 +3055,7 @@ _ACEOF - - - --subdirs="$subdirs doc testsuite" -+subdirs="$subdirs doc" - - - # Provide defaults for some variables set by the per-host and per-target -diff -rduNp gdb-6.6-100/gdb/gdbserver/configure gdb-6.6/gdb/gdbserver/configure ---- gdb-6.6-100/gdb/gdbserver/configure 2006-11-22 01:10:19.000000000 +0100 -+++ gdb-6.6/gdb/gdbserver/configure 2007-05-14 10:54:29.000000000 +0200 -@@ -1239,7 +1239,7 @@ echo "$as_me: error: \`$ac_var' was not - ac_cache_corrupted=: ;; - ,);; - *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -+ if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -diff -rduNp gdb-6.6-100/gdb/testsuite/configure gdb-6.6/gdb/testsuite/configure ---- gdb-6.6-100/gdb/testsuite/configure 2006-06-21 15:57:21.000000000 +0200 -+++ gdb-6.6/gdb/testsuite/configure 2007-05-14 10:54:29.000000000 +0200 -@@ -1248,7 +1248,7 @@ echo "$as_me: error: \`$ac_var' was not - ac_cache_corrupted=: ;; - ,);; - *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -+ if test "`echo $ac_old_val" != "`echo $ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 diff --git a/patches/gdb/6.7.1/100-security-errata-20050610.patch b/patches/gdb/6.7.1/100-security-errata-20050610.patch deleted file mode 100644 index 30c7f269..00000000 --- a/patches/gdb/6.7.1/100-security-errata-20050610.patch +++ /dev/null @@ -1,205 +0,0 @@ -Original patch from gentoo: gentoo/src/patchsets/gdb/6.7.1/35_all_gdb-6.3-security-errata-20050610.patch --= BEGIN original header =- -2005-06-09 Jeff Johnston - - * gdb.base/gdbinit.exp: New testcase. - * gdb.base/gdbinit.sample: Sample .gdbinit for gdbinit.exp. - -2005-06-08 Daniel Jacobowitz - Jeff Johnston - - * Makefile.in (cli-cmds.o): Update. - * configure.in: Add check for getuid. - * configure: Regenerated. - * config.in: Ditto. - * main.c (captured_main): Pass -1 to source_command when loading - gdbinit files. - * cli/cli-cmds.c: Include "gdb_stat.h" and . - (source_command): Update documentation. Check permissions if - FROM_TTY is -1. - --= END original header =- -diff -durN gdb-6.7.1.orig/gdb/cli/cli-cmds.c gdb-6.7.1/gdb/cli/cli-cmds.c ---- gdb-6.7.1.orig/gdb/cli/cli-cmds.c 2007-08-23 20:08:47.000000000 +0200 -+++ gdb-6.7.1/gdb/cli/cli-cmds.c 2008-06-17 23:27:44.000000000 +0200 -@@ -36,6 +36,7 @@ - #include "objfiles.h" - #include "source.h" - #include "disasm.h" -+#include "gdb_stat.h" - - #include "ui-out.h" - -@@ -459,12 +460,31 @@ - - if (fd == -1) - { -- if (from_tty) -+ if (from_tty > 0) - perror_with_name (file); - else - return; - } - -+#ifdef HAVE_GETUID -+ if (from_tty == -1) -+ { -+ struct stat statbuf; -+ if (fstat (fd, &statbuf) < 0) -+ { -+ perror_with_name (file); -+ close (fd); -+ return; -+ } -+ if (statbuf.st_uid != getuid () || (statbuf.st_mode & S_IWOTH)) -+ { -+ warning (_("not using untrusted file \"%s\""), file); -+ close (fd); -+ return; -+ } -+ } -+#endif -+ - stream = fdopen (fd, FOPEN_RT); - script_from_file (stream, file); - -diff -durN gdb-6.7.1.orig/gdb/main.c gdb-6.7.1/gdb/main.c ---- gdb-6.7.1.orig/gdb/main.c 2007-08-23 20:08:36.000000000 +0200 -+++ gdb-6.7.1/gdb/main.c 2008-06-17 23:27:44.000000000 +0200 -@@ -688,7 +688,7 @@ - - if (!inhibit_gdbinit) - { -- catch_command_errors (source_script, homeinit, 0, RETURN_MASK_ALL); -+ catch_command_errors (source_script, homeinit, -1, RETURN_MASK_ALL); - } - - /* Do stats; no need to do them elsewhere since we'll only -@@ -766,7 +766,7 @@ - || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat))) - if (!inhibit_gdbinit) - { -- catch_command_errors (source_script, gdbinit, 0, RETURN_MASK_ALL); -+ catch_command_errors (source_script, gdbinit, -1, RETURN_MASK_ALL); - } - - for (i = 0; i < ncmd; i++) -diff -durN gdb-6.7.1.orig/gdb/Makefile.in gdb-6.7.1/gdb/Makefile.in ---- gdb-6.7.1.orig/gdb/Makefile.in 2008-06-17 23:27:44.000000000 +0200 -+++ gdb-6.7.1/gdb/Makefile.in 2008-06-17 23:27:44.000000000 +0200 -@@ -2885,7 +2885,7 @@ - $(expression_h) $(frame_h) $(value_h) $(language_h) $(filenames_h) \ - $(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \ - $(cli_decode_h) $(cli_script_h) $(cli_setshow_h) $(cli_cmds_h) \ -- $(tui_h) -+ $(tui_h) $(gdb_stat_h) - $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c - cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) \ - $(gdb_regex_h) $(gdb_string_h) $(completer_h) $(ui_out_h) \ -diff -durN gdb-6.7.1.orig/gdb/testsuite/gdb.base/gdbinit.exp gdb-6.7.1/gdb/testsuite/gdb.base/gdbinit.exp ---- gdb-6.7.1.orig/gdb/testsuite/gdb.base/gdbinit.exp 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7.1/gdb/testsuite/gdb.base/gdbinit.exp 2008-06-17 23:27:44.000000000 +0200 -@@ -0,0 +1,98 @@ -+# Copyright 2005 -+# Free Software Foundation, Inc. -+ -+# This program is free software; you can redistribute it and/or modify -+# it 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. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+# Please email any bugs, comments, and/or additions to this file to: -+# bug-gdb@prep.ai.mit.edu -+ -+# This file was written by Jeff Johnston . -+ -+if $tracelevel then { -+ strace $tracelevel -+} -+ -+set prms_id 0 -+set bug_id 0 -+ -+# are we on a target board -+if [is_remote target] { -+ return -+} -+ -+ -+global verbose -+global GDB -+global GDBFLAGS -+global gdb_prompt -+global timeout -+global gdb_spawn_id; -+ -+gdb_stop_suppressing_tests; -+ -+verbose "Spawning $GDB -nw" -+ -+if [info exists gdb_spawn_id] { -+ return 0; -+} -+ -+if ![is_remote host] { -+ if { [which $GDB] == 0 } then { -+ perror "$GDB does not exist." -+ exit 1 -+ } -+} -+ -+set env(HOME) [pwd] -+remote_exec build "rm .gdbinit" -+remote_exec build "cp ${srcdir}/${subdir}/gdbinit.sample .gdbinit" -+remote_exec build "chmod 646 .gdbinit" -+ -+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"]; -+if { $res < 0 || $res == "" } { -+ perror "Spawning $GDB failed." -+ return 1; -+} -+gdb_expect 360 { -+ -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" { -+ pass "untrusted .gdbinit caught." -+ } -+ -re "$gdb_prompt $" { -+ fail "untrusted .gdbinit caught." -+ } -+ timeout { -+ fail "(timeout) untrusted .gdbinit caught." -+ } -+} -+ -+remote_exec build "chmod 644 .gdbinit" -+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"]; -+if { $res < 0 || $res == "" } { -+ perror "Spawning $GDB failed." -+ return 1; -+} -+gdb_expect 360 { -+ -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" { -+ fail "trusted .gdbinit allowed." -+ } -+ -re "in gdbinit.*$gdb_prompt $" { -+ pass "trusted .gdbinit allowed." -+ } -+ timeout { -+ fail "(timeout) trusted .gdbinit allowed." -+ } -+} -+ -+remote_exec build "rm .gdbinit" -diff -durN gdb-6.7.1.orig/gdb/testsuite/gdb.base/gdbinit.sample gdb-6.7.1/gdb/testsuite/gdb.base/gdbinit.sample ---- gdb-6.7.1.orig/gdb/testsuite/gdb.base/gdbinit.sample 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7.1/gdb/testsuite/gdb.base/gdbinit.sample 2008-06-17 23:27:44.000000000 +0200 -@@ -0,0 +1 @@ -+echo "\nin gdbinit" diff --git a/patches/gdb/6.7.1/110-hppa-offsets.patch b/patches/gdb/6.7.1/110-hppa-offsets.patch deleted file mode 100644 index 06e1e741..00000000 --- a/patches/gdb/6.7.1/110-hppa-offsets.patch +++ /dev/null @@ -1,272 +0,0 @@ -Original patch from gentoo: gentoo/src/patchsets/gdb/6.7.1/45_all_gdb-hppa-offsets.patch --= BEGIN original header =- -sanitized headers dont include asm/offsets.h, so cache a local copy - -http://bugs.gentoo.org/180476 -http://lists.parisc-linux.org/pipermail/parisc-linux/2007-February/031162.html - --= END original header =- -diff -durN gdb-6.7.1.orig/gdb/hppa-linux-nat.c gdb-6.7.1/gdb/hppa-linux-nat.c ---- gdb-6.7.1.orig/gdb/hppa-linux-nat.c 2007-08-23 20:08:33.000000000 +0200 -+++ gdb-6.7.1/gdb/hppa-linux-nat.c 2008-06-17 23:27:45.000000000 +0200 -@@ -32,7 +32,7 @@ - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,43) - #include - #else --#include -+#include - #endif - - #include "hppa-tdep.h" -diff -durN gdb-6.7.1.orig/gdb/hppa-offsets.h gdb-6.7.1/gdb/hppa-offsets.h ---- gdb-6.7.1.orig/gdb/hppa-offsets.h 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7.1/gdb/hppa-offsets.h 2008-06-17 23:27:45.000000000 +0200 -@@ -0,0 +1,248 @@ -+#ifndef __ASM_OFFSETS_H__ -+#define __ASM_OFFSETS_H__ -+/* -+ * DO NOT MODIFY. -+ * -+ * This file was generated by arch/parisc/Makefile -+ * -+ */ -+ -+#define TASK_THREAD_INFO 4 /* offsetof(struct task_struct, thread_info) */ -+#define TASK_STATE 0 /* offsetof(struct task_struct, state) */ -+#define TASK_FLAGS 12 /* offsetof(struct task_struct, flags) */ -+#define TASK_SIGPENDING 1188 /* offsetof(struct task_struct, pending) */ -+#define TASK_PTRACE 16 /* offsetof(struct task_struct, ptrace) */ -+#define TASK_MM 108 /* offsetof(struct task_struct, mm) */ -+#define TASK_PERSONALITY 132 /* offsetof(struct task_struct, personality) */ -+#define TASK_PID 140 /* offsetof(struct task_struct, pid) */ -+ -+#define TASK_REGS 664 /* offsetof(struct task_struct, thread.regs) */ -+#define TASK_PT_PSW 664 /* offsetof(struct task_struct, thread.regs.gr[ 0]) */ -+#define TASK_PT_GR1 668 /* offsetof(struct task_struct, thread.regs.gr[ 1]) */ -+#define TASK_PT_GR2 672 /* offsetof(struct task_struct, thread.regs.gr[ 2]) */ -+#define TASK_PT_GR3 676 /* offsetof(struct task_struct, thread.regs.gr[ 3]) */ -+#define TASK_PT_GR4 680 /* offsetof(struct task_struct, thread.regs.gr[ 4]) */ -+#define TASK_PT_GR5 684 /* offsetof(struct task_struct, thread.regs.gr[ 5]) */ -+#define TASK_PT_GR6 688 /* offsetof(struct task_struct, thread.regs.gr[ 6]) */ -+#define TASK_PT_GR7 692 /* offsetof(struct task_struct, thread.regs.gr[ 7]) */ -+#define TASK_PT_GR8 696 /* offsetof(struct task_struct, thread.regs.gr[ 8]) */ -+#define TASK_PT_GR9 700 /* offsetof(struct task_struct, thread.regs.gr[ 9]) */ -+#define TASK_PT_GR10 704 /* offsetof(struct task_struct, thread.regs.gr[10]) */ -+#define TASK_PT_GR11 708 /* offsetof(struct task_struct, thread.regs.gr[11]) */ -+#define TASK_PT_GR12 712 /* offsetof(struct task_struct, thread.regs.gr[12]) */ -+#define TASK_PT_GR13 716 /* offsetof(struct task_struct, thread.regs.gr[13]) */ -+#define TASK_PT_GR14 720 /* offsetof(struct task_struct, thread.regs.gr[14]) */ -+#define TASK_PT_GR15 724 /* offsetof(struct task_struct, thread.regs.gr[15]) */ -+#define TASK_PT_GR16 728 /* offsetof(struct task_struct, thread.regs.gr[16]) */ -+#define TASK_PT_GR17 732 /* offsetof(struct task_struct, thread.regs.gr[17]) */ -+#define TASK_PT_GR18 736 /* offsetof(struct task_struct, thread.regs.gr[18]) */ -+#define TASK_PT_GR19 740 /* offsetof(struct task_struct, thread.regs.gr[19]) */ -+#define TASK_PT_GR20 744 /* offsetof(struct task_struct, thread.regs.gr[20]) */ -+#define TASK_PT_GR21 748 /* offsetof(struct task_struct, thread.regs.gr[21]) */ -+#define TASK_PT_GR22 752 /* offsetof(struct task_struct, thread.regs.gr[22]) */ -+#define TASK_PT_GR23 756 /* offsetof(struct task_struct, thread.regs.gr[23]) */ -+#define TASK_PT_GR24 760 /* offsetof(struct task_struct, thread.regs.gr[24]) */ -+#define TASK_PT_GR25 764 /* offsetof(struct task_struct, thread.regs.gr[25]) */ -+#define TASK_PT_GR26 768 /* offsetof(struct task_struct, thread.regs.gr[26]) */ -+#define TASK_PT_GR27 772 /* offsetof(struct task_struct, thread.regs.gr[27]) */ -+#define TASK_PT_GR28 776 /* offsetof(struct task_struct, thread.regs.gr[28]) */ -+#define TASK_PT_GR29 780 /* offsetof(struct task_struct, thread.regs.gr[29]) */ -+#define TASK_PT_GR30 784 /* offsetof(struct task_struct, thread.regs.gr[30]) */ -+#define TASK_PT_GR31 788 /* offsetof(struct task_struct, thread.regs.gr[31]) */ -+#define TASK_PT_FR0 792 /* offsetof(struct task_struct, thread.regs.fr[ 0]) */ -+#define TASK_PT_FR1 800 /* offsetof(struct task_struct, thread.regs.fr[ 1]) */ -+#define TASK_PT_FR2 808 /* offsetof(struct task_struct, thread.regs.fr[ 2]) */ -+#define TASK_PT_FR3 816 /* offsetof(struct task_struct, thread.regs.fr[ 3]) */ -+#define TASK_PT_FR4 824 /* offsetof(struct task_struct, thread.regs.fr[ 4]) */ -+#define TASK_PT_FR5 832 /* offsetof(struct task_struct, thread.regs.fr[ 5]) */ -+#define TASK_PT_FR6 840 /* offsetof(struct task_struct, thread.regs.fr[ 6]) */ -+#define TASK_PT_FR7 848 /* offsetof(struct task_struct, thread.regs.fr[ 7]) */ -+#define TASK_PT_FR8 856 /* offsetof(struct task_struct, thread.regs.fr[ 8]) */ -+#define TASK_PT_FR9 864 /* offsetof(struct task_struct, thread.regs.fr[ 9]) */ -+#define TASK_PT_FR10 872 /* offsetof(struct task_struct, thread.regs.fr[10]) */ -+#define TASK_PT_FR11 880 /* offsetof(struct task_struct, thread.regs.fr[11]) */ -+#define TASK_PT_FR12 888 /* offsetof(struct task_struct, thread.regs.fr[12]) */ -+#define TASK_PT_FR13 896 /* offsetof(struct task_struct, thread.regs.fr[13]) */ -+#define TASK_PT_FR14 904 /* offsetof(struct task_struct, thread.regs.fr[14]) */ -+#define TASK_PT_FR15 912 /* offsetof(struct task_struct, thread.regs.fr[15]) */ -+#define TASK_PT_FR16 920 /* offsetof(struct task_struct, thread.regs.fr[16]) */ -+#define TASK_PT_FR17 928 /* offsetof(struct task_struct, thread.regs.fr[17]) */ -+#define TASK_PT_FR18 936 /* offsetof(struct task_struct, thread.regs.fr[18]) */ -+#define TASK_PT_FR19 944 /* offsetof(struct task_struct, thread.regs.fr[19]) */ -+#define TASK_PT_FR20 952 /* offsetof(struct task_struct, thread.regs.fr[20]) */ -+#define TASK_PT_FR21 960 /* offsetof(struct task_struct, thread.regs.fr[21]) */ -+#define TASK_PT_FR22 968 /* offsetof(struct task_struct, thread.regs.fr[22]) */ -+#define TASK_PT_FR23 976 /* offsetof(struct task_struct, thread.regs.fr[23]) */ -+#define TASK_PT_FR24 984 /* offsetof(struct task_struct, thread.regs.fr[24]) */ -+#define TASK_PT_FR25 992 /* offsetof(struct task_struct, thread.regs.fr[25]) */ -+#define TASK_PT_FR26 1000 /* offsetof(struct task_struct, thread.regs.fr[26]) */ -+#define TASK_PT_FR27 1008 /* offsetof(struct task_struct, thread.regs.fr[27]) */ -+#define TASK_PT_FR28 1016 /* offsetof(struct task_struct, thread.regs.fr[28]) */ -+#define TASK_PT_FR29 1024 /* offsetof(struct task_struct, thread.regs.fr[29]) */ -+#define TASK_PT_FR30 1032 /* offsetof(struct task_struct, thread.regs.fr[30]) */ -+#define TASK_PT_FR31 1040 /* offsetof(struct task_struct, thread.regs.fr[31]) */ -+#define TASK_PT_SR0 1048 /* offsetof(struct task_struct, thread.regs.sr[ 0]) */ -+#define TASK_PT_SR1 1052 /* offsetof(struct task_struct, thread.regs.sr[ 1]) */ -+#define TASK_PT_SR2 1056 /* offsetof(struct task_struct, thread.regs.sr[ 2]) */ -+#define TASK_PT_SR3 1060 /* offsetof(struct task_struct, thread.regs.sr[ 3]) */ -+#define TASK_PT_SR4 1064 /* offsetof(struct task_struct, thread.regs.sr[ 4]) */ -+#define TASK_PT_SR5 1068 /* offsetof(struct task_struct, thread.regs.sr[ 5]) */ -+#define TASK_PT_SR6 1072 /* offsetof(struct task_struct, thread.regs.sr[ 6]) */ -+#define TASK_PT_SR7 1076 /* offsetof(struct task_struct, thread.regs.sr[ 7]) */ -+#define TASK_PT_IASQ0 1080 /* offsetof(struct task_struct, thread.regs.iasq[0]) */ -+#define TASK_PT_IASQ1 1084 /* offsetof(struct task_struct, thread.regs.iasq[1]) */ -+#define TASK_PT_IAOQ0 1088 /* offsetof(struct task_struct, thread.regs.iaoq[0]) */ -+#define TASK_PT_IAOQ1 1092 /* offsetof(struct task_struct, thread.regs.iaoq[1]) */ -+#define TASK_PT_CR27 1096 /* offsetof(struct task_struct, thread.regs.cr27) */ -+#define TASK_PT_ORIG_R28 1104 /* offsetof(struct task_struct, thread.regs.orig_r28) */ -+#define TASK_PT_KSP 1108 /* offsetof(struct task_struct, thread.regs.ksp) */ -+#define TASK_PT_KPC 1112 /* offsetof(struct task_struct, thread.regs.kpc) */ -+#define TASK_PT_SAR 1116 /* offsetof(struct task_struct, thread.regs.sar) */ -+#define TASK_PT_IIR 1120 /* offsetof(struct task_struct, thread.regs.iir) */ -+#define TASK_PT_ISR 1124 /* offsetof(struct task_struct, thread.regs.isr) */ -+#define TASK_PT_IOR 1128 /* offsetof(struct task_struct, thread.regs.ior) */ -+ -+#define TASK_SZ 1272 /* sizeof(struct task_struct) */ -+#define TASK_SZ_ALGN 1344 /* align(sizeof(struct task_struct), 64) */ -+ -+#define PT_PSW 0 /* offsetof(struct pt_regs, gr[ 0]) */ -+#define PT_GR1 4 /* offsetof(struct pt_regs, gr[ 1]) */ -+#define PT_GR2 8 /* offsetof(struct pt_regs, gr[ 2]) */ -+#define PT_GR3 12 /* offsetof(struct pt_regs, gr[ 3]) */ -+#define PT_GR4 16 /* offsetof(struct pt_regs, gr[ 4]) */ -+#define PT_GR5 20 /* offsetof(struct pt_regs, gr[ 5]) */ -+#define PT_GR6 24 /* offsetof(struct pt_regs, gr[ 6]) */ -+#define PT_GR7 28 /* offsetof(struct pt_regs, gr[ 7]) */ -+#define PT_GR8 32 /* offsetof(struct pt_regs, gr[ 8]) */ -+#define PT_GR9 36 /* offsetof(struct pt_regs, gr[ 9]) */ -+#define PT_GR10 40 /* offsetof(struct pt_regs, gr[10]) */ -+#define PT_GR11 44 /* offsetof(struct pt_regs, gr[11]) */ -+#define PT_GR12 48 /* offsetof(struct pt_regs, gr[12]) */ -+#define PT_GR13 52 /* offsetof(struct pt_regs, gr[13]) */ -+#define PT_GR14 56 /* offsetof(struct pt_regs, gr[14]) */ -+#define PT_GR15 60 /* offsetof(struct pt_regs, gr[15]) */ -+#define PT_GR16 64 /* offsetof(struct pt_regs, gr[16]) */ -+#define PT_GR17 68 /* offsetof(struct pt_regs, gr[17]) */ -+#define PT_GR18 72 /* offsetof(struct pt_regs, gr[18]) */ -+#define PT_GR19 76 /* offsetof(struct pt_regs, gr[19]) */ -+#define PT_GR20 80 /* offsetof(struct pt_regs, gr[20]) */ -+#define PT_GR21 84 /* offsetof(struct pt_regs, gr[21]) */ -+#define PT_GR22 88 /* offsetof(struct pt_regs, gr[22]) */ -+#define PT_GR23 92 /* offsetof(struct pt_regs, gr[23]) */ -+#define PT_GR24 96 /* offsetof(struct pt_regs, gr[24]) */ -+#define PT_GR25 100 /* offsetof(struct pt_regs, gr[25]) */ -+#define PT_GR26 104 /* offsetof(struct pt_regs, gr[26]) */ -+#define PT_GR27 108 /* offsetof(struct pt_regs, gr[27]) */ -+#define PT_GR28 112 /* offsetof(struct pt_regs, gr[28]) */ -+#define PT_GR29 116 /* offsetof(struct pt_regs, gr[29]) */ -+#define PT_GR30 120 /* offsetof(struct pt_regs, gr[30]) */ -+#define PT_GR31 124 /* offsetof(struct pt_regs, gr[31]) */ -+#define PT_FR0 128 /* offsetof(struct pt_regs, fr[ 0]) */ -+#define PT_FR1 136 /* offsetof(struct pt_regs, fr[ 1]) */ -+#define PT_FR2 144 /* offsetof(struct pt_regs, fr[ 2]) */ -+#define PT_FR3 152 /* offsetof(struct pt_regs, fr[ 3]) */ -+#define PT_FR4 160 /* offsetof(struct pt_regs, fr[ 4]) */ -+#define PT_FR5 168 /* offsetof(struct pt_regs, fr[ 5]) */ -+#define PT_FR6 176 /* offsetof(struct pt_regs, fr[ 6]) */ -+#define PT_FR7 184 /* offsetof(struct pt_regs, fr[ 7]) */ -+#define PT_FR8 192 /* offsetof(struct pt_regs, fr[ 8]) */ -+#define PT_FR9 200 /* offsetof(struct pt_regs, fr[ 9]) */ -+#define PT_FR10 208 /* offsetof(struct pt_regs, fr[10]) */ -+#define PT_FR11 216 /* offsetof(struct pt_regs, fr[11]) */ -+#define PT_FR12 224 /* offsetof(struct pt_regs, fr[12]) */ -+#define PT_FR13 232 /* offsetof(struct pt_regs, fr[13]) */ -+#define PT_FR14 240 /* offsetof(struct pt_regs, fr[14]) */ -+#define PT_FR15 248 /* offsetof(struct pt_regs, fr[15]) */ -+#define PT_FR16 256 /* offsetof(struct pt_regs, fr[16]) */ -+#define PT_FR17 264 /* offsetof(struct pt_regs, fr[17]) */ -+#define PT_FR18 272 /* offsetof(struct pt_regs, fr[18]) */ -+#define PT_FR19 280 /* offsetof(struct pt_regs, fr[19]) */ -+#define PT_FR20 288 /* offsetof(struct pt_regs, fr[20]) */ -+#define PT_FR21 296 /* offsetof(struct pt_regs, fr[21]) */ -+#define PT_FR22 304 /* offsetof(struct pt_regs, fr[22]) */ -+#define PT_FR23 312 /* offsetof(struct pt_regs, fr[23]) */ -+#define PT_FR24 320 /* offsetof(struct pt_regs, fr[24]) */ -+#define PT_FR25 328 /* offsetof(struct pt_regs, fr[25]) */ -+#define PT_FR26 336 /* offsetof(struct pt_regs, fr[26]) */ -+#define PT_FR27 344 /* offsetof(struct pt_regs, fr[27]) */ -+#define PT_FR28 352 /* offsetof(struct pt_regs, fr[28]) */ -+#define PT_FR29 360 /* offsetof(struct pt_regs, fr[29]) */ -+#define PT_FR30 368 /* offsetof(struct pt_regs, fr[30]) */ -+#define PT_FR31 376 /* offsetof(struct pt_regs, fr[31]) */ -+#define PT_SR0 384 /* offsetof(struct pt_regs, sr[ 0]) */ -+#define PT_SR1 388 /* offsetof(struct pt_regs, sr[ 1]) */ -+#define PT_SR2 392 /* offsetof(struct pt_regs, sr[ 2]) */ -+#define PT_SR3 396 /* offsetof(struct pt_regs, sr[ 3]) */ -+#define PT_SR4 400 /* offsetof(struct pt_regs, sr[ 4]) */ -+#define PT_SR5 404 /* offsetof(struct pt_regs, sr[ 5]) */ -+#define PT_SR6 408 /* offsetof(struct pt_regs, sr[ 6]) */ -+#define PT_SR7 412 /* offsetof(struct pt_regs, sr[ 7]) */ -+#define PT_IASQ0 416 /* offsetof(struct pt_regs, iasq[0]) */ -+#define PT_IASQ1 420 /* offsetof(struct pt_regs, iasq[1]) */ -+#define PT_IAOQ0 424 /* offsetof(struct pt_regs, iaoq[0]) */ -+#define PT_IAOQ1 428 /* offsetof(struct pt_regs, iaoq[1]) */ -+#define PT_CR27 432 /* offsetof(struct pt_regs, cr27) */ -+#define PT_ORIG_R28 440 /* offsetof(struct pt_regs, orig_r28) */ -+#define PT_KSP 444 /* offsetof(struct pt_regs, ksp) */ -+#define PT_KPC 448 /* offsetof(struct pt_regs, kpc) */ -+#define PT_SAR 452 /* offsetof(struct pt_regs, sar) */ -+#define PT_IIR 456 /* offsetof(struct pt_regs, iir) */ -+#define PT_ISR 460 /* offsetof(struct pt_regs, isr) */ -+#define PT_IOR 464 /* offsetof(struct pt_regs, ior) */ -+#define PT_SIZE 472 /* sizeof(struct pt_regs) */ -+#define PT_SZ_ALGN 576 /* align(sizeof(struct pt_regs), 64) */ -+ -+#define TI_TASK 0 /* offsetof(struct thread_info, task) */ -+#define TI_EXEC_DOMAIN 4 /* offsetof(struct thread_info, exec_domain) */ -+#define TI_FLAGS 8 /* offsetof(struct thread_info, flags) */ -+#define TI_CPU 16 /* offsetof(struct thread_info, cpu) */ -+#define TI_SEGMENT 12 /* offsetof(struct thread_info, addr_limit) */ -+#define TI_PRE_COUNT 20 /* offsetof(struct thread_info, preempt_count) */ -+#define THREAD_SZ 44 /* sizeof(struct thread_info) */ -+#define THREAD_SZ_ALGN 128 /* align(sizeof(struct thread_info), 64) */ -+ -+#define IRQSTAT_SIRQ_PEND 0 /* offsetof(irq_cpustat_t, __softirq_pending) */ -+#define IRQSTAT_SZ 64 /* sizeof(irq_cpustat_t) */ -+ -+#define ICACHE_BASE 8 /* offsetof(struct pdc_cache_info, ic_base) */ -+#define ICACHE_STRIDE 12 /* offsetof(struct pdc_cache_info, ic_stride) */ -+#define ICACHE_COUNT 16 /* offsetof(struct pdc_cache_info, ic_count) */ -+#define ICACHE_LOOP 20 /* offsetof(struct pdc_cache_info, ic_loop) */ -+#define DCACHE_BASE 32 /* offsetof(struct pdc_cache_info, dc_base) */ -+#define DCACHE_STRIDE 36 /* offsetof(struct pdc_cache_info, dc_stride) */ -+#define DCACHE_COUNT 40 /* offsetof(struct pdc_cache_info, dc_count) */ -+#define DCACHE_LOOP 44 /* offsetof(struct pdc_cache_info, dc_loop) */ -+#define ITLB_SID_BASE 56 /* offsetof(struct pdc_cache_info, it_sp_base) */ -+#define ITLB_SID_STRIDE 60 /* offsetof(struct pdc_cache_info, it_sp_stride) */ -+#define ITLB_SID_COUNT 64 /* offsetof(struct pdc_cache_info, it_sp_count) */ -+#define ITLB_OFF_BASE 68 /* offsetof(struct pdc_cache_info, it_off_base) */ -+#define ITLB_OFF_STRIDE 72 /* offsetof(struct pdc_cache_info, it_off_stride) */ -+#define ITLB_OFF_COUNT 76 /* offsetof(struct pdc_cache_info, it_off_count) */ -+#define ITLB_LOOP 80 /* offsetof(struct pdc_cache_info, it_loop) */ -+#define DTLB_SID_BASE 92 /* offsetof(struct pdc_cache_info, dt_sp_base) */ -+#define DTLB_SID_STRIDE 96 /* offsetof(struct pdc_cache_info, dt_sp_stride) */ -+#define DTLB_SID_COUNT 100 /* offsetof(struct pdc_cache_info, dt_sp_count) */ -+#define DTLB_OFF_BASE 104 /* offsetof(struct pdc_cache_info, dt_off_base) */ -+#define DTLB_OFF_STRIDE 108 /* offsetof(struct pdc_cache_info, dt_off_stride) */ -+#define DTLB_OFF_COUNT 112 /* offsetof(struct pdc_cache_info, dt_off_count) */ -+#define DTLB_LOOP 116 /* offsetof(struct pdc_cache_info, dt_loop) */ -+ -+#define PA_BLOCKSTEP_BIT 1 /* 31-PT_BLOCKSTEP_BIT */ -+#define PA_SINGLESTEP_BIT 0 /* 31-PT_SINGLESTEP_BIT */ -+ -+#define ASM_PMD_SHIFT 21 /* PMD_SHIFT */ -+#define ASM_PGDIR_SHIFT 21 /* PGDIR_SHIFT */ -+#define ASM_BITS_PER_PGD 11 /* BITS_PER_PGD */ -+#define ASM_BITS_PER_PMD 0 /* BITS_PER_PMD */ -+#define ASM_BITS_PER_PTE 9 /* BITS_PER_PTE */ -+#define ASM_PGD_PMD_OFFSET -8192 /* -(PAGE_SIZE << PGD_ORDER) */ -+#define ASM_PMD_ENTRY 128 /* ((PAGE_OFFSET & PMD_MASK) >> PMD_SHIFT) */ -+#define ASM_PGD_ENTRY 128 /* PAGE_OFFSET >> PGDIR_SHIFT */ -+#define ASM_PGD_ENTRY_SIZE 4 /* PGD_ENTRY_SIZE */ -+#define ASM_PMD_ENTRY_SIZE 4 /* PMD_ENTRY_SIZE */ -+#define ASM_PTE_ENTRY_SIZE 8 /* PTE_ENTRY_SIZE */ -+#define ASM_PT_INITIAL 4 /* PT_INITIAL */ -+#define ASM_PAGE_SIZE 4096 /* PAGE_SIZE */ -+ -+ -+#endif diff --git a/patches/gdb/6.7.1/120-deleted-children.patch b/patches/gdb/6.7.1/120-deleted-children.patch deleted file mode 100644 index 08bbba94..00000000 --- a/patches/gdb/6.7.1/120-deleted-children.patch +++ /dev/null @@ -1,26 +0,0 @@ -Original patch from gentoo: gentoo/src/patchsets/gdb/6.7.1/50_all_gdb-deleted-children.patch --= BEGIN original header =- -http://bugs.gentoo.org/210636 -http://sourceware.org/ml/gdb-patches/2007-11/msg00136.html - -2007-11-07 Vladimir Prus - - Fix crash when a variable object being deleted - has any of its children deleted previously. - - * varobj.c (delete_variable_1): Don't recurse - into deleted children. - --= END original header =- -diff -durN gdb-6.7.1.orig/gdb/varobj.c gdb-6.7.1/gdb/varobj.c ---- gdb-6.7.1.orig/gdb/varobj.c 2007-08-31 21:01:17.000000000 +0200 -+++ gdb-6.7.1/gdb/varobj.c 2008-06-17 23:27:45.000000000 +0200 -@@ -1295,6 +1295,8 @@ - for (i = 0; i < VEC_length (varobj_p, var->children); ++i) - { - varobj_p child = VEC_index (varobj_p, var->children, i); -+ if (!child) -+ continue; - if (!remove_from_parent_p) - child->parent = NULL; - delete_variable_1 (resultp, delcountp, child, 0, only_children_p); diff --git a/patches/gdb/6.7.1/130-dwarf-stack-overflow.patch b/patches/gdb/6.7.1/130-dwarf-stack-overflow.patch deleted file mode 100644 index 764ec65a..00000000 --- a/patches/gdb/6.7.1/130-dwarf-stack-overflow.patch +++ /dev/null @@ -1,52 +0,0 @@ -Original patch from gentoo: gentoo/src/patchsets/gdb/6.7.1/80_all_gdb-6.5-dwarf-stack-overflow.patch --= BEGIN original header =- -http://bugs.gentoo.org/144833 - -for gdb/ChangeLog: -2006-08-22 Will Drewry - Tavis Ormandy - - * dwarf2read.c (decode_locdesc): Enforce location description stack - boundaries. - * dwarfread.c (locval): Likewise. - --= END original header =- -diff -durN gdb-6.7.1.orig/gdb/dwarf2read.c gdb-6.7.1/gdb/dwarf2read.c ---- gdb-6.7.1.orig/gdb/dwarf2read.c 2007-09-05 02:51:48.000000000 +0200 -+++ gdb-6.7.1/gdb/dwarf2read.c 2008-06-17 23:27:46.000000000 +0200 -@@ -9061,8 +9061,7 @@ - callers will only want a very basic result and this can become a - complaint. - -- Note that stack[0] is unused except as a default error return. -- Note that stack overflow is not yet handled. */ -+ Note that stack[0] is unused except as a default error return. */ - - static CORE_ADDR - decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu) -@@ -9079,7 +9078,7 @@ - - i = 0; - stacki = 0; -- stack[stacki] = 0; -+ stack[++stacki] = 0; - - while (i < size) - { -@@ -9261,6 +9260,16 @@ - dwarf_stack_op_name (op)); - return (stack[stacki]); - } -+ /* Enforce maximum stack depth of size-1 to avoid ++stacki writing -+ outside of the allocated space. Also enforce minimum > 0. -+ -- wad@google.com 14 Aug 2006 */ -+ if (stacki >= sizeof (stack) / sizeof (*stack) - 1) -+ internal_error (__FILE__, __LINE__, -+ _("location description stack too deep: %d"), -+ stacki); -+ if (stacki <= 0) -+ internal_error (__FILE__, __LINE__, -+ _("location description stack too shallow")); - } - return (stack[stacki]); - } diff --git a/patches/gdb/6.7/100-security-errata-20050610.patch b/patches/gdb/6.7/100-security-errata-20050610.patch deleted file mode 100644 index a0307ade..00000000 --- a/patches/gdb/6.7/100-security-errata-20050610.patch +++ /dev/null @@ -1,205 +0,0 @@ -Original patch from gentoo: gentoo/src/patchsets/gdb/6.7/35_all_gdb-6.3-security-errata-20050610.patch --= BEGIN original header =- -2005-06-09 Jeff Johnston - - * gdb.base/gdbinit.exp: New testcase. - * gdb.base/gdbinit.sample: Sample .gdbinit for gdbinit.exp. - -2005-06-08 Daniel Jacobowitz - Jeff Johnston - - * Makefile.in (cli-cmds.o): Update. - * configure.in: Add check for getuid. - * configure: Regenerated. - * config.in: Ditto. - * main.c (captured_main): Pass -1 to source_command when loading - gdbinit files. - * cli/cli-cmds.c: Include "gdb_stat.h" and . - (source_command): Update documentation. Check permissions if - FROM_TTY is -1. - --= END original header =- -diff -durN gdb-6.7.orig/gdb/cli/cli-cmds.c gdb-6.7/gdb/cli/cli-cmds.c ---- gdb-6.7.orig/gdb/cli/cli-cmds.c 2007-08-23 20:08:47.000000000 +0200 -+++ gdb-6.7/gdb/cli/cli-cmds.c 2008-06-17 23:25:23.000000000 +0200 -@@ -36,6 +36,7 @@ - #include "objfiles.h" - #include "source.h" - #include "disasm.h" -+#include "gdb_stat.h" - - #include "ui-out.h" - -@@ -459,12 +460,31 @@ - - if (fd == -1) - { -- if (from_tty) -+ if (from_tty > 0) - perror_with_name (file); - else - return; - } - -+#ifdef HAVE_GETUID -+ if (from_tty == -1) -+ { -+ struct stat statbuf; -+ if (fstat (fd, &statbuf) < 0) -+ { -+ perror_with_name (file); -+ close (fd); -+ return; -+ } -+ if (statbuf.st_uid != getuid () || (statbuf.st_mode & S_IWOTH)) -+ { -+ warning (_("not using untrusted file \"%s\""), file); -+ close (fd); -+ return; -+ } -+ } -+#endif -+ - stream = fdopen (fd, FOPEN_RT); - script_from_file (stream, file); - -diff -durN gdb-6.7.orig/gdb/main.c gdb-6.7/gdb/main.c ---- gdb-6.7.orig/gdb/main.c 2007-08-23 20:08:36.000000000 +0200 -+++ gdb-6.7/gdb/main.c 2008-06-17 23:25:23.000000000 +0200 -@@ -688,7 +688,7 @@ - - if (!inhibit_gdbinit) - { -- catch_command_errors (source_script, homeinit, 0, RETURN_MASK_ALL); -+ catch_command_errors (source_script, homeinit, -1, RETURN_MASK_ALL); - } - - /* Do stats; no need to do them elsewhere since we'll only -@@ -766,7 +766,7 @@ - || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat))) - if (!inhibit_gdbinit) - { -- catch_command_errors (source_script, gdbinit, 0, RETURN_MASK_ALL); -+ catch_command_errors (source_script, gdbinit, -1, RETURN_MASK_ALL); - } - - for (i = 0; i < ncmd; i++) -diff -durN gdb-6.7.orig/gdb/Makefile.in gdb-6.7/gdb/Makefile.in ---- gdb-6.7.orig/gdb/Makefile.in 2007-09-05 02:14:02.000000000 +0200 -+++ gdb-6.7/gdb/Makefile.in 2008-06-17 23:25:23.000000000 +0200 -@@ -2882,7 +2882,7 @@ - $(expression_h) $(frame_h) $(value_h) $(language_h) $(filenames_h) \ - $(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \ - $(cli_decode_h) $(cli_script_h) $(cli_setshow_h) $(cli_cmds_h) \ -- $(tui_h) -+ $(tui_h) $(gdb_stat_h) - $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c - cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) \ - $(gdb_regex_h) $(gdb_string_h) $(completer_h) $(ui_out_h) \ -diff -durN gdb-6.7.orig/gdb/testsuite/gdb.base/gdbinit.exp gdb-6.7/gdb/testsuite/gdb.base/gdbinit.exp ---- gdb-6.7.orig/gdb/testsuite/gdb.base/gdbinit.exp 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7/gdb/testsuite/gdb.base/gdbinit.exp 2008-06-17 23:25:23.000000000 +0200 -@@ -0,0 +1,98 @@ -+# Copyright 2005 -+# Free Software Foundation, Inc. -+ -+# This program is free software; you can redistribute it and/or modify -+# it 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. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+# Please email any bugs, comments, and/or additions to this file to: -+# bug-gdb@prep.ai.mit.edu -+ -+# This file was written by Jeff Johnston . -+ -+if $tracelevel then { -+ strace $tracelevel -+} -+ -+set prms_id 0 -+set bug_id 0 -+ -+# are we on a target board -+if [is_remote target] { -+ return -+} -+ -+ -+global verbose -+global GDB -+global GDBFLAGS -+global gdb_prompt -+global timeout -+global gdb_spawn_id; -+ -+gdb_stop_suppressing_tests; -+ -+verbose "Spawning $GDB -nw" -+ -+if [info exists gdb_spawn_id] { -+ return 0; -+} -+ -+if ![is_remote host] { -+ if { [which $GDB] == 0 } then { -+ perror "$GDB does not exist." -+ exit 1 -+ } -+} -+ -+set env(HOME) [pwd] -+remote_exec build "rm .gdbinit" -+remote_exec build "cp ${srcdir}/${subdir}/gdbinit.sample .gdbinit" -+remote_exec build "chmod 646 .gdbinit" -+ -+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"]; -+if { $res < 0 || $res == "" } { -+ perror "Spawning $GDB failed." -+ return 1; -+} -+gdb_expect 360 { -+ -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" { -+ pass "untrusted .gdbinit caught." -+ } -+ -re "$gdb_prompt $" { -+ fail "untrusted .gdbinit caught." -+ } -+ timeout { -+ fail "(timeout) untrusted .gdbinit caught." -+ } -+} -+ -+remote_exec build "chmod 644 .gdbinit" -+set res [remote_spawn host "$GDB -nw [host_info gdb_opts]"]; -+if { $res < 0 || $res == "" } { -+ perror "Spawning $GDB failed." -+ return 1; -+} -+gdb_expect 360 { -+ -re "warning: not using untrusted file.*\.gdbinit.*\[\r\n\]$gdb_prompt $" { -+ fail "trusted .gdbinit allowed." -+ } -+ -re "in gdbinit.*$gdb_prompt $" { -+ pass "trusted .gdbinit allowed." -+ } -+ timeout { -+ fail "(timeout) trusted .gdbinit allowed." -+ } -+} -+ -+remote_exec build "rm .gdbinit" -diff -durN gdb-6.7.orig/gdb/testsuite/gdb.base/gdbinit.sample gdb-6.7/gdb/testsuite/gdb.base/gdbinit.sample ---- gdb-6.7.orig/gdb/testsuite/gdb.base/gdbinit.sample 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7/gdb/testsuite/gdb.base/gdbinit.sample 2008-06-17 23:25:23.000000000 +0200 -@@ -0,0 +1 @@ -+echo "\nin gdbinit" diff --git a/patches/gdb/6.7/110-hppa-offsets.patch b/patches/gdb/6.7/110-hppa-offsets.patch deleted file mode 100644 index 9de831b1..00000000 --- a/patches/gdb/6.7/110-hppa-offsets.patch +++ /dev/null @@ -1,272 +0,0 @@ -Original patch from gentoo: gentoo/src/patchsets/gdb/6.7/45_all_gdb-hppa-offsets.patch --= BEGIN original header =- -sanitized headers dont include asm/offsets.h, so cache a local copy - -http://bugs.gentoo.org/180476 -http://lists.parisc-linux.org/pipermail/parisc-linux/2007-February/031162.html - --= END original header =- -diff -durN gdb-6.7.orig/gdb/hppa-linux-nat.c gdb-6.7/gdb/hppa-linux-nat.c ---- gdb-6.7.orig/gdb/hppa-linux-nat.c 2007-08-23 20:08:33.000000000 +0200 -+++ gdb-6.7/gdb/hppa-linux-nat.c 2008-06-17 23:25:28.000000000 +0200 -@@ -32,7 +32,7 @@ - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,43) - #include - #else --#include -+#include - #endif - - #include "hppa-tdep.h" -diff -durN gdb-6.7.orig/gdb/hppa-offsets.h gdb-6.7/gdb/hppa-offsets.h ---- gdb-6.7.orig/gdb/hppa-offsets.h 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.7/gdb/hppa-offsets.h 2008-06-17 23:25:28.000000000 +0200 -@@ -0,0 +1,248 @@ -+#ifndef __ASM_OFFSETS_H__ -+#define __ASM_OFFSETS_H__ -+/* -+ * DO NOT MODIFY. -+ * -+ * This file was generated by arch/parisc/Makefile -+ * -+ */ -+ -+#define TASK_THREAD_INFO 4 /* offsetof(struct task_struct, thread_info) */ -+#define TASK_STATE 0 /* offsetof(struct task_struct, state) */ -+#define TASK_FLAGS 12 /* offsetof(struct task_struct, flags) */ -+#define TASK_SIGPENDING 1188 /* offsetof(struct task_struct, pending) */ -+#define TASK_PTRACE 16 /* offsetof(struct task_struct, ptrace) */ -+#define TASK_MM 108 /* offsetof(struct task_struct, mm) */ -+#define TASK_PERSONALITY 132 /* offsetof(struct task_struct, personality) */ -+#define TASK_PID 140 /* offsetof(struct task_struct, pid) */ -+ -+#define TASK_REGS 664 /* offsetof(struct task_struct, thread.regs) */ -+#define TASK_PT_PSW 664 /* offsetof(struct task_struct, thread.regs.gr[ 0]) */ -+#define TASK_PT_GR1 668 /* offsetof(struct task_struct, thread.regs.gr[ 1]) */ -+#define TASK_PT_GR2 672 /* offsetof(struct task_struct, thread.regs.gr[ 2]) */ -+#define TASK_PT_GR3 676 /* offsetof(struct task_struct, thread.regs.gr[ 3]) */ -+#define TASK_PT_GR4 680 /* offsetof(struct task_struct, thread.regs.gr[ 4]) */ -+#define TASK_PT_GR5 684 /* offsetof(struct task_struct, thread.regs.gr[ 5]) */ -+#define TASK_PT_GR6 688 /* offsetof(struct task_struct, thread.regs.gr[ 6]) */ -+#define TASK_PT_GR7 692 /* offsetof(struct task_struct, thread.regs.gr[ 7]) */ -+#define TASK_PT_GR8 696 /* offsetof(struct task_struct, thread.regs.gr[ 8]) */ -+#define TASK_PT_GR9 700 /* offsetof(struct task_struct, thread.regs.gr[ 9]) */ -+#define TASK_PT_GR10 704 /* offsetof(struct task_struct, thread.regs.gr[10]) */ -+#define TASK_PT_GR11 708 /* offsetof(struct task_struct, thread.regs.gr[11]) */ -+#define TASK_PT_GR12 712 /* offsetof(struct task_struct, thread.regs.gr[12]) */ -+#define TASK_PT_GR13 716 /* offsetof(struct task_struct, thread.regs.gr[13]) */ -+#define TASK_PT_GR14 720 /* offsetof(struct task_struct, thread.regs.gr[14]) */ -+#define TASK_PT_GR15 724 /* offsetof(struct task_struct, thread.regs.gr[15]) */ -+#define TASK_PT_GR16 728 /* offsetof(struct task_struct, thread.regs.gr[16]) */ -+#define TASK_PT_GR17 732 /* offsetof(struct task_struct, thread.regs.gr[17]) */ -+#define TASK_PT_GR18 736 /* offsetof(struct task_struct, thread.regs.gr[18]) */ -+#define TASK_PT_GR19 740 /* offsetof(struct task_struct, thread.regs.gr[19]) */ -+#define TASK_PT_GR20 744 /* offsetof(struct task_struct, thread.regs.gr[20]) */ -+#define TASK_PT_GR21 748 /* offsetof(struct task_struct, thread.regs.gr[21]) */ -+#define TASK_PT_GR22 752 /* offsetof(struct task_struct, thread.regs.gr[22]) */ -+#define TASK_PT_GR23 756 /* offsetof(struct task_struct, thread.regs.gr[23]) */ -+#define TASK_PT_GR24 760 /* offsetof(struct task_struct, thread.regs.gr[24]) */ -+#define TASK_PT_GR25 764 /* offsetof(struct task_struct, thread.regs.gr[25]) */ -+#define TASK_PT_GR26 768 /* offsetof(struct task_struct, thread.regs.gr[26]) */ -+#define TASK_PT_GR27 772 /* offsetof(struct task_struct, thread.regs.gr[27]) */ -+#define TASK_PT_GR28 776 /* offsetof(struct task_struct, thread.regs.gr[28]) */ -+#define TASK_PT_GR29 780 /* offsetof(struct task_struct, thread.regs.gr[29]) */ -+#define TASK_PT_GR30 784 /* offsetof(struct task_struct, thread.regs.gr[30]) */ -+#define TASK_PT_GR31 788 /* offsetof(struct task_struct, thread.regs.gr[31]) */ -+#define TASK_PT_FR0 792 /* offsetof(struct task_struct, thread.regs.fr[ 0]) */ -+#define TASK_PT_FR1 800 /* offsetof(struct task_struct, thread.regs.fr[ 1]) */ -+#define TASK_PT_FR2 808 /* offsetof(struct task_struct, thread.regs.fr[ 2]) */ -+#define TASK_PT_FR3 816 /* offsetof(struct task_struct, thread.regs.fr[ 3]) */ -+#define TASK_PT_FR4 824 /* offsetof(struct task_struct, thread.regs.fr[ 4]) */ -+#define TASK_PT_FR5 832 /* offsetof(struct task_struct, thread.regs.fr[ 5]) */ -+#define TASK_PT_FR6 840 /* offsetof(struct task_struct, thread.regs.fr[ 6]) */ -+#define TASK_PT_FR7 848 /* offsetof(struct task_struct, thread.regs.fr[ 7]) */ -+#define TASK_PT_FR8 856 /* offsetof(struct task_struct, thread.regs.fr[ 8]) */ -+#define TASK_PT_FR9 864 /* offsetof(struct task_struct, thread.regs.fr[ 9]) */ -+#define TASK_PT_FR10 872 /* offsetof(struct task_struct, thread.regs.fr[10]) */ -+#define TASK_PT_FR11 880 /* offsetof(struct task_struct, thread.regs.fr[11]) */ -+#define TASK_PT_FR12 888 /* offsetof(struct task_struct, thread.regs.fr[12]) */ -+#define TASK_PT_FR13 896 /* offsetof(struct task_struct, thread.regs.fr[13]) */ -+#define TASK_PT_FR14 904 /* offsetof(struct task_struct, thread.regs.fr[14]) */ -+#define TASK_PT_FR15 912 /* offsetof(struct task_struct, thread.regs.fr[15]) */ -+#define TASK_PT_FR16 920 /* offsetof(struct task_struct, thread.regs.fr[16]) */ -+#define TASK_PT_FR17 928 /* offsetof(struct task_struct, thread.regs.fr[17]) */ -+#define TASK_PT_FR18 936 /* offsetof(struct task_struct, thread.regs.fr[18]) */ -+#define TASK_PT_FR19 944 /* offsetof(struct task_struct, thread.regs.fr[19]) */ -+#define TASK_PT_FR20 952 /* offsetof(struct task_struct, thread.regs.fr[20]) */ -+#define TASK_PT_FR21 960 /* offsetof(struct task_struct, thread.regs.fr[21]) */ -+#define TASK_PT_FR22 968 /* offsetof(struct task_struct, thread.regs.fr[22]) */ -+#define TASK_PT_FR23 976 /* offsetof(struct task_struct, thread.regs.fr[23]) */ -+#define TASK_PT_FR24 984 /* offsetof(struct task_struct, thread.regs.fr[24]) */ -+#define TASK_PT_FR25 992 /* offsetof(struct task_struct, thread.regs.fr[25]) */ -+#define TASK_PT_FR26 1000 /* offsetof(struct task_struct, thread.regs.fr[26]) */ -+#define TASK_PT_FR27 1008 /* offsetof(struct task_struct, thread.regs.fr[27]) */ -+#define TASK_PT_FR28 1016 /* offsetof(struct task_struct, thread.regs.fr[28]) */ -+#define TASK_PT_FR29 1024 /* offsetof(struct task_struct, thread.regs.fr[29]) */ -+#define TASK_PT_FR30 1032 /* offsetof(struct task_struct, thread.regs.fr[30]) */ -+#define TASK_PT_FR31 1040 /* offsetof(struct task_struct, thread.regs.fr[31]) */ -+#define TASK_PT_SR0 1048 /* offsetof(struct task_struct, thread.regs.sr[ 0]) */ -+#define TASK_PT_SR1 1052 /* offsetof(struct task_struct, thread.regs.sr[ 1]) */ -+#define TASK_PT_SR2 1056 /* offsetof(struct task_struct, thread.regs.sr[ 2]) */ -+#define TASK_PT_SR3 1060 /* offsetof(struct task_struct, thread.regs.sr[ 3]) */ -+#define TASK_PT_SR4 1064 /* offsetof(struct task_struct, thread.regs.sr[ 4]) */ -+#define TASK_PT_SR5 1068 /* offsetof(struct task_struct, thread.regs.sr[ 5]) */ -+#define TASK_PT_SR6 1072 /* offsetof(struct task_struct, thread.regs.sr[ 6]) */ -+#define TASK_PT_SR7 1076 /* offsetof(struct task_struct, thread.regs.sr[ 7]) */ -+#define TASK_PT_IASQ0 1080 /* offsetof(struct task_struct, thread.regs.iasq[0]) */ -+#define TASK_PT_IASQ1 1084 /* offsetof(struct task_struct, thread.regs.iasq[1]) */ -+#define TASK_PT_IAOQ0 1088 /* offsetof(struct task_struct, thread.regs.iaoq[0]) */ -+#define TASK_PT_IAOQ1 1092 /* offsetof(struct task_struct, thread.regs.iaoq[1]) */ -+#define TASK_PT_CR27 1096 /* offsetof(struct task_struct, thread.regs.cr27) */ -+#define TASK_PT_ORIG_R28 1104 /* offsetof(struct task_struct, thread.regs.orig_r28) */ -+#define TASK_PT_KSP 1108 /* offsetof(struct task_struct, thread.regs.ksp) */ -+#define TASK_PT_KPC 1112 /* offsetof(struct task_struct, thread.regs.kpc) */ -+#define TASK_PT_SAR 1116 /* offsetof(struct task_struct, thread.regs.sar) */ -+#define TASK_PT_IIR 1120 /* offsetof(struct task_struct, thread.regs.iir) */ -+#define TASK_PT_ISR 1124 /* offsetof(struct task_struct, thread.regs.isr) */ -+#define TASK_PT_IOR 1128 /* offsetof(struct task_struct, thread.regs.ior) */ -+ -+#define TASK_SZ 1272 /* sizeof(struct task_struct) */ -+#define TASK_SZ_ALGN 1344 /* align(sizeof(struct task_struct), 64) */ -+ -+#define PT_PSW 0 /* offsetof(struct pt_regs, gr[ 0]) */ -+#define PT_GR1 4 /* offsetof(struct pt_regs, gr[ 1]) */ -+#define PT_GR2 8 /* offsetof(struct pt_regs, gr[ 2]) */ -+#define PT_GR3 12 /* offsetof(struct pt_regs, gr[ 3]) */ -+#define PT_GR4 16 /* offsetof(struct pt_regs, gr[ 4]) */ -+#define PT_GR5 20 /* offsetof(struct pt_regs, gr[ 5]) */ -+#define PT_GR6 24 /* offsetof(struct pt_regs, gr[ 6]) */ -+#define PT_GR7 28 /* offsetof(struct pt_regs, gr[ 7]) */ -+#define PT_GR8 32 /* offsetof(struct pt_regs, gr[ 8]) */ -+#define PT_GR9 36 /* offsetof(struct pt_regs, gr[ 9]) */ -+#define PT_GR10 40 /* offsetof(struct pt_regs, gr[10]) */ -+#define PT_GR11 44 /* offsetof(struct pt_regs, gr[11]) */ -+#define PT_GR12 48 /* offsetof(struct pt_regs, gr[12]) */ -+#define PT_GR13 52 /* offsetof(struct pt_regs, gr[13]) */ -+#define PT_GR14 56 /* offsetof(struct pt_regs, gr[14]) */ -+#define PT_GR15 60 /* offsetof(struct pt_regs, gr[15]) */ -+#define PT_GR16 64 /* offsetof(struct pt_regs, gr[16]) */ -+#define PT_GR17 68 /* offsetof(struct pt_regs, gr[17]) */ -+#define PT_GR18 72 /* offsetof(struct pt_regs, gr[18]) */ -+#define PT_GR19 76 /* offsetof(struct pt_regs, gr[19]) */ -+#define PT_GR20 80 /* offsetof(struct pt_regs, gr[20]) */ -+#define PT_GR21 84 /* offsetof(struct pt_regs, gr[21]) */ -+#define PT_GR22 88 /* offsetof(struct pt_regs, gr[22]) */ -+#define PT_GR23 92 /* offsetof(struct pt_regs, gr[23]) */ -+#define PT_GR24 96 /* offsetof(struct pt_regs, gr[24]) */ -+#define PT_GR25 100 /* offsetof(struct pt_regs, gr[25]) */ -+#define PT_GR26 104 /* offsetof(struct pt_regs, gr[26]) */ -+#define PT_GR27 108 /* offsetof(struct pt_regs, gr[27]) */ -+#define PT_GR28 112 /* offsetof(struct pt_regs, gr[28]) */ -+#define PT_GR29 116 /* offsetof(struct pt_regs, gr[29]) */ -+#define PT_GR30 120 /* offsetof(struct pt_regs, gr[30]) */ -+#define PT_GR31 124 /* offsetof(struct pt_regs, gr[31]) */ -+#define PT_FR0 128 /* offsetof(struct pt_regs, fr[ 0]) */ -+#define PT_FR1 136 /* offsetof(struct pt_regs, fr[ 1]) */ -+#define PT_FR2 144 /* offsetof(struct pt_regs, fr[ 2]) */ -+#define PT_FR3 152 /* offsetof(struct pt_regs, fr[ 3]) */ -+#define PT_FR4 160 /* offsetof(struct pt_regs, fr[ 4]) */ -+#define PT_FR5 168 /* offsetof(struct pt_regs, fr[ 5]) */ -+#define PT_FR6 176 /* offsetof(struct pt_regs, fr[ 6]) */ -+#define PT_FR7 184 /* offsetof(struct pt_regs, fr[ 7]) */ -+#define PT_FR8 192 /* offsetof(struct pt_regs, fr[ 8]) */ -+#define PT_FR9 200 /* offsetof(struct pt_regs, fr[ 9]) */ -+#define PT_FR10 208 /* offsetof(struct pt_regs, fr[10]) */ -+#define PT_FR11 216 /* offsetof(struct pt_regs, fr[11]) */ -+#define PT_FR12 224 /* offsetof(struct pt_regs, fr[12]) */ -+#define PT_FR13 232 /* offsetof(struct pt_regs, fr[13]) */ -+#define PT_FR14 240 /* offsetof(struct pt_regs, fr[14]) */ -+#define PT_FR15 248 /* offsetof(struct pt_regs, fr[15]) */ -+#define PT_FR16 256 /* offsetof(struct pt_regs, fr[16]) */ -+#define PT_FR17 264 /* offsetof(struct pt_regs, fr[17]) */ -+#define PT_FR18 272 /* offsetof(struct pt_regs, fr[18]) */ -+#define PT_FR19 280 /* offsetof(struct pt_regs, fr[19]) */ -+#define PT_FR20 288 /* offsetof(struct pt_regs, fr[20]) */ -+#define PT_FR21 296 /* offsetof(struct pt_regs, fr[21]) */ -+#define PT_FR22 304 /* offsetof(struct pt_regs, fr[22]) */ -+#define PT_FR23 312 /* offsetof(struct pt_regs, fr[23]) */ -+#define PT_FR24 320 /* offsetof(struct pt_regs, fr[24]) */ -+#define PT_FR25 328 /* offsetof(struct pt_regs, fr[25]) */ -+#define PT_FR26 336 /* offsetof(struct pt_regs, fr[26]) */ -+#define PT_FR27 344 /* offsetof(struct pt_regs, fr[27]) */ -+#define PT_FR28 352 /* offsetof(struct pt_regs, fr[28]) */ -+#define PT_FR29 360 /* offsetof(struct pt_regs, fr[29]) */ -+#define PT_FR30 368 /* offsetof(struct pt_regs, fr[30]) */ -+#define PT_FR31 376 /* offsetof(struct pt_regs, fr[31]) */ -+#define PT_SR0 384 /* offsetof(struct pt_regs, sr[ 0]) */ -+#define PT_SR1 388 /* offsetof(struct pt_regs, sr[ 1]) */ -+#define PT_SR2 392 /* offsetof(struct pt_regs, sr[ 2]) */ -+#define PT_SR3 396 /* offsetof(struct pt_regs, sr[ 3]) */ -+#define PT_SR4 400 /* offsetof(struct pt_regs, sr[ 4]) */ -+#define PT_SR5 404 /* offsetof(struct pt_regs, sr[ 5]) */ -+#define PT_SR6 408 /* offsetof(struct pt_regs, sr[ 6]) */ -+#define PT_SR7 412 /* offsetof(struct pt_regs, sr[ 7]) */ -+#define PT_IASQ0 416 /* offsetof(struct pt_regs, iasq[0]) */ -+#define PT_IASQ1 420 /* offsetof(struct pt_regs, iasq[1]) */ -+#define PT_IAOQ0 424 /* offsetof(struct pt_regs, iaoq[0]) */ -+#define PT_IAOQ1 428 /* offsetof(struct pt_regs, iaoq[1]) */ -+#define PT_CR27 432 /* offsetof(struct pt_regs, cr27) */ -+#define PT_ORIG_R28 440 /* offsetof(struct pt_regs, orig_r28) */ -+#define PT_KSP 444 /* offsetof(struct pt_regs, ksp) */ -+#define PT_KPC 448 /* offsetof(struct pt_regs, kpc) */ -+#define PT_SAR 452 /* offsetof(struct pt_regs, sar) */ -+#define PT_IIR 456 /* offsetof(struct pt_regs, iir) */ -+#define PT_ISR 460 /* offsetof(struct pt_regs, isr) */ -+#define PT_IOR 464 /* offsetof(struct pt_regs, ior) */ -+#define PT_SIZE 472 /* sizeof(struct pt_regs) */ -+#define PT_SZ_ALGN 576 /* align(sizeof(struct pt_regs), 64) */ -+ -+#define TI_TASK 0 /* offsetof(struct thread_info, task) */ -+#define TI_EXEC_DOMAIN 4 /* offsetof(struct thread_info, exec_domain) */ -+#define TI_FLAGS 8 /* offsetof(struct thread_info, flags) */ -+#define TI_CPU 16 /* offsetof(struct thread_info, cpu) */ -+#define TI_SEGMENT 12 /* offsetof(struct thread_info, addr_limit) */ -+#define TI_PRE_COUNT 20 /* offsetof(struct thread_info, preempt_count) */ -+#define THREAD_SZ 44 /* sizeof(struct thread_info) */ -+#define THREAD_SZ_ALGN 128 /* align(sizeof(struct thread_info), 64) */ -+ -+#define IRQSTAT_SIRQ_PEND 0 /* offsetof(irq_cpustat_t, __softirq_pending) */ -+#define IRQSTAT_SZ 64 /* sizeof(irq_cpustat_t) */ -+ -+#define ICACHE_BASE 8 /* offsetof(struct pdc_cache_info, ic_base) */ -+#define ICACHE_STRIDE 12 /* offsetof(struct pdc_cache_info, ic_stride) */ -+#define ICACHE_COUNT 16 /* offsetof(struct pdc_cache_info, ic_count) */ -+#define ICACHE_LOOP 20 /* offsetof(struct pdc_cache_info, ic_loop) */ -+#define DCACHE_BASE 32 /* offsetof(struct pdc_cache_info, dc_base) */ -+#define DCACHE_STRIDE 36 /* offsetof(struct pdc_cache_info, dc_stride) */ -+#define DCACHE_COUNT 40 /* offsetof(struct pdc_cache_info, dc_count) */ -+#define DCACHE_LOOP 44 /* offsetof(struct pdc_cache_info, dc_loop) */ -+#define ITLB_SID_BASE 56 /* offsetof(struct pdc_cache_info, it_sp_base) */ -+#define ITLB_SID_STRIDE 60 /* offsetof(struct pdc_cache_info, it_sp_stride) */ -+#define ITLB_SID_COUNT 64 /* offsetof(struct pdc_cache_info, it_sp_count) */ -+#define ITLB_OFF_BASE 68 /* offsetof(struct pdc_cache_info, it_off_base) */ -+#define ITLB_OFF_STRIDE 72 /* offsetof(struct pdc_cache_info, it_off_stride) */ -+#define ITLB_OFF_COUNT 76 /* offsetof(struct pdc_cache_info, it_off_count) */ -+#define ITLB_LOOP 80 /* offsetof(struct pdc_cache_info, it_loop) */ -+#define DTLB_SID_BASE 92 /* offsetof(struct pdc_cache_info, dt_sp_base) */ -+#define DTLB_SID_STRIDE 96 /* offsetof(struct pdc_cache_info, dt_sp_stride) */ -+#define DTLB_SID_COUNT 100 /* offsetof(struct pdc_cache_info, dt_sp_count) */ -+#define DTLB_OFF_BASE 104 /* offsetof(struct pdc_cache_info, dt_off_base) */ -+#define DTLB_OFF_STRIDE 108 /* offsetof(struct pdc_cache_info, dt_off_stride) */ -+#define DTLB_OFF_COUNT 112 /* offsetof(struct pdc_cache_info, dt_off_count) */ -+#define DTLB_LOOP 116 /* offsetof(struct pdc_cache_info, dt_loop) */ -+ -+#define PA_BLOCKSTEP_BIT 1 /* 31-PT_BLOCKSTEP_BIT */ -+#define PA_SINGLESTEP_BIT 0 /* 31-PT_SINGLESTEP_BIT */ -+ -+#define ASM_PMD_SHIFT 21 /* PMD_SHIFT */ -+#define ASM_PGDIR_SHIFT 21 /* PGDIR_SHIFT */ -+#define ASM_BITS_PER_PGD 11 /* BITS_PER_PGD */ -+#define ASM_BITS_PER_PMD 0 /* BITS_PER_PMD */ -+#define ASM_BITS_PER_PTE 9 /* BITS_PER_PTE */ -+#define ASM_PGD_PMD_OFFSET -8192 /* -(PAGE_SIZE << PGD_ORDER) */ -+#define ASM_PMD_ENTRY 128 /* ((PAGE_OFFSET & PMD_MASK) >> PMD_SHIFT) */ -+#define ASM_PGD_ENTRY 128 /* PAGE_OFFSET >> PGDIR_SHIFT */ -+#define ASM_PGD_ENTRY_SIZE 4 /* PGD_ENTRY_SIZE */ -+#define ASM_PMD_ENTRY_SIZE 4 /* PMD_ENTRY_SIZE */ -+#define ASM_PTE_ENTRY_SIZE 8 /* PTE_ENTRY_SIZE */ -+#define ASM_PT_INITIAL 4 /* PT_INITIAL */ -+#define ASM_PAGE_SIZE 4096 /* PAGE_SIZE */ -+ -+ -+#endif diff --git a/patches/gdb/6.7/120-dwarf-stack-overflow.patch b/patches/gdb/6.7/120-dwarf-stack-overflow.patch deleted file mode 100644 index 171e64e8..00000000 --- a/patches/gdb/6.7/120-dwarf-stack-overflow.patch +++ /dev/null @@ -1,52 +0,0 @@ -Original patch from gentoo: gentoo/src/patchsets/gdb/6.7/80_all_gdb-6.5-dwarf-stack-overflow.patch --= BEGIN original header =- -http://bugs.gentoo.org/144833 - -for gdb/ChangeLog: -2006-08-22 Will Drewry - Tavis Ormandy - - * dwarf2read.c (decode_locdesc): Enforce location description stack - boundaries. - * dwarfread.c (locval): Likewise. - --= END original header =- -diff -durN gdb-6.7.orig/gdb/dwarf2read.c gdb-6.7/gdb/dwarf2read.c ---- gdb-6.7.orig/gdb/dwarf2read.c 2007-09-05 02:51:48.000000000 +0200 -+++ gdb-6.7/gdb/dwarf2read.c 2008-06-17 23:25:38.000000000 +0200 -@@ -9061,8 +9061,7 @@ - callers will only want a very basic result and this can become a - complaint. - -- Note that stack[0] is unused except as a default error return. -- Note that stack overflow is not yet handled. */ -+ Note that stack[0] is unused except as a default error return. */ - - static CORE_ADDR - decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu) -@@ -9079,7 +9078,7 @@ - - i = 0; - stacki = 0; -- stack[stacki] = 0; -+ stack[++stacki] = 0; - - while (i < size) - { -@@ -9261,6 +9260,16 @@ - dwarf_stack_op_name (op)); - return (stack[stacki]); - } -+ /* Enforce maximum stack depth of size-1 to avoid ++stacki writing -+ outside of the allocated space. Also enforce minimum > 0. -+ -- wad@google.com 14 Aug 2006 */ -+ if (stacki >= sizeof (stack) / sizeof (*stack) - 1) -+ internal_error (__FILE__, __LINE__, -+ _("location description stack too deep: %d"), -+ stacki); -+ if (stacki <= 0) -+ internal_error (__FILE__, __LINE__, -+ _("location description stack too shallow")); - } - return (stack[stacki]); - } -- cgit v1.2.3 From 17d149e8b24ae4fd651de06438373779224692f1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Wed, 28 Oct 2009 18:34:49 +0100 Subject: debug/gdb: add latest version 7.0 --- config/debug/gdb.in | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config/debug') diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 4914e908..1a4bc602 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -99,6 +99,11 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW +config GDB_V_7_0 + bool + prompt "7.0 (EXPERIMENTAL)" + depends on EXPERIMENTAL + config GDB_V_6_8 bool prompt "6.8" @@ -115,6 +120,7 @@ config GDB_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "7.0" if GDB_V_7_0 default "6.8" if GDB_V_6_8 default "snapshot" if GDB_V_snapshot -- cgit v1.2.3 From 4ae5060ec81b4d4673a4091acd00e16edf16007e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Wed, 28 Oct 2009 19:00:34 +0100 Subject: debug/strace: add latest version, unmarkprevious EXPERIMENTAL Also propagate the patchset from 4.5.18 to 4.5.19. --- config/debug/strace.in | 9 ++- patches/strace/4.5.19/100-autoreconf.patch | 77 ++++++++++++++++++++++ .../strace/4.5.19/110-fix-arm-bad-syscall.patch | 19 ++++++ .../120-fix-disabled-largefile-syscalls.patch | 22 +++++++ patches/strace/4.5.19/130-statfs64-check.patch | 53 +++++++++++++++ patches/strace/4.5.19/140-undef-CTL_PROC.patch | 13 ++++ patches/strace/4.5.19/150-undef-syscall.patch | 42 ++++++++++++ 7 files changed, 233 insertions(+), 2 deletions(-) create mode 100644 patches/strace/4.5.19/100-autoreconf.patch create mode 100644 patches/strace/4.5.19/110-fix-arm-bad-syscall.patch create mode 100644 patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch create mode 100644 patches/strace/4.5.19/130-statfs64-check.patch create mode 100644 patches/strace/4.5.19/140-undef-CTL_PROC.patch create mode 100644 patches/strace/4.5.19/150-undef-syscall.patch (limited to 'config/debug') diff --git a/config/debug/strace.in b/config/debug/strace.in index 8f6ce0de..4fc58462 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -8,11 +8,15 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW -config STRACE_V_4_5_18 +config STRACE_V_4_5_19 bool - prompt "4.5.18 (EXPERIMENTAL)" + prompt "4.5.19 (EXPERIMENTAL)" depends on EXPERIMENTAL +config STRACE_V_4_5_18 + bool + prompt "4.5.18" + config STRACE_V_4_5_17 bool prompt "4.5.17" @@ -31,6 +35,7 @@ config STRACE_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW + default "4.5.19" if STRACE_V_4_5_19 default "4.5.18" if STRACE_V_4_5_18 default "4.5.17" if STRACE_V_4_5_17 default "4.5.16" if STRACE_V_4_5_16 diff --git a/patches/strace/4.5.19/100-autoreconf.patch b/patches/strace/4.5.19/100-autoreconf.patch new file mode 100644 index 00000000..e7972db0 --- /dev/null +++ b/patches/strace/4.5.19/100-autoreconf.patch @@ -0,0 +1,77 @@ +diff -durN strace-4.5.19.orig/configure strace-4.5.19/configure +--- strace-4.5.19.orig/configure 2009-10-21 19:41:11.000000000 +0200 ++++ strace-4.5.19/configure 2009-10-28 18:47:18.000000000 +0100 +@@ -5773,6 +5773,73 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5 ++echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6 ++if test "${ac_cv_type_statfs64+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef LINUX ++#include ++#include ++#else ++#include ++#endif ++int ++main () ++{ ++struct statfs64 st; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_statfs64=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_type_statfs64=no ++fi ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5 ++echo "${ECHO_T}$ac_cv_type_statfs64" >&6 ++if test "$ac_cv_type_statfs64" = yes ++then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_STATFS64 1 ++_ACEOF ++ ++fi ++ + + int + main () diff --git a/patches/strace/4.5.19/110-fix-arm-bad-syscall.patch b/patches/strace/4.5.19/110-fix-arm-bad-syscall.patch new file mode 100644 index 00000000..97a60bac --- /dev/null +++ b/patches/strace/4.5.19/110-fix-arm-bad-syscall.patch @@ -0,0 +1,19 @@ +diff -durN strace-4.5.19.orig/syscall.c strace-4.5.19/syscall.c +--- strace-4.5.19.orig/syscall.c 2009-10-12 21:54:21.000000000 +0200 ++++ strace-4.5.19/syscall.c 2009-10-28 18:47:18.000000000 +0100 +@@ -1022,6 +1022,15 @@ + /* + * Note: we only deal with only 32-bit CPUs here. + */ ++ ++ if (!(tcp->flags & TCB_INSYSCALL) && ++ (tcp->flags & TCB_WAITEXECVE)) { ++ /* caught a fake syscall from the execve's exit */ ++ tcp->flags &= ~TCB_WAITEXECVE; ++ return 0; ++ } ++ ++ + if (regs.ARM_cpsr & 0x20) { + /* + * Get the Thumb-mode system call number diff --git a/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch b/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch new file mode 100644 index 00000000..a555fc24 --- /dev/null +++ b/patches/strace/4.5.19/120-fix-disabled-largefile-syscalls.patch @@ -0,0 +1,22 @@ +diff -durN strace-4.5.19.orig/syscall.c strace-4.5.19/syscall.c +--- strace-4.5.19.orig/syscall.c 2009-10-28 18:47:18.000000000 +0100 ++++ strace-4.5.19/syscall.c 2009-10-28 18:47:18.000000000 +0100 +@@ -110,6 +110,18 @@ + #define TP TRACE_PROCESS + #define TS TRACE_SIGNAL + ++#ifndef HAVE_STATFS64 ++/* ++ * Ugly hacks for systems that do not have LFS ++ */ ++ ++#define sys_truncate64 sys_truncate ++#define sys_ftruncate64 sys_ftruncate ++#define sys_getdents64 sys_getdents ++#define sys_statfs64 sys_statfs ++#define sys_fstatfs64 sys_fstatfs ++#endif ++ + static const struct sysent sysent0[] = { + #include "syscallent.h" + }; diff --git a/patches/strace/4.5.19/130-statfs64-check.patch b/patches/strace/4.5.19/130-statfs64-check.patch new file mode 100644 index 00000000..0959bddb --- /dev/null +++ b/patches/strace/4.5.19/130-statfs64-check.patch @@ -0,0 +1,53 @@ +diff -durN strace-4.5.19.orig/acinclude.m4 strace-4.5.19/acinclude.m4 +--- strace-4.5.19.orig/acinclude.m4 2004-04-14 04:45:53.000000000 +0200 ++++ strace-4.5.19/acinclude.m4 2009-10-28 18:47:18.000000000 +0100 +@@ -210,6 +210,26 @@ + fi + ]) + ++dnl ### A macro to determine whether statfs64 is defined. ++AC_DEFUN([AC_STATFS64], ++[AC_MSG_CHECKING(for statfs64 in sys/(statfs|vfs).h) ++AC_CACHE_VAL(ac_cv_type_statfs64, ++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX ++#include ++#include ++#else ++#include ++#endif]], [[struct statfs64 st;]])],[ac_cv_type_statfs64=yes],[ac_cv_type_statfs64=no])]) ++AC_MSG_RESULT($ac_cv_type_statfs64) ++if test "$ac_cv_type_statfs64" = yes ++then ++ AC_DEFINE([HAVE_STATFS64], 1, ++[Define if statfs64 is available in sys/statfs.h or sys/vfs.h.]) ++fi ++]) ++ ++ ++ + dnl ### A macro to determine if off_t is a long long + AC_DEFUN([AC_OFF_T_IS_LONG_LONG], + [AC_MSG_CHECKING(for long long off_t) +diff -durN strace-4.5.19.orig/configure.ac strace-4.5.19/configure.ac +--- strace-4.5.19.orig/configure.ac 2009-10-12 21:54:43.000000000 +0200 ++++ strace-4.5.19/configure.ac 2009-10-28 18:47:18.000000000 +0100 +@@ -187,6 +187,7 @@ + struct stat.st_level, + struct stat.st_rdev]) + AC_STAT64 ++AC_STATFS64 + + AC_TYPE_SIGNAL + AC_TYPE_UID_T +diff -durN strace-4.5.19.orig/file.c strace-4.5.19/file.c +--- strace-4.5.19.orig/file.c 2009-10-21 15:44:04.000000000 +0200 ++++ strace-4.5.19/file.c 2009-10-28 18:47:18.000000000 +0100 +@@ -1688,7 +1688,7 @@ + return 0; + } + +-#ifdef LINUX ++#ifdef HAVE_STATFS64 + static void + printstatfs64(struct tcb *tcp, long addr) + { diff --git a/patches/strace/4.5.19/140-undef-CTL_PROC.patch b/patches/strace/4.5.19/140-undef-CTL_PROC.patch new file mode 100644 index 00000000..8284335d --- /dev/null +++ b/patches/strace/4.5.19/140-undef-CTL_PROC.patch @@ -0,0 +1,13 @@ +diff -durN strace-4.5.19.orig/system.c strace-4.5.19/system.c +--- strace-4.5.19.orig/system.c 2009-06-01 11:59:11.000000000 +0200 ++++ strace-4.5.19/system.c 2009-10-28 18:47:18.000000000 +0100 +@@ -1654,7 +1654,9 @@ + { CTL_KERN, "CTL_KERN" }, + { CTL_VM, "CTL_VM" }, + { CTL_NET, "CTL_NET" }, ++#ifdef CTL_PROC + { CTL_PROC, "CTL_PROC" }, ++#endif + { CTL_FS, "CTL_FS" }, + { CTL_DEBUG, "CTL_DEBUG" }, + { CTL_DEV, "CTL_DEV" }, diff --git a/patches/strace/4.5.19/150-undef-syscall.patch b/patches/strace/4.5.19/150-undef-syscall.patch new file mode 100644 index 00000000..7d65e1d6 --- /dev/null +++ b/patches/strace/4.5.19/150-undef-syscall.patch @@ -0,0 +1,42 @@ +diff -durN strace-4.5.19.orig/linux/syscallent.h strace-4.5.19/linux/syscallent.h +--- strace-4.5.19.orig/linux/syscallent.h 2009-09-01 21:53:29.000000000 +0200 ++++ strace-4.5.19/linux/syscallent.h 2009-10-28 18:47:18.000000000 +0100 +@@ -130,7 +130,11 @@ + { 2, TF, sys_statfs, "statfs" }, /* 99 */ + { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */ + { 3, 0, sys_ioperm, "ioperm" }, /* 101 */ +- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */ ++ { 2, TD, sys_socketcall, "socketcall" ++#ifdef __NR_socketcall ++ , SYS_socketcall ++#endif ++ }, /* 102 */ + { 3, 0, sys_syslog, "syslog" }, /* 103 */ + { 3, 0, sys_setitimer, "setitimer" }, /* 104 */ + { 2, 0, sys_getitimer, "getitimer" }, /* 105 */ +@@ -145,7 +149,11 @@ + { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */ + { 1, 0, sys_swapoff, "swapoff" }, /* 115 */ + { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */ +- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */ ++ { 6, 0, sys_ipc, "ipc" ++#ifdef __NR_ipc ++ , SYS_ipc ++#endif ++ }, /* 117 */ + { 1, TD, sys_fsync, "fsync" }, /* 118 */ + { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */ + { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */ +@@ -282,7 +290,11 @@ + { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */ + { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */ + { 5, 0, printargs, "SYS_251" }, /* 251 */ +- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */ ++ { 1, TP, sys_exit, "exit_group" ++#ifdef __NR_exit_group ++ , __NR_exit_group ++#endif ++ }, /* 252 */ + { 4, 0, printargs, "lookup_dcookie"}, /* 253 */ + { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */ + { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */ -- cgit v1.2.3 From 0b6a9e5c74a9f0abfd00b67cf25d16990ceb38a8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Wed, 28 Oct 2009 19:15:50 +0100 Subject: config: mark now old versions as being OBSOLETE These versions are kept for the upcoming release, but they will be removed from the next release if they are not used. --- config/binutils/binutils.in | 6 ++++-- config/cc/gcc.in | 15 ++++++++++----- config/companion_libs/cloog.in | 9 ++++++--- config/companion_libs/gmp.in | 6 ++++-- config/companion_libs/mpc.in | 3 ++- config/companion_libs/mpfr.in | 6 ++++-- config/debug/duma.in | 12 ++++++++---- config/debug/gdb.in | 3 ++- config/debug/ltrace.in | 6 ++++-- config/debug/strace.in | 9 ++++++--- config/kernel/linux.in | 6 ++++-- config/libc/eglibc.in | 12 ++++++++---- config/libc/glibc.in | 15 ++++++++++----- config/libc/uClibc.in | 6 ++++-- config/tools/libelf.in | 3 ++- config/tools/sstrip.in | 3 ++- 16 files changed, 80 insertions(+), 40 deletions(-) (limited to 'config/debug') diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index f6e09f7c..11b09c70 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -26,11 +26,13 @@ config BINUTILS_V_2_18 config BINUTILS_V_2_17 bool - prompt "2.17" + prompt "2.17 (OBSOLETE)" + depends on OBSOLETE config BINUTILS_V_2_16_1 bool - prompt "2.16.1" + prompt "2.16.1 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/cc/gcc.in b/config/cc/gcc.in index a3c3eed2..e935a8b0 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -72,7 +72,8 @@ config CC_V_4_2_4 config CC_V_4_2_3 bool - prompt "4.2.3" + prompt "4.2.3 (OBSOLETE)" + depends on OBSOLETE config CC_V_4_2_2 bool @@ -80,19 +81,23 @@ config CC_V_4_2_2 config CC_V_4_2_1 bool - prompt "4.2.1" + prompt "4.2.1 (OBSOLETE)" + depends on OBSOLETE config CC_V_4_2_0 bool - prompt "4.2.0" + prompt "4.2.0 (OBSOLETE)" + depends on OBSOLETE config CC_V_4_1_2 bool - prompt "4.1.2" + prompt "4.1.2 (OBSOLETE)" + depends on OBSOLETE config CC_V_4_0_4 bool - prompt "4.0.4" + prompt "4.0.4 (OBSOLETE)" + depends on OBSOLETE config CC_V_3_4_6 bool diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index 75ddb149..1786d81b 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -16,15 +16,18 @@ config CLOOG_V_0_15_6 config CLOOG_V_0_15_5 bool - prompt "0.15.5" + prompt "0.15.5 (OBSOLETE)" + depends on OBSOLETE config CLOOG_V_0_15_4 bool - prompt "0.15.4" + prompt "0.15.4 (OBSOLETE)" + depends on OBSOLETE config CLOOG_V_0_15_3 bool - prompt "0.15.3" + prompt "0.15.3 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in index 75628d9a..67024925 100644 --- a/config/companion_libs/gmp.in +++ b/config/companion_libs/gmp.in @@ -16,11 +16,13 @@ config GMP_V_4_3_0 config GMP_V_4_2_4 bool - prompt "4.2.4" + prompt "4.2.4 (OBSOLETE)" + depends on OBSOLETE config GMP_V_4_2_2 bool - prompt "4.2.2" + prompt "4.2.2 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in index 27e9b906..53182384 100644 --- a/config/companion_libs/mpc.in +++ b/config/companion_libs/mpc.in @@ -12,7 +12,8 @@ config MPC_V_0_7 config MPC_V_0_6 bool - prompt "0.6" + prompt "0.6 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in index 61f057a1..118e229d 100644 --- a/config/companion_libs/mpfr.in +++ b/config/companion_libs/mpfr.in @@ -16,11 +16,13 @@ config MPFR_V_2_4_0 config MPFR_V_2_3_2 bool - prompt "2.3.2" + prompt "2.3.2 (OBSOLETE)" + depends on OBSOLETE config MPFR_V_2_3_1 bool - prompt "2.3.1" + prompt "2.3.1 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/debug/duma.in b/config/debug/duma.in index 0afb5b8e..753a879d 100644 --- a/config/debug/duma.in +++ b/config/debug/duma.in @@ -29,19 +29,23 @@ config DUMA_V_2_5_15 config DUMA_V_2_5_14 bool - prompt "2_5_14" + prompt "2_5_14 (OBSOLETE)" + depends on OBSOLETE config DUMA_V_2_5_12 bool - prompt "2_5_12" + prompt "2_5_12 (OBSOLETE)" + depends on OBSOLETE config DUMA_V_2_5_8 bool - prompt "2_5_8" + prompt "2_5_8 (OBSOLETE)" + depends on OBSOLETE config DUMA_V_2_5_1 bool - prompt "2_5_1" + prompt "2_5_1 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 1a4bc602..ecda6c58 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -138,7 +138,8 @@ config NCURSES_V_5_7 config NCURSES_V_5_6 bool - prompt "5.6" + prompt "5.6 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in index 50d365d1..b119410f 100644 --- a/config/debug/ltrace.in +++ b/config/debug/ltrace.in @@ -25,11 +25,13 @@ config LTRACE_V_0_5_1 config LTRACE_V_0_5 bool - prompt "0.5" + prompt "0.5 (OBSOLETE)" + depends on OBSOLETE config LTRACE_V_0_4 bool - prompt "0.4" + prompt "0.4 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/debug/strace.in b/config/debug/strace.in index 4fc58462..0b9e4466 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -19,15 +19,18 @@ config STRACE_V_4_5_18 config STRACE_V_4_5_17 bool - prompt "4.5.17" + prompt "4.5.17 (OBSOLETE)" + depends on OBSOLETE config STRACE_V_4_5_16 bool - prompt "4.5.16" + prompt "4.5.16 (OBSOLETE)" + depends on OBSOLETE config STRACE_V_4_5_15 bool - prompt "4.5.15" + prompt "4.5.15 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/kernel/linux.in b/config/kernel/linux.in index 5235e2cb..9a388ee9 100644 --- a/config/kernel/linux.in +++ b/config/kernel/linux.in @@ -100,11 +100,13 @@ config KERNEL_V_2_6_30 config KERNEL_V_2_6_29_6 bool - prompt "2.6.29.6" + prompt "2.6.29.6 (OBSOLETE)" + depends on OBSOLETE config KERNEL_V_2_6_28_10 bool - prompt "2.6.28.10" + prompt "2.6.28.10 (OBSOLETE)" + depends on OBSOLETE config KERNEL_V_2_6_27_38 bool diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in index 877b6f37..f37ff89c 100644 --- a/config/libc/eglibc.in +++ b/config/libc/eglibc.in @@ -28,19 +28,23 @@ config EGLIBC_V_2_9 config EGLIBC_V_2_8 bool - prompt "2_8" + prompt "2_8 (OBSOLETE)" + depends on OBSOLETE config EGLIBC_V_2_7 bool - prompt "2_7" + prompt "2_7 (OBSOLETE)" + depends on OBSOLETE config EGLIBC_V_2_6 bool - prompt "2_6" + prompt "2_6 (OBSOLETE)" + depends on OBSOLETE config EGLIBC_V_2_5 bool - prompt "2_5" + prompt "2_5 (OBSOLETE)" + depends on OBSOLETE config EGLIBC_V_TRUNK bool diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 777657c2..ac57fa0a 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -26,23 +26,28 @@ config LIBC_V_2_8 config LIBC_V_2_7 bool - prompt "2.7" + prompt "2.7 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_6_1 bool - prompt "2.6.1" + prompt "2.6.1 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_6 bool - prompt "2.6" + prompt "2.6 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_5_1 bool - prompt "2.5.1" + prompt "2.5.1 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_5 bool - prompt "2.5" + prompt "2.5 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_3_6 bool diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index dcaace34..d38f83d3 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -26,11 +26,13 @@ config LIBC_V_0_9_30 config LIBC_V_0_9_29 bool - prompt "0.9.29" + prompt "0.9.29 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_0_9_28_3 bool - prompt "0.9.28.3" + prompt "0.9.28.3 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_snapshot bool diff --git a/config/tools/libelf.in b/config/tools/libelf.in index 10ed90c7..f195868e 100644 --- a/config/tools/libelf.in +++ b/config/tools/libelf.in @@ -21,7 +21,8 @@ config LIBELF_V_0_8_11 config LIBELF_V_0_8_10 bool - prompt "0.8.10" + prompt "0.8.10 (OBSOLETE)" + depends on OBSOLETE endchoice diff --git a/config/tools/sstrip.in b/config/tools/sstrip.in index 5abd0f36..975e74fc 100644 --- a/config/tools/sstrip.in +++ b/config/tools/sstrip.in @@ -19,7 +19,8 @@ config SSTRIP_BUILDROOT config SSTRIP_ELFKICKERS bool - prompt "ELFkickers" + prompt "ELFkickers (OBSOLETE)" + depends on OBSOLETE help The original, ageing version, of sstrip from ELFkickers. Fully functional, but not maintained anymore. -- cgit v1.2.3