+- Fix FTBFS due to invalid code in ARM support (#1423913).

This commit is contained in:
Jeff Law 2017-02-17 10:08:32 -07:00
parent f12c53f197
commit 45c459ecca
2 changed files with 28 additions and 1 deletions

20
ltrace-rh1423913.patch Normal file
View File

@ -0,0 +1,20 @@
diff -Nrup a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c
--- a/sysdeps/linux-gnu/arm/trace.c 2013-03-11 17:23:39.000000000 -0600
+++ b/sysdeps/linux-gnu/arm/trace.c 2017-02-17 09:39:42.233547101 -0700
@@ -155,6 +155,8 @@ arm_get_next_pcs(struct process *proc,
const unsigned cond = BITS(this_instr, 28, 31);
const unsigned opcode = BITS(this_instr, 24, 27);
+ uint32_t operand1, operand2, result = 0;
+
if (cond == COND_NV)
switch (opcode) {
arch_addr_t addr;
@@ -170,7 +172,6 @@ arm_get_next_pcs(struct process *proc,
}
else
switch (opcode) {
- uint32_t operand1, operand2, result = 0;
case 0x0:
case 0x1: /* data processing */
case 0x2:

View File

@ -1,7 +1,7 @@
Summary: Tracks runtime library calls from dynamically linked executables
Name: ltrace
Version: 0.7.91
Release: 21%{?dist}
Release: 22%{?dist}
URL: http://ltrace.alioth.debian.org/
License: GPLv2+
Group: Development/Debuggers
@ -100,6 +100,9 @@ Patch25: ltrace-rh1307754.patch
# GCC now warns (errors) on "tautological compares", and readdir_r is deprecated.
Patch26: ltrace-0.7.91-tautology.patch
# ARM code has unreachable code after switch statement, move initialization
Patch27: ltrace-rh1423913.patch
%description
Ltrace is a debugging program which runs a specified command until the
command exits. While the command is executing, ltrace intercepts and
@ -138,6 +141,7 @@ execution of processes.
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%build
autoreconf -i
@ -163,6 +167,9 @@ echo ====================TESTING END=====================
%{_datadir}/ltrace
%changelog
* Fri Feb 17 2017 Jeff Law <law@redhat.com.org> - 0.7.91-22
- Fix FTBFS due to invalid code in ARM support (#1423913).
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.91-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild