diff options
| author | Khem Raj <raj.khem@gmail.com> | 2017-04-23 22:20:43 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-26 20:13:29 +0200 |
| commit | 2f6193d78faf69aea4018e624a2402db615b11e7 (patch) | |
| tree | 2aac1fd9b1d13ad66f05c9eff2c96c2f30c21605 | |
| parent | 6723757dc4c2989482875ed6c93a997ecaefd600 (diff) | |
| download | meta-openembedded-2f6193d78faf69aea4018e624a2402db615b11e7.tar.gz | |
ltrace: Fix FTBFS due to invalid code in ARM support
Found with gcc7
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 3 |
2 files changed, 42 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch new file mode 100644 index 0000000000..4d0e0392f7 --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From 95ff340a74af16cca89fd5c5ca99890821053209 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 22 Apr 2017 00:47:16 -0700 | ||
| 4 | Subject: [PATCH] ARM code has unreachable code after switch statement move | ||
| 5 | initialization | ||
| 6 | |||
| 7 | Fixed | ||
| 8 | sysdeps/linux-gnu/arm/trace.c:173:33: error: statement will never be executed [-Werror=switch-unreachable] | ||
| 9 | uint32_t operand1, operand2, result = 0; | ||
| 10 | ^~~~~~ | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | sysdeps/linux-gnu/arm/trace.c | 3 ++- | ||
| 15 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c | ||
| 18 | index 5e51e91..f974d1f 100644 | ||
| 19 | --- a/sysdeps/linux-gnu/arm/trace.c | ||
| 20 | +++ b/sysdeps/linux-gnu/arm/trace.c | ||
| 21 | @@ -155,6 +155,8 @@ arm_get_next_pcs(struct process *proc, | ||
| 22 | const unsigned cond = BITS(this_instr, 28, 31); | ||
| 23 | const unsigned opcode = BITS(this_instr, 24, 27); | ||
| 24 | |||
| 25 | + uint32_t operand1, operand2, result = 0; | ||
| 26 | + | ||
| 27 | if (cond == COND_NV) | ||
| 28 | switch (opcode) { | ||
| 29 | arch_addr_t addr; | ||
| 30 | @@ -170,7 +172,6 @@ arm_get_next_pcs(struct process *proc, | ||
| 31 | } | ||
| 32 | else | ||
| 33 | switch (opcode) { | ||
| 34 | - uint32_t operand1, operand2, result = 0; | ||
| 35 | case 0x0: | ||
| 36 | case 0x1: /* data processing */ | ||
| 37 | case 0x2: | ||
| 38 | -- | ||
| 39 | 2.12.2 | ||
| 40 | |||
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index a5960f5b0c..60af5425ea 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb | |||
| @@ -20,7 +20,8 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \ | |||
| 20 | file://0001-replace-readdir_r-with-readdir.patch \ | 20 | file://0001-replace-readdir_r-with-readdir.patch \ |
| 21 | file://0001-Use-correct-enum-type.patch \ | 21 | file://0001-Use-correct-enum-type.patch \ |
| 22 | file://0002-Fix-const-qualifier-error.patch \ | 22 | file://0002-Fix-const-qualifier-error.patch \ |
| 23 | " | 23 | file://0001-ARM-code-has-unreachable-code-after-switch-statement.patch \ |
| 24 | " | ||
| 24 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
| 25 | 26 | ||
| 26 | inherit autotools | 27 | inherit autotools |
