From 45c459ecca16a30bf1749fa5dbadedfdb94d0949 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 17 Feb 2017 10:08:32 -0700 Subject: [PATCH] +- Fix FTBFS due to invalid code in ARM support (#1423913). --- ltrace-rh1423913.patch | 20 ++++++++++++++++++++ ltrace.spec | 9 ++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 ltrace-rh1423913.patch diff --git a/ltrace-rh1423913.patch b/ltrace-rh1423913.patch new file mode 100644 index 0000000..f328dd9 --- /dev/null +++ b/ltrace-rh1423913.patch @@ -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: diff --git a/ltrace.spec b/ltrace.spec index 212b881..836617a 100644 --- a/ltrace.spec +++ b/ltrace.spec @@ -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 - 0.7.91-22 +- Fix FTBFS due to invalid code in ARM support (#1423913). + * Fri Feb 10 2017 Fedora Release Engineering - 0.7.91-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild