[dyninst] check if R_PPC_NUM is defined before using it, similar to R_PPC64_NUM

Karsten Hopp karsten at fedoraproject.org
Wed Aug 15 13:19:15 UTC 2012


commit 98878d90598119a5aff80efd3bb35cc68234ec06
Author: Karsten Hopp <karsten at redhat.com>
Date:   Wed Aug 15 15:18:40 2012 +0200

    check if R_PPC_NUM is defined before using it, similar to R_PPC64_NUM

 dyninst-ppc.patch |   13 +++++++++++++
 dyninst.spec      |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/dyninst-ppc.patch b/dyninst-ppc.patch
new file mode 100644
index 0000000..c479ddb
--- /dev/null
+++ b/dyninst-ppc.patch
@@ -0,0 +1,13 @@
+diff -up dyninst-7.99/dyninst/symtabAPI/src/relocationEntry-elf-ppc32.C.ppc dyninst-7.99/dyninst/symtabAPI/src/relocationEntry-elf-ppc32.C
+--- dyninst-7.99/dyninst/symtabAPI/src/relocationEntry-elf-ppc32.C.ppc	2012-08-15 07:50:54.270065052 -0400
++++ dyninst-7.99/dyninst/symtabAPI/src/relocationEntry-elf-ppc32.C	2012-08-15 07:50:10.500111439 -0400
+@@ -101,7 +101,9 @@ const char* relocationEntry::relType2Str
+         CASE_RETURN_STR(R_PPC_GOT_DTPREL16_LO);
+         CASE_RETURN_STR(R_PPC_GOT_DTPREL16_HI);
+         CASE_RETURN_STR(R_PPC_GOT_DTPREL16_HA);
++#if defined(R_PPC_NUM)
+         CASE_RETURN_STR(R_PPC_NUM);
++#endif
+         CASE_RETURN_STR(R_PPC_EMB_NADDR32);
+         CASE_RETURN_STR(R_PPC_EMB_NADDR16);
+         CASE_RETURN_STR(R_PPC_EMB_NADDR16_LO);
diff --git a/dyninst.spec b/dyninst.spec
index c024094..969ffc0 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -4,7 +4,7 @@ Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
 Group: Development/Libraries
-Release: 0.23%{?dist}
+Release: 0.24%{?dist}
 URL: http://www.dyninst.org
 Version: %version
 Exclusiveos: linux
@@ -22,6 +22,7 @@ Source1: %{name}-docs-%{version}.tar.gz
 # Change version number so official dyninst 8.0 will replace it
 Patch3: dyninst-git.patch
 Patch5: dyninst-unused_vars.patch
+Patch6: dyninst-ppc.patch
 BuildRequires: libxml2-devel >= 2.7.8
 BuildRequires: libdwarf-devel 
 BuildRequires: elfutils-libelf-devel
@@ -70,6 +71,7 @@ the dyninst user-space libraries and interfaces.
 pushd dyninst
 %patch5 -p1 -b .unused
 popd
+%patch6 -p1 -b .ppc
 
 %build
 
@@ -136,6 +138,9 @@ chmod 644 %{buildroot}%{_libdir}/dyninst/*.a
 %{_libdir}/dyninst/*.a
 
 %changelog
+* Wed Aug 15 2012 Karsten Hopp <karsten at redhat.com> 7.99-0.24
+- check if R_PPC_NUM is defined before using it, similar to R_PPC64_NUM
+
 * Mon Jul 30 2012 Josh Stone <jistone at redhat.com> 7.99-0.23
 - Rebase on newer git tree.
 - Update license files with upstream additions.


More information about the scm-commits mailing list