summaryrefslogtreecommitdiff
path: root/patches/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2017-05-31 01:32:31 (GMT)
committerMax Filippov <jcmvbkbc@gmail.com>2017-05-31 09:12:53 (GMT)
commit314aed56b3f1044086bcad61f0064a6fc39e9d0d (patch)
tree762b173bcd80f301c416c2b13b1155aa043a742f /patches/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch
parent189423937f27186d89a4cccb197569b998e2866d (diff)
gcc: xtensa: backport fix for incorrect code generation
xtensa GCC incorrectly uses %ld/0x%lx format specifiers to output HOST_WIDE_INT values, which results in incorrect code generation by the compiler built for armhf host. The original issue: https://github.com/qca/open-ath9k-htc-firmware/issues/130 Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'patches/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch')
-rw-r--r--patches/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch73
1 files changed, 73 insertions, 0 deletions
diff --git a/patches/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch b/patches/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch
new file mode 100644
index 0000000..052ffc3
--- /dev/null
+++ b/patches/gcc/4.9.4/875-gcc-xtensa-fix-fprintf-format-specifiers.patch
@@ -0,0 +1,73 @@
+From 0f32ae7bc51725cd500e2877b571fd914d77852e Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Sun, 28 May 2017 19:56:56 -0700
+Subject: [PATCH] gcc: xtensa: fix fprintf format specifiers
+
+HOST_WIDE_INT may not be long as assumed in print_operand and
+xtensa_emit_call. Use HOST_WIDE_INT_PRINT_DEC/HOST_WIDE_INT_PRINT_HEX
+format strings instead of %ld/0x%lx. This fixes incorrect assembly code
+generation by the compiler running on armhf host.
+
+2017-05-28 Max Filippov <jcmvbkbc@gmail.com>
+gcc/
+ * config/xtensa/xtensa.c (xtensa_emit_call): Use
+ HOST_WIDE_INT_PRINT_HEX instead of 0x%lx format string.
+ (print_operand): Use HOST_WIDE_INT_PRINT_DEC instead of %ld
+ format string.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+ gcc/config/xtensa/xtensa.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
+index d8c8298..3c00961 100644
+--- a/gcc/config/xtensa/xtensa.c
++++ b/gcc/config/xtensa/xtensa.c
+@@ -1785,7 +1785,7 @@ xtensa_emit_call (int callop, rtx *operands)
+ rtx tgt = operands[callop];
+
+ if (GET_CODE (tgt) == CONST_INT)
+- sprintf (result, "call8\t0x%lx", INTVAL (tgt));
++ sprintf (result, "call8\t" HOST_WIDE_INT_PRINT_HEX, INTVAL (tgt));
+ else if (register_operand (tgt, VOIDmode))
+ sprintf (result, "callx8\t%%%d", callop);
+ else
+@@ -2360,14 +2360,14 @@ print_operand (FILE *file, rtx x, int letter)
+
+ case 'L':
+ if (GET_CODE (x) == CONST_INT)
+- fprintf (file, "%ld", (32 - INTVAL (x)) & 0x1f);
++ fprintf (file, HOST_WIDE_INT_PRINT_DEC, (32 - INTVAL (x)) & 0x1f);
+ else
+ output_operand_lossage ("invalid %%L value");
+ break;
+
+ case 'R':
+ if (GET_CODE (x) == CONST_INT)
+- fprintf (file, "%ld", INTVAL (x) & 0x1f);
++ fprintf (file, HOST_WIDE_INT_PRINT_DEC, INTVAL (x) & 0x1f);
+ else
+ output_operand_lossage ("invalid %%R value");
+ break;
+@@ -2381,7 +2381,7 @@ print_operand (FILE *file, rtx x, int letter)
+
+ case 'd':
+ if (GET_CODE (x) == CONST_INT)
+- fprintf (file, "%ld", INTVAL (x));
++ fprintf (file, HOST_WIDE_INT_PRINT_DEC, INTVAL (x));
+ else
+ output_operand_lossage ("invalid %%d value");
+ break;
+@@ -2450,7 +2450,7 @@ print_operand (FILE *file, rtx x, int letter)
+ else if (GET_CODE (x) == MEM)
+ output_address (XEXP (x, 0));
+ else if (GET_CODE (x) == CONST_INT)
+- fprintf (file, "%ld", INTVAL (x));
++ fprintf (file, HOST_WIDE_INT_PRINT_DEC, INTVAL (x));
+ else
+ output_addr_const (file, x);
+ }
+--
+2.1.4
+