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

This commit is contained in:
Karsten Hopp 2012-08-15 15:18:40 +02:00
parent 3ce3462a94
commit 98878d9059
2 changed files with 19 additions and 1 deletions

13
dyninst-ppc.patch Normal file
View File

@ -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);

View File

@ -4,7 +4,7 @@ Summary: An API for Run-time Code Generation
License: LGPLv2+ License: LGPLv2+
Name: dyninst Name: dyninst
Group: Development/Libraries Group: Development/Libraries
Release: 0.23%{?dist} Release: 0.24%{?dist}
URL: http://www.dyninst.org URL: http://www.dyninst.org
Version: %version Version: %version
Exclusiveos: linux Exclusiveos: linux
@ -22,6 +22,7 @@ Source1: %{name}-docs-%{version}.tar.gz
# Change version number so official dyninst 8.0 will replace it # Change version number so official dyninst 8.0 will replace it
Patch3: dyninst-git.patch Patch3: dyninst-git.patch
Patch5: dyninst-unused_vars.patch Patch5: dyninst-unused_vars.patch
Patch6: dyninst-ppc.patch
BuildRequires: libxml2-devel >= 2.7.8 BuildRequires: libxml2-devel >= 2.7.8
BuildRequires: libdwarf-devel BuildRequires: libdwarf-devel
BuildRequires: elfutils-libelf-devel BuildRequires: elfutils-libelf-devel
@ -70,6 +71,7 @@ the dyninst user-space libraries and interfaces.
pushd dyninst pushd dyninst
%patch5 -p1 -b .unused %patch5 -p1 -b .unused
popd popd
%patch6 -p1 -b .ppc
%build %build
@ -136,6 +138,9 @@ chmod 644 %{buildroot}%{_libdir}/dyninst/*.a
%{_libdir}/dyninst/*.a %{_libdir}/dyninst/*.a
%changelog %changelog
* Wed Aug 15 2012 Karsten Hopp <karsten@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@redhat.com> 7.99-0.23 * Mon Jul 30 2012 Josh Stone <jistone@redhat.com> 7.99-0.23
- Rebase on newer git tree. - Rebase on newer git tree.
- Update license files with upstream additions. - Update license files with upstream additions.