From bf4066870d1a42226e711c1e941f14733f648f6d Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 10 Jun 2009 02:01:06 +0000 Subject: system.h (HAVE_DESIGNATED_INITIALIZERS): Don't define if compiling with C++. * system.h (HAVE_DESIGNATED_INITIALIZERS): Don't define if compiling with C++. * optabs.c (optab_table): Only use designated initializers if HAVE_DESIGNATED_INITIALIZERS is defined. (convert_optab_table): Likewise. (init_optabs): Always call init_insn_codes if HAVE_DESIGNATED_INITIALIZERS is not defined. From-SVN: r148336 --- gcc/optabs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gcc/optabs.c') diff --git a/gcc/optabs.c b/gcc/optabs.c index 2b9da2cdb..257edd9e 100644 --- a/gcc/optabs.c +++ b/gcc/optabs.c @@ -54,7 +54,7 @@ along with GCC; see the file COPYING3. If not see See expr.h for documentation of these optabs. */ -#if GCC_VERSION >= 4000 +#if GCC_VERSION >= 4000 && HAVE_DESIGNATED_INITIALIZERS __extension__ struct optab_d optab_table[OTI_MAX] = { [0 ... OTI_MAX - 1].handlers[0 ... NUM_MACHINE_MODES - 1].insn_code = CODE_FOR_nothing }; @@ -66,7 +66,7 @@ struct optab_d optab_table[OTI_MAX]; rtx libfunc_table[LTI_MAX]; /* Tables of patterns for converting one mode to another. */ -#if GCC_VERSION >= 4000 +#if GCC_VERSION >= 4000 && HAVE_DESIGNATED_INITIALIZERS __extension__ struct convert_optab_d convert_optab_table[COI_MAX] = { [0 ... COI_MAX - 1].handlers[0 ... NUM_MACHINE_MODES - 1] [0 ... NUM_MACHINE_MODES - 1].insn_code @@ -6153,7 +6153,7 @@ init_optabs (void) vcondu_gen_code[i] = CODE_FOR_nothing; } -#if GCC_VERSION >= 4000 +#if GCC_VERSION >= 4000 && HAVE_DESIGNATED_INITIALIZERS /* We statically initialize the insn_codes with CODE_FOR_nothing. */ if (reinit) init_insn_codes (); -- cgit v1.1