50c02bd72b
Two patches are removed, as they have been upstreamed: - 130-fix_build_with_gcc-6.patch (svn commit 233721, Git commit 8c3fa311caa86f61b4e28d1563d1110b44340fb2) - 920-libgcc-remove-unistd-header.patch (svn commit 226092, Git commit e940d7953f06af11d09229a29ecbcc1ba25b378d) All other patches have simply been refreshed, with no manual edit needed. A build+runtime test has been done with an ARM, Cortex-A8, EABIhf, musl configuration, booted under Qemu. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001
|
|
From: Max Filippov <jcmvbkbc@gmail.com>
|
|
Date: Fri, 10 Apr 2015 17:46:30 +0300
|
|
Subject: [PATCH] Fix PR target/65730
|
|
|
|
2015-05-20 Max Filippov <jcmvbkbc@gmail.com>
|
|
gcc/
|
|
* config/xtensa/xtensa.c (init_alignment_context): Replace MULT
|
|
by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT).
|
|
|
|
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
|
---
|
|
Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
|
|
Changes to ChangeLog are dropped.
|
|
|
|
gcc/config/xtensa/xtensa.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
Index: b/gcc/config/xtensa/xtensa.c
|
|
===================================================================
|
|
--- a/gcc/config/xtensa/xtensa.c
|
|
+++ b/gcc/config/xtensa/xtensa.c
|
|
@@ -1436,8 +1436,9 @@
|
|
if (ac->shift != NULL_RTX)
|
|
{
|
|
/* Shift is the byte count, but we need the bitcount. */
|
|
- ac->shift = expand_simple_binop (SImode, MULT, ac->shift,
|
|
- GEN_INT (BITS_PER_UNIT),
|
|
+ gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0);
|
|
+ ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift,
|
|
+ GEN_INT (exact_log2 (BITS_PER_UNIT)),
|
|
NULL_RTX, 1, OPTAB_DIRECT);
|
|
ac->modemask = expand_simple_binop (SImode, ASHIFT,
|
|
GEN_INT (GET_MODE_MASK (mode)),
|