From c58e1ae81e8b0ff4cde498f74202c7d12dd70856 Mon Sep 17 00:00:00 2001 From: Jozef Lawrynowicz Date: Sat, 25 Aug 2018 11:52:15 +0000 Subject: [PATCH] backport: re PR target/86662 (msp430-elf segfault with -flto and -mlarge) Backport from mainline PR target/86662 * gcc/tree.c (build_common_tree_nodes): Initialize integer_types array with all enabled __intN types. * gcc/testsuite/gcc.target/msp430/pr86662.c: New test. From-SVN: r263852 --- gcc/ChangeLog | 9 +++++++++ gcc/testsuite/gcc.target/msp430/pr86662.c | 13 +++++++++++++ gcc/tree.c | 3 +-- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/msp430/pr86662.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 777b8628938c..8b0941a521f1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2018-08-25 Jozef Lawrynowicz + + Backport from mainline + PR target/86662 + * gcc/tree.c (build_common_tree_nodes): Initialize integer_types array + with all enabled __intN types. + + * gcc/testsuite/gcc.target/msp430/pr86662.c: New test. + 2018-08-21 H.J. Lu Backport from mainline diff --git a/gcc/testsuite/gcc.target/msp430/pr86662.c b/gcc/testsuite/gcc.target/msp430/pr86662.c new file mode 100644 index 000000000000..1144b3e83949 --- /dev/null +++ b/gcc/testsuite/gcc.target/msp430/pr86662.c @@ -0,0 +1,13 @@ +/* PR/86662 */ + +/* { dg-do link } */ +/* -nostdlib prevents link errors due to mismatched code models for + libgloss objects. */ +/* { dg-options "-mlarge -flto -nostdlib" } */ +/* { dg-skip-if "" { *-*-* } { "-mcpu=msp430" } } */ + +int main(void) +{ + __int20 n = 5; + return 0; +} diff --git a/gcc/tree.c b/gcc/tree.c index c28f87606aba..d00753482646 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -10309,8 +10309,7 @@ build_common_tree_nodes (bool signed_char) TYPE_SIZE (int_n_trees[i].signed_type) = bitsize_int (int_n_data[i].bitsize); TYPE_SIZE (int_n_trees[i].unsigned_type) = bitsize_int (int_n_data[i].bitsize); - if (int_n_data[i].bitsize > LONG_LONG_TYPE_SIZE - && int_n_enabled_p[i]) + if (int_n_enabled_p[i]) { integer_types[itk_intN_0 + i * 2] = int_n_trees[i].signed_type; integer_types[itk_unsigned_intN_0 + i * 2] = int_n_trees[i].unsigned_type; -- 2.47.2