From e9cf96da49faa7aa9ba98a09c438cf239dd46120 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 16 May 2010 18:30:11 +0000 Subject: [PATCH] - Make gdb-6.8-bz254229-gcore-prpsinfo.patch RHEL-5 /usr/bin/patch compatible (bugreported by Jonas Maebe). --- gdb-6.8-bz254229-gcore-prpsinfo.patch | 67 +++++++++++++++------------ gdb.spec | 6 ++- 2 files changed, 43 insertions(+), 30 deletions(-) diff --git a/gdb-6.8-bz254229-gcore-prpsinfo.patch b/gdb-6.8-bz254229-gcore-prpsinfo.patch index e0e68b8..249aa81 100644 --- a/gdb-6.8-bz254229-gcore-prpsinfo.patch +++ b/gdb-6.8-bz254229-gcore-prpsinfo.patch @@ -1,8 +1,8 @@ -Index: gdb-7.0.50.20100203/bfd/elf-bfd.h +Index: gdb-7.1/bfd/elf-bfd.h =================================================================== ---- gdb-7.0.50.20100203.orig/bfd/elf-bfd.h 2010-02-02 13:37:39.000000000 +0100 -+++ gdb-7.0.50.20100203/bfd/elf-bfd.h 2010-02-03 07:28:20.000000000 +0100 -@@ -2140,7 +2140,7 @@ extern Elf_Internal_Phdr * _bfd_elf_find +--- gdb-7.1.orig/bfd/elf-bfd.h 2010-02-09 13:14:42.000000000 +0100 ++++ gdb-7.1/bfd/elf-bfd.h 2010-05-16 20:22:38.000000000 +0200 +@@ -2160,7 +2160,7 @@ extern Elf_Internal_Phdr * _bfd_elf_find extern char *elfcore_write_note (bfd *, char *, int *, const char *, int, const void *, int); extern char *elfcore_write_prpsinfo @@ -11,11 +11,11 @@ Index: gdb-7.0.50.20100203/bfd/elf-bfd.h extern char *elfcore_write_prstatus (bfd *, char *, int *, long, int, const void *); extern char * elfcore_write_pstatus -Index: gdb-7.0.50.20100203/bfd/elf.c +Index: gdb-7.1/bfd/elf.c =================================================================== ---- gdb-7.0.50.20100203.orig/bfd/elf.c 2010-02-02 13:37:39.000000000 +0100 -+++ gdb-7.0.50.20100203/bfd/elf.c 2010-02-03 07:28:20.000000000 +0100 -@@ -8459,6 +8459,7 @@ char * +--- gdb-7.1.orig/bfd/elf.c 2010-02-18 01:09:06.000000000 +0100 ++++ gdb-7.1/bfd/elf.c 2010-05-16 20:25:15.000000000 +0200 +@@ -8545,6 +8545,7 @@ char * elfcore_write_prpsinfo (bfd *abfd, char *buf, int *bufsiz, @@ -23,7 +23,7 @@ Index: gdb-7.0.50.20100203/bfd/elf.c const char *fname, const char *psargs) { -@@ -8485,9 +8486,15 @@ elfcore_write_prpsinfo (bfd *abfd, +@@ -8571,26 +8572,40 @@ elfcore_write_prpsinfo (bfd *abfd, int note_type = NT_PRPSINFO; #endif @@ -42,7 +42,16 @@ Index: gdb-7.0.50.20100203/bfd/elf.c return elfcore_write_note (abfd, buf, bufsiz, note_name, note_type, &data, sizeof (data)); } -@@ -8502,9 +8509,15 @@ elfcore_write_prpsinfo (bfd *abfd, + else + #endif + { ++/* gdb-6.8-bz254229-gcore-prpsinfo.patch misapplication glue. */ + #if defined (HAVE_PSINFO_T) + psinfo_t data; ++/* gdb-6.8-bz254229-gcore-prpsinfo.patch misapplication glue. */ + int note_type = NT_PSINFO; + #else + prpsinfo_t data; int note_type = NT_PRPSINFO; #endif @@ -61,10 +70,10 @@ Index: gdb-7.0.50.20100203/bfd/elf.c return elfcore_write_note (abfd, buf, bufsiz, note_name, note_type, &data, sizeof (data)); } -Index: gdb-7.0.50.20100203/gdb/amd64-linux-nat.c +Index: gdb-7.1/gdb/amd64-linux-nat.c =================================================================== ---- gdb-7.0.50.20100203.orig/gdb/amd64-linux-nat.c 2010-02-03 07:28:20.000000000 +0100 -+++ gdb-7.0.50.20100203/gdb/amd64-linux-nat.c 2010-02-03 07:28:20.000000000 +0100 +--- gdb-7.1.orig/gdb/amd64-linux-nat.c 2010-05-16 20:22:38.000000000 +0200 ++++ gdb-7.1/gdb/amd64-linux-nat.c 2010-05-16 20:22:38.000000000 +0200 @@ -140,6 +140,7 @@ static int amd64_linux_gregset32_reg_off static char * @@ -98,10 +107,10 @@ Index: gdb-7.0.50.20100203/gdb/amd64-linux-nat.c } static void -Index: gdb-7.0.50.20100203/gdb/fbsd-nat.c +Index: gdb-7.1/gdb/fbsd-nat.c =================================================================== ---- gdb-7.0.50.20100203.orig/gdb/fbsd-nat.c 2010-01-01 08:31:31.000000000 +0100 -+++ gdb-7.0.50.20100203/gdb/fbsd-nat.c 2010-02-03 07:28:20.000000000 +0100 +--- gdb-7.1.orig/gdb/fbsd-nat.c 2010-01-01 08:31:31.000000000 +0100 ++++ gdb-7.1/gdb/fbsd-nat.c 2010-05-16 20:22:38.000000000 +0200 @@ -211,6 +211,7 @@ fbsd_make_corefile_notes (bfd *obfd, int psargs = reconcat (psargs, psargs, " ", get_inferior_args (), NULL); @@ -110,10 +119,10 @@ Index: gdb-7.0.50.20100203/gdb/fbsd-nat.c fname, psargs); } -Index: gdb-7.0.50.20100203/gdb/linux-nat.c +Index: gdb-7.1/gdb/linux-nat.c =================================================================== ---- gdb-7.0.50.20100203.orig/gdb/linux-nat.c 2010-02-03 07:28:20.000000000 +0100 -+++ gdb-7.0.50.20100203/gdb/linux-nat.c 2010-02-03 07:28:20.000000000 +0100 +--- gdb-7.1.orig/gdb/linux-nat.c 2010-05-16 20:22:38.000000000 +0200 ++++ gdb-7.1/gdb/linux-nat.c 2010-05-16 20:22:38.000000000 +0200 @@ -56,6 +56,7 @@ #include "terminal.h" #include @@ -131,7 +140,7 @@ Index: gdb-7.0.50.20100203/gdb/linux-nat.c char *(*linux_elfcore_write_prstatus) (bfd *, char *, int *, long, int, const void *) = elfcore_write_prstatus; static char * -@@ -4422,6 +4423,159 @@ linux_spu_make_corefile_notes (bfd *obfd +@@ -4507,6 +4508,159 @@ linux_spu_make_corefile_notes (bfd *obfd return args.note_data; } @@ -291,7 +300,7 @@ Index: gdb-7.0.50.20100203/gdb/linux-nat.c /* Fills the "to_make_corefile_note" target vector. Builds the note section for a corefile, and returns it in a malloc buffer. */ -@@ -4442,8 +4596,14 @@ linux_nat_make_corefile_notes (bfd *obfd +@@ -4527,8 +4681,14 @@ linux_nat_make_corefile_notes (bfd *obfd if (get_exec_file (0)) { @@ -306,7 +315,7 @@ Index: gdb-7.0.50.20100203/gdb/linux-nat.c if (get_inferior_args ()) { char *string_end; -@@ -4459,9 +4619,15 @@ linux_nat_make_corefile_notes (bfd *obfd +@@ -4544,9 +4704,15 @@ linux_nat_make_corefile_notes (bfd *obfd psargs_end - string_end); } } @@ -324,10 +333,10 @@ Index: gdb-7.0.50.20100203/gdb/linux-nat.c } /* Dump information for threads. */ -Index: gdb-7.0.50.20100203/gdb/linux-nat.h +Index: gdb-7.1/gdb/linux-nat.h =================================================================== ---- gdb-7.0.50.20100203.orig/gdb/linux-nat.h 2010-02-03 07:28:19.000000000 +0100 -+++ gdb-7.0.50.20100203/gdb/linux-nat.h 2010-02-03 07:28:20.000000000 +0100 +--- gdb-7.1.orig/gdb/linux-nat.h 2010-05-16 20:22:37.000000000 +0200 ++++ gdb-7.1/gdb/linux-nat.h 2010-05-16 20:22:38.000000000 +0200 @@ -173,7 +173,7 @@ int linux_nat_core_of_thread_1 (ptid_t p /* These functions make elfcore note sections. They may get overriden by code adjusting data for multi-target builds. */ @@ -337,11 +346,11 @@ Index: gdb-7.0.50.20100203/gdb/linux-nat.h extern char *(*linux_elfcore_write_prstatus) (bfd *, char *, int *, long, int, const void *); extern char *(*linux_elfcore_write_prfpreg) -Index: gdb-7.0.50.20100203/gdb/procfs.c +Index: gdb-7.1/gdb/procfs.c =================================================================== ---- gdb-7.0.50.20100203.orig/gdb/procfs.c 2010-01-28 09:19:29.000000000 +0100 -+++ gdb-7.0.50.20100203/gdb/procfs.c 2010-02-03 07:28:20.000000000 +0100 -@@ -6186,6 +6186,7 @@ procfs_make_note_section (bfd *obfd, int +--- gdb-7.1.orig/gdb/procfs.c 2010-02-15 18:35:49.000000000 +0100 ++++ gdb-7.1/gdb/procfs.c 2010-05-16 20:22:38.000000000 +0200 +@@ -6184,6 +6184,7 @@ procfs_make_note_section (bfd *obfd, int note_data = (char *) elfcore_write_prpsinfo (obfd, note_data, note_size, diff --git a/gdb.spec b/gdb.spec index 7cdfb9f..ae86126 100644 --- a/gdb.spec +++ b/gdb.spec @@ -36,7 +36,7 @@ Version: 7.1 # 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: 20%{?_with_upstream:.upstream}%{dist} +Release: 21%{?_with_upstream:.upstream}%{dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and GFDL and BSD and Public Domain Group: Development/Debuggers @@ -1087,6 +1087,10 @@ fi %endif %changelog +* Sun May 16 2010 Jan Kratochvil - 7.1-21.fc13 +- Make gdb-6.8-bz254229-gcore-prpsinfo.patch RHEL-5 /usr/bin/patch compatible + (bugreported by Jonas Maebe). + * Thu May 13 2010 Jan Kratochvil - 7.1-20.fc13 - Fix crash on VLA bound referencing an optimized-out variable (BZ 591879). - Re-enable the BZ 575292 and BZ 585445 C++ fix using an updated patch.