diff --git a/gdb-6.3-rh-testlibunwind-20041202.patch b/gdb-6.3-rh-testlibunwind-20041202.patch index 5c23804..0a121c3 100644 --- a/gdb-6.3-rh-testlibunwind-20041202.patch +++ b/gdb-6.3-rh-testlibunwind-20041202.patch @@ -3,11 +3,53 @@ From Jeff Johnston * gdb.arch/ia64-libunwind.exp: New file. * gdb.arch/ia64-libunwind.c: New file. + +2004-08-03 Jeff Johnston + + * gdb.arch/ia64-libunwind.exp: Fix test string to match + current code base. + + [ acquire_unwind_info -> ia64_find_proc_info_x ] + +2009-04-30 Jan Kratochvil + + Remove a race from send_gdb "COMMAND\n". + Cleanup. + Merge in: Patch4: gdb-6.3-rh-testlibunwind1fix-20041202.patch ---- /dev/null Thu Apr 11 10:25:15 2002 -+++ gdb+dejagnu-20040223/gdb/testsuite/gdb.arch/ia64-libunwind.exp Mon Nov 17 15:57:04 2003 -@@ -0,0 +1,55 @@ -+# Copyright 2003 Free Software Foundation, Inc. +--- /dev/null 2009-04-19 08:52:54.499000000 +0200 ++++ gdb-6.8/gdb/testsuite/gdb.arch/ia64-libunwind.c 2009-04-30 19:15:16.000000000 +0200 +@@ -0,0 +1,26 @@ ++/* Copyright 2003, 2009 Free Software Foundation, Inc. ++ ++ This file is part of GDB. ++ ++ 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 3 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, see . */ ++ ++#include ++ ++int ++main () ++{ ++ printf ("hello world\n"); ++ ++ return 0; ++} +--- /dev/null 2009-04-19 08:52:54.499000000 +0200 ++++ gdb-6.8/gdb/testsuite/gdb.arch/ia64-libunwind.exp 2009-04-30 19:19:22.000000000 +0200 +@@ -0,0 +1,52 @@ ++# Copyright 2003, 2009 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 @@ -28,16 +70,6 @@ + +# This file was written by Jeff Johnston (jjohnstn@redhat.com) + -+if $tracelevel then { -+ strace $tracelevel -+} -+ -+# -+# test running programs -+# -+set prms_id 0 -+set bug_id 0 -+ +if ![istarget "ia64-*-*"] then { + return +} @@ -58,19 +90,14 @@ +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} -+send_gdb "set debug arch 1\n" -+send_gdb "break main\n" -+gdb_test "run" ".*acquire_unwind_info.*" -+ ---- /dev/null Thu Apr 11 10:25:15 2002 -+++ gdb+dejagnu-20040223/gdb/testsuite/gdb.arch/ia64-libunwind.c Mon Nov 17 15:58:27 2003 -@@ -0,0 +1,9 @@ -+#include + -+int main() -+{ -+ printf ("hello world\n"); -+ -+ return 0; ++gdb_test "set debug arch 1" ++gdb_breakpoint "main" ++gdb_run_cmd ++ ++set test "libunwind message" ++gdb_test_multiple "" $test { ++ -re "ia64_find_proc_info_x.*$gdb_prompt $" { ++ pass $test ++ } +} -+ diff --git a/gdb-6.3-rh-testlibunwind1fix-20041202.patch b/gdb-6.3-rh-testlibunwind1fix-20041202.patch deleted file mode 100644 index a30617c..0000000 --- a/gdb-6.3-rh-testlibunwind1fix-20041202.patch +++ /dev/null @@ -1,14 +0,0 @@ -2004-08-03 Jeff Johnston - - * gdb.arch/ia64-libunwind.exp: Fix test string to match - current code base. - ---- gdb+dejagnu-20040607/gdb/testsuite/gdb.arch/ia64-libunwind.exp.fix Tue Aug 3 18:29:22 2004 -+++ gdb+dejagnu-20040607/gdb/testsuite/gdb.arch/ia64-libunwind.exp Tue Aug 3 18:41:01 2004 -@@ -51,5 +51,5 @@ gdb_reinitialize_dir $srcdir/$subdir - gdb_load ${binfile} - send_gdb "set debug arch 1\n" - send_gdb "break main\n" --gdb_test "run" ".*acquire_unwind_info.*" -+gdb_test "run" ".*ia64_find_proc_info_x.*" - diff --git a/gdb.spec b/gdb.spec index bfa46a7..506839a 100644 --- a/gdb.spec +++ b/gdb.spec @@ -14,7 +14,7 @@ Version: 6.8.50.20090302 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 26%{?_with_upstream:.upstream}%{?dist} +Release: 27%{?_with_upstream:.upstream}%{?dist} License: GPLv3+ Group: Development/Debuggers @@ -62,7 +62,6 @@ Patch2: gdb-6.3-rh-testversion-20041202.patch # Check that libunwind works - new test then fix Patch3: gdb-6.3-rh-testlibunwind-20041202.patch -Patch4: gdb-6.3-rh-testlibunwind1fix-20041202.patch # Use convert_from_func_ptr_addr on the solib breakpoint address; # simplifies and makes more consistent the logic. @@ -473,7 +472,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c %patch349 -p1 %patch1 -p1 %patch3 -p1 -%patch4 -p1 %patch104 -p1 %patch105 -p1 @@ -872,6 +870,9 @@ fi %endif %changelog +* Thu Apr 30 2009 Jan Kratochvil - 6.8.50.20090302-27 +- Fix race in the ia64 testcase `gdb-6.3-rh-testlibunwind-20041202.patch'. + * Mon Apr 27 2009 Jan Kratochvil - 6.8.50.20090302-26 - Support a new rpmbuild option: --without python