From 7fffb15818b2f8448f879be66a1b0a09bce7e06cc3332de1e1a34c00254c55cc Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Mon, 10 Feb 2014 17:23:45 +0000 Subject: [PATCH] - Use patchlist.pl to merge with gdb-Fedora at e86a0cc13a5d91ba95242690237bb77511500897. - Don't apply patches gdb-rhel5-gcc44.patch, gdb-6.6-buildid-locate-rpm-scl.patch, gdb-readline62-ask-more-rh.patch, gdb-6.8-attach-signalled-detach-stopped.patch, gdb-6.8-quit-never-aborts.patch, gdb-rhel5-compat.patch; retained to have same structure as fedoras package. - Add gdb-testsuite-nohostid.patch (from fedora). - Remove gdb-fix-attach-signalled-detach-stopped.patch again (as base not applied), gdb-ppc-ptrace.diff (not applied since some time). OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=93 --- gdb-6.8-attach-signalled-detach-stopped.patch | 32 ++-- gdb-aarch64-hw-break.patch | 27 ---- gdb-fix-attach-signalled-detach-stopped.patch | 35 ----- gdb-libstdc++-v3-python-r155978.tar.bz2 | 4 +- gdb-ppc-ptrace.diff | 19 --- gdb-ppc64le.patch | 134 ++++++++--------- gdb-rhel5-compat.patch | 14 +- gdb-testsuite-nohostid.patch | 50 +++++++ gdb.changes | 16 ++ gdb.spec | 137 +++++++++--------- 10 files changed, 227 insertions(+), 241 deletions(-) delete mode 100644 gdb-aarch64-hw-break.patch delete mode 100644 gdb-fix-attach-signalled-detach-stopped.patch delete mode 100644 gdb-ppc-ptrace.diff create mode 100644 gdb-testsuite-nohostid.patch diff --git a/gdb-6.8-attach-signalled-detach-stopped.patch b/gdb-6.8-attach-signalled-detach-stopped.patch index d0e7391..b86306d 100644 --- a/gdb-6.8-attach-signalled-detach-stopped.patch +++ b/gdb-6.8-attach-signalled-detach-stopped.patch @@ -1,8 +1,8 @@ -Index: gdb-7.5.50.20130215/gdb/linux-nat.c +Index: gdb-7.7/gdb/linux-nat.c =================================================================== ---- gdb-7.5.50.20130215.orig/gdb/linux-nat.c 2013-02-15 22:38:05.000000000 +0100 -+++ gdb-7.5.50.20130215/gdb/linux-nat.c 2013-02-15 22:44:59.638985719 +0100 -@@ -181,6 +181,9 @@ blocked. */ +--- gdb-7.7.orig/gdb/linux-nat.c 2014-02-09 19:13:32.998214571 +0100 ++++ gdb-7.7/gdb/linux-nat.c 2014-02-09 19:17:37.561499606 +0100 +@@ -176,6 +176,9 @@ blocked. */ static struct target_ops *linux_ops; static struct target_ops linux_ops_saved; @@ -12,7 +12,7 @@ Index: gdb-7.5.50.20130215/gdb/linux-nat.c /* The method to call, if any, when a new thread is attached. */ static void (*linux_nat_new_thread) (struct lwp_info *); -@@ -914,7 +917,14 @@ holding the child stopped. Try \"set de +@@ -652,7 +655,14 @@ holding the child stopped. Try \"set de parent_inf->waiting_for_vfork_done = 0; } else if (detach_fork) @@ -28,25 +28,25 @@ Index: gdb-7.5.50.20130215/gdb/linux-nat.c /* Note that the detach above makes PARENT_INF dangling. */ -@@ -1362,6 +1372,7 @@ linux_nat_post_attach_wait (ptid_t ptid, +@@ -1099,6 +1109,7 @@ linux_nat_post_attach_wait (ptid_t ptid, if (debug_linux_nat) fprintf_unfiltered (gdb_stdlog, "LNPAW: Attaching to a stopped process\n"); -+ pid_was_stopped = GET_PID (ptid); ++ pid_was_stopped = ptid_get_pid (ptid); /* The process is definitely stopped. It is in a job control stop, unless the kernel predates the TASK_STOPPED / -@@ -1790,6 +1801,9 @@ get_pending_status (struct lwp_info *lp, +@@ -1518,6 +1529,9 @@ get_pending_status (struct lwp_info *lp, gdb_signal_to_string (signo)); } -+ if (*status == 0 && GET_PID (lp->ptid) == pid_was_stopped) ++ if (*status == 0 && ptid_get_pid (lp->ptid) == pid_was_stopped) + *status = W_STOPCODE (SIGSTOP); + return 0; } -@@ -1900,6 +1914,8 @@ linux_nat_detach (struct target_ops *ops +@@ -1631,6 +1645,8 @@ linux_nat_detach (struct target_ops *ops } else linux_ops->to_detach (ops, args, from_tty); @@ -55,7 +55,7 @@ Index: gdb-7.5.50.20130215/gdb/linux-nat.c } /* Resume LP. */ -@@ -2086,6 +2102,14 @@ linux_nat_resume (struct target_ops *ops +@@ -1813,6 +1829,14 @@ linux_nat_resume (struct target_ops *ops linux_nat_resume_callback. */ lp->stopped = 0; @@ -64,13 +64,13 @@ Index: gdb-7.5.50.20130215/gdb/linux-nat.c + it as stopped if the user detaches. PTID variable has PID set to LWP + while we need to check the real PID here. */ + -+ if (!step && lp && pid_was_stopped == GET_PID (lp->ptid)) ++ if (!step && lp && pid_was_stopped == ptid_get_pid (lp->ptid)) + pid_was_stopped = 0; + if (resume_many) iterate_over_lwps (ptid, linux_nat_resume_callback, NULL); -@@ -4137,6 +4161,8 @@ linux_nat_mourn_inferior (struct target_ +@@ -3864,6 +3888,8 @@ linux_nat_mourn_inferior (struct target_ /* Let the arch-specific native code know this process is gone. */ linux_nat_forget_process (pid); @@ -79,10 +79,10 @@ Index: gdb-7.5.50.20130215/gdb/linux-nat.c } /* Convert a native/host siginfo object, into/from the siginfo in the -Index: gdb-7.5.50.20130215/gdb/testsuite/gdb.threads/attach-stopped.exp +Index: gdb-7.7/gdb/testsuite/gdb.threads/attach-stopped.exp =================================================================== ---- gdb-7.5.50.20130215.orig/gdb/testsuite/gdb.threads/attach-stopped.exp 2013-01-01 07:41:27.000000000 +0100 -+++ gdb-7.5.50.20130215/gdb/testsuite/gdb.threads/attach-stopped.exp 2013-02-15 22:44:23.262930312 +0100 +--- gdb-7.7.orig/gdb/testsuite/gdb.threads/attach-stopped.exp 2014-01-08 10:23:36.000000000 +0100 ++++ gdb-7.7/gdb/testsuite/gdb.threads/attach-stopped.exp 2014-02-09 19:13:33.321214945 +0100 @@ -61,7 +61,65 @@ proc corefunc { threadtype } { gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} diff --git a/gdb-aarch64-hw-break.patch b/gdb-aarch64-hw-break.patch deleted file mode 100644 index 900a83f..0000000 --- a/gdb-aarch64-hw-break.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://permalink.gmane.org/gmane.comp.gdb.patches/88728 -http://permalink.gmane.org/gmane.comp.gdb.patches/90237 - -Index: gdb/aarch64-linux-nat.c -=================================================================== ---- gdb/aarch64-linux-nat.c.orig -+++ gdb/aarch64-linux-nat.c -@@ -312,6 +312,7 @@ aarch64_linux_set_debug_regs (const stru - const CORE_ADDR *addr; - const unsigned int *ctrl; - -+ memset (®s, 0, sizeof (regs)); - iov.iov_base = ®s; - iov.iov_len = sizeof (regs); - count = watchpoint ? aarch64_num_wp_regs : aarch64_num_bp_regs; -Index: gdb/gdbserver/linux-aarch64-low.c -=================================================================== ---- gdb/gdbserver/linux-aarch64-low.c.orig -+++ gdb/gdbserver/linux-aarch64-low.c -@@ -600,6 +600,7 @@ aarch64_linux_set_debug_regs (const stru - const CORE_ADDR *addr; - const unsigned int *ctrl; - -+ memset (®s, 0, sizeof (regs)); - iov.iov_base = ®s; - iov.iov_len = sizeof (regs); - count = watchpoint ? aarch64_num_wp_regs : aarch64_num_bp_regs; diff --git a/gdb-fix-attach-signalled-detach-stopped.patch b/gdb-fix-attach-signalled-detach-stopped.patch deleted file mode 100644 index 0d23c66..0000000 --- a/gdb-fix-attach-signalled-detach-stopped.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- gdb-7.7/gdb/linux-nat.c.orig 2014-02-09 18:34:49.586544659 +0100 -+++ gdb-7.7/gdb/linux-nat.c 2014-02-09 18:36:02.072396692 +0100 -@@ -1109,7 +1109,7 @@ linux_nat_post_attach_wait (ptid_t ptid, - if (debug_linux_nat) - fprintf_unfiltered (gdb_stdlog, - "LNPAW: Attaching to a stopped process\n"); -- pid_was_stopped = GET_PID (ptid); -+ pid_was_stopped = ptid_get_pid (ptid); - - /* The process is definitely stopped. It is in a job control - stop, unless the kernel predates the TASK_STOPPED / -@@ -1531,12 +1531,12 @@ get_pending_status (struct lwp_info *lp, - - /* Workaround RHEL-5 kernel which has unreliable PTRACE_DETACH, SIGSTOP (that - many TIDs are left unstopped). See RH Bug 496732. */ -- if (GET_PID (lp->ptid) == pid_was_stopped) -+ if (ptid_get_pid (lp->ptid) == pid_was_stopped) - { - int err; - - errno = 0; -- err = kill_lwp (GET_LWP (lp->ptid), SIGSTOP); -+ err = kill_lwp (ptid_get_lwp (lp->ptid), SIGSTOP); - if (debug_linux_nat) - { - fprintf_unfiltered (gdb_stdlog, -@@ -1848,7 +1848,7 @@ linux_nat_resume (struct target_ops *ops - it as stopped if the user detaches. PTID variable has PID set to LWP - while we need to check the real PID here. */ - -- if (!step && lp && pid_was_stopped == GET_PID (lp->ptid)) -+ if (!step && lp && pid_was_stopped == ptid_get_pid (lp->ptid)) - pid_was_stopped = 0; - - if (resume_many) diff --git a/gdb-libstdc++-v3-python-r155978.tar.bz2 b/gdb-libstdc++-v3-python-r155978.tar.bz2 index 3dd0860..a04f820 100644 --- a/gdb-libstdc++-v3-python-r155978.tar.bz2 +++ b/gdb-libstdc++-v3-python-r155978.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b475a3ef42507a47b1ea4b7f9a4849287b4c713e5081ec86874eaa7da194f78b -size 11754 +oid sha256:1877172a7efbf7540290471e64816c9549b24a65e825f0e1a725ac950b4e5029 +size 11744 diff --git a/gdb-ppc-ptrace.diff b/gdb-ppc-ptrace.diff deleted file mode 100644 index c6f1899..0000000 --- a/gdb-ppc-ptrace.diff +++ /dev/null @@ -1,19 +0,0 @@ -Index: gdb-7.4.50.20120603/gdb/ppc-linux-nat.c -=================================================================== ---- gdb-7.4.50.20120603.orig/gdb/ppc-linux-nat.c 2012-06-01 00:07:31.000000000 +0200 -+++ gdb-7.4.50.20120603/gdb/ppc-linux-nat.c 2012-06-12 15:17:59.537703950 +0200 -@@ -1418,8 +1418,12 @@ have_ptrace_booke_interface (void) - if (tid == 0) - tid = PIDGET (inferior_ptid); - -- /* Check for kernel support for BOOKE debug registers. */ -- if (ptrace (PPC_PTRACE_GETHWDBGINFO, tid, 0, &booke_debug_info) >= 0) -+ /* Check for kernel support for BOOKE debug registers. -+ As a workaround while the new ptrace interface is not accepted -+ in upstream kernel, server processors still should use the old -+ interface. */ -+ if (ptrace (PPC_PTRACE_GETHWDBGINFO, tid, 0, &booke_debug_info) >= 0 -+ && ppc_linux_get_hwcap () & PPC_FEATURE_BOOKE) - { - /* Check whether ptrace BOOKE interface is functional and - provides any supported feature. */ diff --git a/gdb-ppc64le.patch b/gdb-ppc64le.patch index e4ded33..7b86d38 100644 --- a/gdb-ppc64le.patch +++ b/gdb-ppc64le.patch @@ -1,7 +1,7 @@ -Index: gdb-7.6.50.20130731-cvs/gdb/auxv.c +Index: gdb-7.7/gdb/auxv.c =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/auxv.c -+++ gdb-7.6.50.20130731-cvs/gdb/auxv.c +--- gdb-7.7.orig/gdb/auxv.c 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/auxv.c 2014-02-10 18:07:42.000000000 +0100 @@ -442,6 +442,7 @@ fprint_target_auxv (struct ui_file *file TAG (AT_IGNOREPPC, _("Entry should be ignored"), dec); TAG (AT_BASE_PLATFORM, _("String identifying base platform"), str); @@ -10,11 +10,11 @@ Index: gdb-7.6.50.20130731-cvs/gdb/auxv.c TAG (AT_EXECFN, _("File name of executable"), str); TAG (AT_SECURE, _("Boolean, was exec setuid-like?"), dec); TAG (AT_SYSINFO, _("Special system info/entry points"), hex); -Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.c +Index: gdb-7.7/gdb/gdbarch.c =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/gdbarch.c -+++ gdb-7.6.50.20130731-cvs/gdb/gdbarch.c -@@ -200,6 +200,7 @@ struct gdbarch +--- gdb-7.7.orig/gdb/gdbarch.c 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/gdbarch.c 2014-02-10 18:07:42.000000000 +0100 +@@ -229,6 +229,7 @@ struct gdbarch gdbarch_return_in_first_hidden_param_p_ftype *return_in_first_hidden_param_p; gdbarch_skip_prologue_ftype *skip_prologue; gdbarch_skip_main_prologue_ftype *skip_main_prologue; @@ -22,7 +22,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.c gdbarch_inner_than_ftype *inner_than; gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc; gdbarch_remote_breakpoint_from_pc_ftype *remote_breakpoint_from_pc; -@@ -372,6 +373,7 @@ struct gdbarch startup_gdbarch = +@@ -402,6 +403,7 @@ struct gdbarch startup_gdbarch = default_return_in_first_hidden_param_p, /* return_in_first_hidden_param_p */ 0, /* skip_prologue */ 0, /* skip_main_prologue */ @@ -30,7 +30,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.c 0, /* inner_than */ 0, /* breakpoint_from_pc */ default_remote_breakpoint_from_pc, /* remote_breakpoint_from_pc */ -@@ -674,6 +676,7 @@ verify_gdbarch (struct gdbarch *gdbarch) +@@ -705,6 +707,7 @@ verify_gdbarch (struct gdbarch *gdbarch) if (gdbarch->skip_prologue == 0) fprintf_unfiltered (log, "\n\tskip_prologue"); /* Skip verify of skip_main_prologue, has predicate. */ @@ -38,7 +38,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.c if (gdbarch->inner_than == 0) fprintf_unfiltered (log, "\n\tinner_than"); if (gdbarch->breakpoint_from_pc == 0) -@@ -1294,6 +1297,12 @@ gdbarch_dump (struct gdbarch *gdbarch, s +@@ -1332,6 +1335,12 @@ gdbarch_dump (struct gdbarch *gdbarch, s "gdbarch_dump: single_step_through_delay = <%s>\n", host_address_to_string (gdbarch->single_step_through_delay)); fprintf_unfiltered (file, @@ -51,7 +51,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.c "gdbarch_dump: gdbarch_skip_main_prologue_p() = %d\n", gdbarch_skip_main_prologue_p (gdbarch)); fprintf_unfiltered (file, -@@ -2644,6 +2653,30 @@ set_gdbarch_skip_main_prologue (struct g +@@ -2682,6 +2691,30 @@ set_gdbarch_skip_main_prologue (struct g } int @@ -82,11 +82,11 @@ Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.c gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs) { gdb_assert (gdbarch != NULL); -Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.h +Index: gdb-7.7/gdb/gdbarch.h =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/gdbarch.h -+++ gdb-7.6.50.20130731-cvs/gdb/gdbarch.h -@@ -487,6 +487,12 @@ typedef CORE_ADDR (gdbarch_skip_main_pro +--- gdb-7.7.orig/gdb/gdbarch.h 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/gdbarch.h 2014-02-10 18:07:42.000000000 +0100 +@@ -486,6 +486,12 @@ typedef CORE_ADDR (gdbarch_skip_main_pro extern CORE_ADDR gdbarch_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR ip); extern void set_gdbarch_skip_main_prologue (struct gdbarch *gdbarch, gdbarch_skip_main_prologue_ftype *skip_main_prologue); @@ -99,11 +99,11 @@ Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.h typedef int (gdbarch_inner_than_ftype) (CORE_ADDR lhs, CORE_ADDR rhs); extern int gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs); extern void set_gdbarch_inner_than (struct gdbarch *gdbarch, gdbarch_inner_than_ftype *inner_than); -Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.sh +Index: gdb-7.7/gdb/gdbarch.sh =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/gdbarch.sh -+++ gdb-7.6.50.20130731-cvs/gdb/gdbarch.sh -@@ -527,6 +527,7 @@ m:int:return_in_first_hidden_param_p:str +--- gdb-7.7.orig/gdb/gdbarch.sh 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/gdbarch.sh 2014-02-10 18:07:42.000000000 +0100 +@@ -530,6 +530,7 @@ m:int:return_in_first_hidden_param_p:str m:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0 M:CORE_ADDR:skip_main_prologue:CORE_ADDR ip:ip @@ -111,11 +111,11 @@ Index: gdb-7.6.50.20130731-cvs/gdb/gdbarch.sh f:int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs:0:0 m:const gdb_byte *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0: # Return the adjusted address and kind to use for Z0/Z1 packets. -Index: gdb-7.6.50.20130731-cvs/gdb/infrun.c +Index: gdb-7.7/gdb/infrun.c =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/infrun.c -+++ gdb-7.6.50.20130731-cvs/gdb/infrun.c -@@ -3151,6 +3151,10 @@ fill_in_stop_func (struct gdbarch *gdbar +--- gdb-7.7.orig/gdb/infrun.c 2014-02-10 18:07:40.000000000 +0100 ++++ gdb-7.7/gdb/infrun.c 2014-02-10 18:07:42.000000000 +0100 +@@ -3170,6 +3170,10 @@ fill_in_stop_func (struct gdbarch *gdbar ecs->stop_func_start += gdbarch_deprecated_function_start_offset (gdbarch); @@ -126,10 +126,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/infrun.c ecs->stop_func_filled_in = 1; } } -Index: gdb-7.6.50.20130731-cvs/gdb/ppc-linux-tdep.c +Index: gdb-7.7/gdb/ppc-linux-tdep.c =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/ppc-linux-tdep.c -+++ gdb-7.6.50.20130731-cvs/gdb/ppc-linux-tdep.c +--- gdb-7.7.orig/gdb/ppc-linux-tdep.c 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/ppc-linux-tdep.c 2014-02-10 18:07:42.000000000 +0100 @@ -44,6 +44,7 @@ #include "observer.h" #include "auxv.h" @@ -182,7 +182,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/ppc-linux-tdep.c /* Implementation of `gdbarch_stap_is_single_operand', as defined in gdbarch.h. */ -@@ -1332,13 +1370,23 @@ ppc_linux_init_abi (struct gdbarch_info +@@ -1339,13 +1377,23 @@ ppc_linux_init_abi (struct gdbarch_info if (tdep->wordsize == 8) { @@ -212,10 +212,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/ppc-linux-tdep.c /* Shared library handling. */ set_gdbarch_skip_trampoline_code (gdbarch, ppc64_skip_trampoline_code); -Index: gdb-7.6.50.20130731-cvs/gdb/ppc-sysv-tdep.c +Index: gdb-7.7/gdb/ppc-sysv-tdep.c =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/ppc-sysv-tdep.c -+++ gdb-7.6.50.20130731-cvs/gdb/ppc-sysv-tdep.c +--- gdb-7.7.orig/gdb/ppc-sysv-tdep.c 2014-02-10 18:07:42.000000000 +0100 ++++ gdb-7.7/gdb/ppc-sysv-tdep.c 2014-02-10 18:07:42.000000000 +0100 @@ -610,42 +610,48 @@ ppc_sysv_abi_push_dummy_call (struct gdb } @@ -913,10 +913,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/ppc-sysv-tdep.c } return RETURN_VALUE_STRUCT_CONVENTION; } -Index: gdb-7.6.50.20130731-cvs/gdb/ppc-tdep.h +Index: gdb-7.7/gdb/ppc-tdep.h =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/ppc-tdep.h -+++ gdb-7.6.50.20130731-cvs/gdb/ppc-tdep.h +--- gdb-7.7.orig/gdb/ppc-tdep.h 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/ppc-tdep.h 2014-02-10 18:07:42.000000000 +0100 @@ -182,6 +182,15 @@ extern void ppc_collect_vsxregset (const /* Private data that this module attaches to struct gdbarch. */ @@ -942,10 +942,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/ppc-tdep.h /* How to pass vector arguments. Never set to AUTO or LAST. */ enum powerpc_vector_abi vector_abi; -Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c +Index: gdb-7.7/gdb/rs6000-tdep.c =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/rs6000-tdep.c -+++ gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c +--- gdb-7.7.orig/gdb/rs6000-tdep.c 2014-02-10 18:07:39.000000000 +0100 ++++ gdb-7.7/gdb/rs6000-tdep.c 2014-02-10 18:07:42.000000000 +0100 @@ -48,6 +48,7 @@ #include "elf-bfd.h" @@ -954,7 +954,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c #include "solib-svr4.h" #include "ppc-tdep.h" -@@ -2672,10 +2673,10 @@ dfp_pseudo_register_read (struct gdbarch +@@ -2723,10 +2724,10 @@ dfp_pseudo_register_read (struct gdbarch else { status = regcache_raw_read (regcache, tdep->ppc_fp0_regnum + @@ -967,7 +967,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c } return status; -@@ -2701,9 +2702,9 @@ dfp_pseudo_register_write (struct gdbarc +@@ -2752,9 +2753,9 @@ dfp_pseudo_register_write (struct gdbarc else { regcache_raw_write (regcache, tdep->ppc_fp0_regnum + @@ -979,7 +979,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c } } -@@ -2781,7 +2782,8 @@ efpr_pseudo_register_read (struct gdbarc +@@ -2832,7 +2833,8 @@ efpr_pseudo_register_read (struct gdbarc int reg_index = reg_nr - tdep->ppc_efpr0_regnum; /* Read the portion that overlaps the VMX register. */ @@ -989,7 +989,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c register_size (gdbarch, reg_nr), buffer); } -@@ -2794,7 +2796,8 @@ efpr_pseudo_register_write (struct gdbar +@@ -2845,7 +2847,8 @@ efpr_pseudo_register_write (struct gdbar int reg_index = reg_nr - tdep->ppc_efpr0_regnum; /* Write the portion that overlaps the VMX register. */ @@ -999,7 +999,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c register_size (gdbarch, reg_nr), buffer); } -@@ -3550,6 +3553,7 @@ rs6000_gdbarch_init (struct gdbarch_info +@@ -3601,6 +3604,7 @@ rs6000_gdbarch_init (struct gdbarch_info enum auto_boolean soft_float_flag = powerpc_soft_float_global; int soft_float; enum powerpc_vector_abi vector_abi = powerpc_vector_abi_global; @@ -1007,7 +1007,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c int have_fpu = 1, have_spe = 0, have_mq = 0, have_altivec = 0, have_dfp = 0, have_vsx = 0; int tdesc_wordsize = -1; -@@ -3856,6 +3860,21 @@ rs6000_gdbarch_init (struct gdbarch_info +@@ -3907,6 +3911,21 @@ rs6000_gdbarch_init (struct gdbarch_info } #ifdef HAVE_ELF @@ -1029,7 +1029,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c if (soft_float_flag == AUTO_BOOLEAN_AUTO && from_elf_exec) { switch (bfd_elf_get_obj_attr_int (info.abfd, OBJ_ATTR_GNU, -@@ -3892,6 +3911,15 @@ rs6000_gdbarch_init (struct gdbarch_info +@@ -3943,6 +3962,15 @@ rs6000_gdbarch_init (struct gdbarch_info } #endif @@ -1045,7 +1045,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c if (soft_float_flag == AUTO_BOOLEAN_TRUE) soft_float = 1; else if (soft_float_flag == AUTO_BOOLEAN_FALSE) -@@ -3934,6 +3962,8 @@ rs6000_gdbarch_init (struct gdbarch_info +@@ -3985,6 +4013,8 @@ rs6000_gdbarch_init (struct gdbarch_info meaningful, because 64-bit CPUs can run in 32-bit mode. So, perform separate word size check. */ tdep = gdbarch_tdep (arches->gdbarch); @@ -1054,7 +1054,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c if (tdep && tdep->soft_float != soft_float) continue; if (tdep && tdep->vector_abi != vector_abi) -@@ -3956,6 +3986,7 @@ rs6000_gdbarch_init (struct gdbarch_info +@@ -4007,6 +4037,7 @@ rs6000_gdbarch_init (struct gdbarch_info tdep = XCALLOC (1, struct gdbarch_tdep); tdep->wordsize = wordsize; @@ -1062,11 +1062,11 @@ Index: gdb-7.6.50.20130731-cvs/gdb/rs6000-tdep.c tdep->soft_float = soft_float; tdep->vector_abi = vector_abi; -Index: gdb-7.6.50.20130731-cvs/gdb/symtab.c +Index: gdb-7.7/gdb/symtab.c =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/symtab.c -+++ gdb-7.6.50.20130731-cvs/gdb/symtab.c -@@ -2882,6 +2882,8 @@ skip_prologue_sal (struct symtab_and_lin +--- gdb-7.7.orig/gdb/symtab.c 2014-02-10 18:07:39.000000000 +0100 ++++ gdb-7.7/gdb/symtab.c 2014-02-10 18:07:42.000000000 +0100 +@@ -2941,6 +2941,8 @@ skip_prologue_sal (struct symtab_and_lin /* Skip "first line" of function (which is actually its prologue). */ pc += gdbarch_deprecated_function_start_offset (gdbarch); @@ -1075,10 +1075,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/symtab.c if (skip) pc = gdbarch_skip_prologue (gdbarch, pc); -Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/altivec-regs.exp +Index: gdb-7.7/gdb/testsuite/gdb.arch/altivec-regs.exp =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/testsuite/gdb.arch/altivec-regs.exp -+++ gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/altivec-regs.exp +--- gdb-7.7.orig/gdb/testsuite/gdb.arch/altivec-regs.exp 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/testsuite/gdb.arch/altivec-regs.exp 2014-02-10 18:07:42.000000000 +0100 @@ -118,7 +118,7 @@ gdb_test "info reg vscr" "vscr.*0x1\t1" if {$endianness == "big"} { set decimal_vector ".uint128 = 0x00000001000000010000000100000001, v4_float = .1.*e-45, 1.*e-45, 1.*e-45, 1.*e-45., v4_int32 = .1, 1, 1, 1., v8_int16 = .0, 1, 0, 1, 0, 1, 0, 1., v16_int8 = .0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1.." @@ -1088,10 +1088,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/altivec-regs.exp } for {set i 0} {$i < 32} {incr i 1} { -Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp +Index: gdb-7.7/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp -+++ gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp +--- gdb-7.7.orig/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp 2014-02-10 18:07:42.000000000 +0100 @@ -20,7 +20,7 @@ # Testcase for ppc decimal128 pseudo-registers. @@ -1101,10 +1101,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp verbose "Skipping powerpc Decimal128 pseudo-registers testcase." return } -Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/vsx-regs.exp +Index: gdb-7.7/gdb/testsuite/gdb.arch/vsx-regs.exp =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/testsuite/gdb.arch/vsx-regs.exp -+++ gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/vsx-regs.exp +--- gdb-7.7.orig/gdb/testsuite/gdb.arch/vsx-regs.exp 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/testsuite/gdb.arch/vsx-regs.exp 2014-02-10 18:07:42.000000000 +0100 @@ -58,19 +58,46 @@ if ![runto_main] then { gdb_suppress_tests } @@ -1158,10 +1158,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/vsx-regs.exp set float_register ".raw 0xdeadbeefdeadbeef." -Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.base/sigbpt.exp +Index: gdb-7.7/gdb/testsuite/gdb.base/sigbpt.exp =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/testsuite/gdb.base/sigbpt.exp -+++ gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.base/sigbpt.exp +--- gdb-7.7.orig/gdb/testsuite/gdb.base/sigbpt.exp 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/gdb/testsuite/gdb.base/sigbpt.exp 2014-02-10 18:07:42.000000000 +0100 @@ -76,7 +76,7 @@ gdb_test "break keeper" set bowler_addrs bowler set segv_addr none @@ -1171,10 +1171,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.base/sigbpt.exp set test "stepping to fault" set signame "SIGSEGV" gdb_test_multiple "stepi" "$test" { -Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.base/step-bt.exp +Index: gdb-7.7/gdb/testsuite/gdb.base/step-bt.exp =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/gdb/testsuite/gdb.base/step-bt.exp -+++ gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.base/step-bt.exp +--- gdb-7.7.orig/gdb/testsuite/gdb.base/step-bt.exp 2014-01-08 10:23:36.000000000 +0100 ++++ gdb-7.7/gdb/testsuite/gdb.base/step-bt.exp 2014-02-10 18:07:42.000000000 +0100 @@ -24,7 +24,7 @@ if {[prepare_for_testing $testfile.exp $ return -1 } @@ -1184,10 +1184,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.base/step-bt.exp "Breakpoint.*at.* file .*$srcfile, line .*" \ "breakpoint at first instruction of hello()" -Index: gdb-7.6.50.20130731-cvs/include/elf/common.h +Index: gdb-7.7/include/elf/common.h =================================================================== ---- gdb-7.6.50.20130731-cvs.orig/include/elf/common.h -+++ gdb-7.6.50.20130731-cvs/include/elf/common.h +--- gdb-7.7.orig/include/elf/common.h 2014-02-06 03:21:29.000000000 +0100 ++++ gdb-7.7/include/elf/common.h 2014-02-10 18:07:42.000000000 +0100 @@ -959,6 +959,7 @@ #define AT_BASE_PLATFORM 24 /* String identifying real platform, may differ from AT_PLATFORM. */ diff --git a/gdb-rhel5-compat.patch b/gdb-rhel5-compat.patch index bbcadf3..0ee845e 100644 --- a/gdb-rhel5-compat.patch +++ b/gdb-rhel5-compat.patch @@ -1,21 +1,21 @@ -Index: gdb-7.4.50.20120602/gdb/linux-nat.c +Index: gdb-7.7/gdb/linux-nat.c =================================================================== ---- gdb-7.4.50.20120602.orig/gdb/linux-nat.c 2012-06-02 20:54:30.000000000 +0200 -+++ gdb-7.4.50.20120602/gdb/linux-nat.c 2012-06-02 20:56:03.966493352 +0200 -@@ -1816,8 +1816,22 @@ get_pending_status (struct lwp_info *lp, +--- gdb-7.7.orig/gdb/linux-nat.c 2014-02-09 19:18:24.048554459 +0100 ++++ gdb-7.7/gdb/linux-nat.c 2014-02-09 19:19:22.210622806 +0100 +@@ -1529,8 +1529,22 @@ get_pending_status (struct lwp_info *lp, gdb_signal_to_string (signo)); } -- if (*status == 0 && GET_PID (lp->ptid) == pid_was_stopped) +- if (*status == 0 && ptid_get_pid (lp->ptid) == pid_was_stopped) - *status = W_STOPCODE (SIGSTOP); + /* Workaround RHEL-5 kernel which has unreliable PTRACE_DETACH, SIGSTOP (that + many TIDs are left unstopped). See RH Bug 496732. */ -+ if (GET_PID (lp->ptid) == pid_was_stopped) ++ if (ptid_get_pid (lp->ptid) == pid_was_stopped) + { + int err; + + errno = 0; -+ err = kill_lwp (GET_LWP (lp->ptid), SIGSTOP); ++ err = kill_lwp (ptid_get_lwp (lp->ptid), SIGSTOP); + if (debug_linux_nat) + { + fprintf_unfiltered (gdb_stdlog, diff --git a/gdb-testsuite-nohostid.patch b/gdb-testsuite-nohostid.patch new file mode 100644 index 0000000..6e02a47 --- /dev/null +++ b/gdb-testsuite-nohostid.patch @@ -0,0 +1,50 @@ +http://sourceware.org/ml/gdb-patches/2014-02/msg00158.html +Subject: [patch] testsuite: Fix "ERROR: no fileid for" + + +--azLHFNyN32YCQGCU +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline + +Hi, + +a35cfb4007cee8cb84106412cd17f4e12f13345b is the first bad commit +commit a35cfb4007cee8cb84106412cd17f4e12f13345b +Author: Maciej W. Rozycki +Date: Thu Oct 24 23:32:30 2013 +0100 + +$ runtest gdb.base/solib-disc.exp +Running ./gdb.base/solib-disc.exp ... +ERROR: no fileid for host1 +[...] + + +Jan + +--azLHFNyN32YCQGCU +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline; filename="gdbfinish.patch" + +gdb/testsuite/ +2014-02-06 Jan Kratochvil + + Fix "ERROR: no fileid for" in the testsuite. + * lib/gdb.exp (gdb_finish): Check gdb_spawn_id. + +diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp +index 533b81b..5c53cdf 100644 +--- a/gdb/testsuite/lib/gdb.exp ++++ b/gdb/testsuite/lib/gdb.exp +@@ -3708,7 +3708,8 @@ proc gdb_finish { } { + global cleanfiles + + # Give persistent gdbserver a chance to terminate before GDB is killed. +- if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p} { ++ if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p ++ && [info exists gdb_spawn_id]} { + send_gdb "kill\n"; + gdb_expect 10 { + -re "y or n" { + +--azLHFNyN32YCQGCU-- + diff --git a/gdb.changes b/gdb.changes index a26a40f..3cb16b8 100644 --- a/gdb.changes +++ b/gdb.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Feb 10 17:19:07 UTC 2014 - matz@suse.de + +- Use patchlist.pl to merge with gdb-Fedora at + e86a0cc13a5d91ba95242690237bb77511500897. +- Don't apply patches gdb-rhel5-gcc44.patch, + gdb-6.6-buildid-locate-rpm-scl.patch, + gdb-readline62-ask-more-rh.patch, + gdb-6.8-attach-signalled-detach-stopped.patch, + gdb-6.8-quit-never-aborts.patch, + gdb-rhel5-compat.patch; retained to have same structure as fedoras + package. +- Add gdb-testsuite-nohostid.patch (from fedora). +- Remove gdb-fix-attach-signalled-detach-stopped.patch again + (as base not applied), gdb-ppc-ptrace.diff (not applied since some time). + ------------------------------------------------------------------- Sun Feb 9 15:44:04 UTC 2014 - burnus@net-b.de diff --git a/gdb.spec b/gdb.spec index 9052c12..6474ee3 100644 --- a/gdb.spec +++ b/gdb.spec @@ -2,7 +2,7 @@ # spec file for package gdb # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2014 RedHat +# Copyright (c) 2012 RedHat # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,12 @@ # -Summary: A GNU source-level debugger for C, C++, Fortran, Go and other languages +Summary: A GNU source-level debugger for C, C++, Fortran and other languages License: GPL-3.0+ and GPL-3.0-with-GCC-exception and LGPL-2.1+ and LGPL-3.0+ Group: Development/Tools/Debuggers Name: gdb -# 6e5c95e6cf1e3c37bd3a822ca9e6721caab97a85 -#global snap 20140127 -# Freeze it when GDB gets branched -%global snapsrc 20140108 +%global snap 20130731 # See timestamp of source gnulib installed into gdb/gnulib/ . %global snapgnulib 20121213 Version: 7.7 @@ -61,6 +58,7 @@ Obsoletes: devtoolset-1.0-%{pkg_name} #push=Should be pushed upstream. #maybepush=Should be pushed upstream unless it got obsoleted there. #fedora=Should stay as a Fedora patch. +#ia64=Drop after RHEL-5 rebases and rebuilds are no longer meaningful. #fedoratest=Keep it in Fedora only as a regression test safety. #+ppc=Specific for ppc32/ppc64/ppc* #+work=Requires some nontrivial work. @@ -87,48 +85,48 @@ Source6: gdbtui #Fedora Packages begin Patch1: gdb-6.3-rh-testversion-20041202.patch Patch2: gdb-archer.patch -Patch3: gdb-6.3-rh-dummykfail-20041202.patch -Patch4: gdb-6.3-ppc64syscall-20040622.patch -Patch5: gdb-6.3-ppc64displaysymbol-20041124.patch -Patch6: gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch -Patch7: gdb-6.3-gstack-20050411.patch -Patch8: gdb-6.3-test-pie-20050107.patch -Patch9: gdb-6.3-test-self-20050110.patch -Patch10: gdb-6.3-test-dtorfix-20050121.patch -Patch11: gdb-6.3-test-movedir-20050125.patch -Patch12: gdb-6.3-threaded-watchpoints2-20050225.patch -Patch13: gdb-6.3-inferior-notification-20050721.patch -Patch14: gdb-6.3-inheritancetest-20050726.patch -Patch15: gdb-6.3-readnever-20050907.patch -Patch16: gdb-6.5-bz203661-emit-relocs.patch -Patch17: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch -Patch18: gdb-6.5-sharedlibrary-path.patch -Patch19: gdb-6.5-bz190810-gdbserver-arch-advice.patch -Patch20: gdb-6.5-BEA-testsuite.patch -Patch21: gdb-6.5-last-address-space-byte-test.patch -Patch22: gdb-6.5-readline-long-line-crash-test.patch -Patch23: gdb-6.5-bz216711-clone-is-outermost.patch -Patch24: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch -Patch25: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch -Patch26: gdb-6.5-bz109921-DW_AT_decl_file-test.patch -Patch27: gdb-6.3-bz140532-ppc-unwinding-test.patch -Patch28: gdb-6.3-bz202689-exec-from-pthread-test.patch -Patch29: gdb-6.6-bz230000-power6-disassembly-test.patch -Patch30: gdb-6.3-bz231832-obstack-2gb.patch -Patch31: gdb-6.6-bz229517-gcore-without-terminal.patch -Patch32: gdb-6.6-bz235197-fork-detach-info.patch -Patch33: gdb-6.6-testsuite-timeouts.patch -Patch34: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch -Patch35: gdb-6.6-scheduler_locking-step-is-default.patch -Patch36: gdb-6.3-attach-see-vdso-test.patch -Patch37: gdb-6.5-bz243845-stale-testing-zombie-test.patch -Patch38: gdb-6.6-buildid-locate.patch -Patch39: gdb-6.6-buildid-locate-solib-missing-ids.patch -Patch40: gdb-6.6-buildid-locate-rpm.patch -Patch41: gdb-6.6-bfd-vdso8k.patch -Patch42: gdb-6.7-charsign-test.patch -Patch43: gdb-6.7-ppc-clobbered-registers-O2-test.patch -Patch44: gdb-upstream.patch +Patch3: gdb-upstream.patch +Patch4: gdb-6.3-rh-dummykfail-20041202.patch +Patch5: gdb-6.3-ppc64syscall-20040622.patch +Patch6: gdb-6.3-ppc64displaysymbol-20041124.patch +Patch7: gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch +Patch8: gdb-6.3-gstack-20050411.patch +Patch9: gdb-6.3-test-pie-20050107.patch +Patch10: gdb-6.3-test-self-20050110.patch +Patch11: gdb-6.3-test-dtorfix-20050121.patch +Patch12: gdb-6.3-test-movedir-20050125.patch +Patch13: gdb-6.3-threaded-watchpoints2-20050225.patch +Patch14: gdb-6.3-inferior-notification-20050721.patch +Patch15: gdb-6.3-inheritancetest-20050726.patch +Patch16: gdb-6.3-readnever-20050907.patch +Patch17: gdb-6.5-bz203661-emit-relocs.patch +Patch18: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch +Patch19: gdb-6.5-sharedlibrary-path.patch +Patch20: gdb-6.5-bz190810-gdbserver-arch-advice.patch +Patch21: gdb-6.5-BEA-testsuite.patch +Patch22: gdb-6.5-last-address-space-byte-test.patch +Patch23: gdb-6.5-readline-long-line-crash-test.patch +Patch24: gdb-6.5-bz216711-clone-is-outermost.patch +Patch25: gdb-6.5-bz218379-ppc-solib-trampoline-test.patch +Patch26: gdb-6.5-bz218379-solib-trampoline-lookup-lock-fix.patch +Patch27: gdb-6.5-bz109921-DW_AT_decl_file-test.patch +Patch28: gdb-6.3-bz140532-ppc-unwinding-test.patch +Patch29: gdb-6.3-bz202689-exec-from-pthread-test.patch +Patch30: gdb-6.6-bz230000-power6-disassembly-test.patch +Patch31: gdb-6.3-bz231832-obstack-2gb.patch +Patch32: gdb-6.6-bz229517-gcore-without-terminal.patch +Patch33: gdb-6.6-bz235197-fork-detach-info.patch +Patch34: gdb-6.6-testsuite-timeouts.patch +Patch35: gdb-6.6-bz237572-ppc-atomic-sequence-test.patch +Patch36: gdb-6.6-scheduler_locking-step-is-default.patch +Patch37: gdb-6.3-attach-see-vdso-test.patch +Patch38: gdb-6.5-bz243845-stale-testing-zombie-test.patch +Patch39: gdb-6.6-buildid-locate.patch +Patch40: gdb-6.6-buildid-locate-solib-missing-ids.patch +Patch41: gdb-6.6-buildid-locate-rpm.patch +Patch42: gdb-6.6-bfd-vdso8k.patch +Patch43: gdb-6.7-charsign-test.patch +Patch44: gdb-6.7-ppc-clobbered-registers-O2-test.patch Patch45: gdb-6.5-ia64-libunwind-leak-test.patch Patch46: gdb-6.5-missed-trap-on-step-test.patch Patch47: gdb-6.7-bz426600-DW_TAG_interface_type-test.patch @@ -183,17 +181,17 @@ Patch95: gdb-rhbz795424-bitpos-25of25-test.patch Patch96: gdb-rhbz795424-bitpos-lazyvalue.patch Patch97: gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch Patch98: gdb-enable-count-crash.patch -Patch99: gdb-rhel5-gcc44.patch -Patch100: gdb-6.6-buildid-locate-rpm-scl.patch -Patch101: gdb-readline62-ask-more-rh.patch -Patch102: gdb-6.8-attach-signalled-detach-stopped.patch -Patch103: gdb-6.8-quit-never-aborts.patch -Patch104: gdb-rhel5-compat.patch -Patch105: gdb-python-stacksmash.patch +Patch99: gdb-testsuite-nohostid.patch +Patch100: gdb-python-stacksmash.patch +Patch101: gdb-rhel5-gcc44.patch +Patch102: gdb-6.6-buildid-locate-rpm-scl.patch +Patch103: gdb-readline62-ask-more-rh.patch +Patch104: gdb-6.8-attach-signalled-detach-stopped.patch +Patch105: gdb-6.8-quit-never-aborts.patch +Patch106: gdb-rhel5-compat.patch #Fedora Packages end # Upstream patch to fix gcc -Werror -Patch1001: gdb-fix-attach-signalled-detach-stopped.patch Patch1002: gdb-6.6-buildid-locate-rpm-suse.patch Patch1004: gdb-ia64-tdep.patch Patch1006: gdb-ppc64le.patch @@ -425,17 +423,21 @@ find -name "*.info*"|xargs rm -f %patch97 -p1 %patch98 -p1 %patch99 -p1 -#%%patch100 -p1 -#%%patch100 -p1 -R +%patch100 -p1 #%%patch101 -p1 #%%patch101 -p1 -R -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 +#%%patch102 -p1 +#%%patch102 -p1 -R +#%%patch103 -p1 +#%%patch103 -p1 -R +#%%patch104 -p1 +#%%patch104 -p1 -R +#%%patch105 -p1 +#%%patch105 -p1 -R +#%%patch106 -p1 +#%%patch106 -p1 -R #Fedora patching end -%patch1001 -p1 %patch1002 -p1 %patch1004 -p1 %patch1006 -p1 @@ -465,8 +467,7 @@ do mkdir %{gdb_build}$fprofile cd %{gdb_build}$fprofile -export CFLAGS="$RPM_OPT_FLAGS %{?_with_asan:-fsanitize=address}" -export LDFLAGS="%{?__global_ldflags} %{?_with_asan:-fsanitize=address}" +export CFLAGS="$RPM_OPT_FLAGS" export LIBRPM=no if test -f /usr/%{_lib}/librpm.so.1; then export LIBRPM=librpm.so.1 @@ -852,13 +853,11 @@ fi %defattr(-,root,root) %doc COPYING3 COPYING COPYING.LIB README NEWS %{_bindir}/gcore +%{_mandir}/*/gcore.1* %{_bindir}/gdb %config(noreplace) %{_sysconfdir}/gdbinit %{_sysconfdir}/gdbinit.d -%{_mandir}/*/gdbinit.5* %{_mandir}/*/gdb.1* -%{_mandir}/*/gcore.1* -%{_mandir}/*/gdb-add-index.1* %{_bindir}/gstack %{_mandir}/*/gstack.1* # Provide gdbtui for RHEL-5 and RHEL-6 as it is removed upstream (BZ 797664). @@ -867,6 +866,8 @@ fi %{_mandir}/*/gdbtui.1* %endif # 0%{?rhel:1} && 0%{?rhel} <= 6 %{_bindir}/gdb-add-index +%{_mandir}/*/gdb-add-index.1* +%{_mandir}/*/gdbinit.5* %{_datadir}/gdb %{_infodir}/annotate.info* %{_infodir}/gdb.info*