From: Zack Weinberg Date: Tue, 8 Jan 2002 19:03:20 +0000 (+0000) Subject: Makefile.in (cs-tconfig.h): Don't depend on $(CONFIG_H) or except.h. X-Git-Tag: prereleases/libstdc++-3.0.96~596 X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=0d24f4d1314fbfc9a42fe7839179d20dc2e6b0dd;p=gcc.git Makefile.in (cs-tconfig.h): Don't depend on $(CONFIG_H) or except.h. * Makefile.in (cs-tconfig.h): Don't depend on $(CONFIG_H) or except.h. Remove commands to define USING_SJLJ_EXCEPTIONS. (cppinit.o): Depend on except.h. (gencheck.h, options.h, specs.h, s-gencheck, s-options, s-specs): New rules. * configure.in: Don't AC_DEFINE_UNQUOTED PACKAGE or VERSION. Don't create specs.h/options.h/gencheck.h here. Remove unnecessary variable settings from last argument of AC_OUTPUT. * config.in, configure: Regenerate. * intl.c: Hardcode package name as "gcc". * cppinit.c: Include except.h. (builtin_array): Define __USING_SJLJ_EXCEPTIONS__ when appropriate. * unwind-dw2.c, unwind-sjlj.c, config/ia64/unwind-ia64.c: Use #if(n)def __USING_SJLJ_EXCEPTIONS, not #if (!)USING_SJLJ_EXCEPTIONS. * doc/cpp.texi: Document __USING_SJLJ_EXCEPTIONS__. From-SVN: r48651 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b04a7d31981..4cc92962bd9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,25 @@ +2002-01-08 Zack Weinberg + + * Makefile.in (cs-tconfig.h): Don't depend on $(CONFIG_H) or + except.h. Remove commands to define USING_SJLJ_EXCEPTIONS. + (cppinit.o): Depend on except.h. + (gencheck.h, options.h, specs.h, s-gencheck, s-options, + s-specs): New rules. + + * configure.in: Don't AC_DEFINE_UNQUOTED PACKAGE or VERSION. + Don't create specs.h/options.h/gencheck.h here. Remove + unnecessary variable settings from last argument of AC_OUTPUT. + * config.in, configure: Regenerate. + * intl.c: Hardcode package name as "gcc". + + * cppinit.c: Include except.h. + (builtin_array): Define __USING_SJLJ_EXCEPTIONS__ when + appropriate. + * unwind-dw2.c, unwind-sjlj.c, config/ia64/unwind-ia64.c: + Use #if(n)def __USING_SJLJ_EXCEPTIONS, not #if + (!)USING_SJLJ_EXCEPTIONS. + * doc/cpp.texi: Document __USING_SJLJ_EXCEPTIONS__. + 2002-01-08 Joseph S. Myers * doc/tm.texi (ASM_OUTPUT_EH_REGION_BEG, ASM_OUTPUT_EH_REGION_END, @@ -20,7 +42,7 @@ Tue Jan 8 15:56:41 2002 Nicola Pero * config/s390/linux.h (ASM_OUTPUT_LABELREF): Remove. * config/s390/s390.c (s390_emit_epilog): Add REG_FRAME_RELATED_EXPR to insn adjusting stack/frame pointer. - * config/s390/s390.md (reload_la_64, reload_la_31): Do not + * config/s390/s390.md (reload_la_64, reload_la_31): Do not accept operands that cause the insn to be non-splittable. 2002-01-08 Graham Stott @@ -71,13 +93,13 @@ Tue Jan 8 15:56:41 2002 Nicola Pero 2002-01-07 Aldy Hernandez - * config/rs6000/rs6000.c (bdesc_2arg): Add altivec predicates. - (altivec_init_builtins): New node v4si_ftype_v16qi_v16qi. + * config/rs6000/rs6000.c (bdesc_2arg): Add altivec predicates. + (altivec_init_builtins): New node v4si_ftype_v16qi_v16qi. - * config/rs6000/rs6000.h (rs6000_builtins): Add enums for altivec - predicates. + * config/rs6000/rs6000.h (rs6000_builtins): Add enums for altivec + predicates. - * config/rs6000/rs6000.md: Add altivec predicate patterns. + * config/rs6000/rs6000.md: Add altivec predicate patterns. 2002-01-07 John David Anglin @@ -89,11 +111,11 @@ Tue Jan 8 15:56:41 2002 Nicola Pero 2002-01-07 Aldy Hernandez - * config/rs6000/rs6000.c (print_operand): Remove extra space. - (altivec_expand_unop_builtin): Fix thinko. - (altivec_expand_binop_builtin): Same. - (altivec_expand_ternop_builtin): Same. - (altivec_expand_builtin): Same. + * config/rs6000/rs6000.c (print_operand): Remove extra space. + (altivec_expand_unop_builtin): Fix thinko. + (altivec_expand_binop_builtin): Same. + (altivec_expand_ternop_builtin): Same. + (altivec_expand_builtin): Same. 2002-01-07 Richard Henderson @@ -114,16 +136,16 @@ Tue Jan 8 15:56:41 2002 Nicola Pero 2002-01-07 Aldy Hernandez - * rs6000.c (altivec_expand_ternop_builtin): Don't die on invalid - arguments. - (altivec_expand_binop_builtin): Same. - (altivec_expand_unop_builtin): Same. - (print_operand): Fix typo. - (bdesc_1arg): Add vupk* variants. + * rs6000.c (altivec_expand_ternop_builtin): Don't die on invalid + arguments. + (altivec_expand_binop_builtin): Same. + (altivec_expand_unop_builtin): Same. + (print_operand): Fix typo. + (bdesc_1arg): Add vupk* variants. - * rs6000.h (rs6000_builtins): Add vupk* enums. + * rs6000.h (rs6000_builtins): Add vupk* enums. - * rs6000.md: Add altivec_vupk* variants. + * rs6000.md: Add altivec_vupk* variants. 2002-01-07 Joseph S. Myers @@ -151,92 +173,92 @@ Mon Jan 7 11:59:34 CET 2002 Jan Hubicka 2002-01-07 Graham Stott - * config/i386/i386.h: Update copyright date. - (HALF_PIC_PTR): Add parenthesis. - (OPTIMIZATION_OPTIONS): Whitespace, add parenthesis and wrap. - (CONSTANT_ALIGNMENT): Add parenthesis. - (DATA_ALIGNMENT): Likewise. - (LOCAL_ALIGNMENT): Likewise. - (FUNCTION_ARG_BOUNDARY): Whitespace, add parenthesis and wrap. - (IS_STACK_MODE): Uppercase macro parameter, add parenthesis and wrap. - (CONDITIONAL_REGISTER_USAGE): Wrap in do {...} while (0). - (HARD_REGNO_NREGS): Add paranethesis. - (VALID_SSE_REG_MODE): Whitespace. - (VALID_MMX_REG_MODE): Whitespace. - (VALID_FP_MODE_P): Uppercase macros parameter and whitespace. - (ix86_hard_regno_mode_ok): Add parenthesis. - (HARD_REGNO_CALLER_SAVE_MODE): Whitespace. - (RETURN_IN_MEMORY): Whitespace. - (N_REG_CLASSES): Add parenthesis. - (INTEGER_CLASS_P): Add parenthesis and wrap. - (FLOAT_CLASS_P): Likewise. - (SSE_CLASS_P): Likewise. - (MMX_CLASS_P): Likewise. - (MAYBE_INTEGER_CLASS_P): Likewise. - (MAYBE_FLOAT_CLASS_P): Likewise. - (MAYBE_SSE_CLASS_P): Likewise. - (MAYBE_MMX_CLASS_P): Likewise. - (Q_CLASS_P): Likewise. - (GENERAL_REGNO_P): Uppercase macro parameter. - (REX_INT_REGNO_P): Uppercase macro parameter and wrap. - (FP_REGNO_P): Likewise. - (ANY_FP_REGNO_P): Uppercase macro parameter. - (SSE_REGNO_P): Likewise. - (SSE_REGNO): Likewise. - (SSE_REG_P): Likewise. - (SSE_FLOAT_MODE_P): Likewise. - (MMX_REGNO_P): Likewise. - (MMX_REG_P):Likewise. - (STACK_REG_P): Likewise. - (NON_STACK_REG_P): Likewise. - (STACK_TOP_P): Likewise. - (CONVERT_HARD_REGISTER_TO_SSA_P): Add parenthesis. - (PREFERRED_RELOAD_CLASS): Add parenthesis and whitespace. - (SECONDARY_MEMORY_NEEDED): Likewise. - (SECONDARY_OUTPUT_RELOAD_CLASS): Whitespace. - (MD_ASM_CLOBBERS): Whitespace and wrap. - (MUST_PASS_IN_STACK): Whitespace and wrap. - (RETURN_POPS_ARGS): Add parenthesis. - (INIT_CUMULATIVE_ARGS): Likewise. - (FUNCTION_ARG): Likewise. - (FUNCTION_OK_FOR_SIBCALL): Add parenthesis and whitespace. - (SETUP_INCOMING_VARARGS): Likewise. - (BUILD_VA_LIST_TYPE): Add parenthesis. - (EXPAND_BUILTIN_VA_START): Uppercase macro paremeters and add - parenthsis. - (EXPAND_BUILTIN_VA_ARG): Likewise. - (FUNCTION_PROFILER): Wrap in do { ... } while (0) and add parenthesis. - (INITIALIZE_TRAMPOLINE): Add parenthesis. - (INITIAL_ELIMINATION_OFFSET): Likewise. - (REGNO_OK_FOR_INDEX_P): Add parenthesis. - (REGNO_OK_FOR_BASE_P): Likewise. - (REGNO_OK_FOR_SIREG_P): Add parenthesis and wrap. - (REGNO_OK_FOR_DIREG_P): Likewise. - (REG_OK_FOR_INDEX_P): Whitespace. - (REG_OK_FOR_BASE_P): Whitespace. - (GO_IF_LEGITIMATE_ADDRESS): Wrap in do { ... } while (0) and add - parenthesis. - (FIND_BASE_TERM): Fix typo. - (LEGITIMIZE_ADDRESS): Wrap in { .. } while (0) and add parenthesis. - (REWRITE_ADDRESS): Uppercase macro parameter and whitespace. - (SYMBOLIC_CONST; Whitespace. - (GO_IF_MODE_DEPENDENT_ADDRESS):Wrap in { .. } while (0) and wrap. - (ENCODE_SECTION_INFO): Whitespace. - (FINALIZE_PIC): Remove do { ... } while (0). - (PROMOTE_MODE): Wrap in do { ... } while (0). - (CONST_COSTS): Whitespace. - (RTX_COSTS): Add paramethesis, whitespace and wrap. - (REGISTER_MOVE_COST): Add parenthesis. - (MEMORY_MOVE_COST): Likewise. - (EXTRA_CC_MODES): Whitespace. - (SELECT_CC_MODE): Add parenthesis and whitespace. - (DBX_REGISTER_NUMBER): Uppercase macro parameter and add parenthsis. - (ASM_PREFERRED_EH_DATA_FORMAT): Add parenthesis and whitespace. - (ASM_OUTPUT_LABEL): Add paramethesis. - (ASM_OUTPUT_REG_PUSH): Add parenthesis and whitespace. - (ASM_OUTPUT_REG_POP): Likewise. - (ASM_OUTPUT_ADDR_VEC_ELT): Add parenthesis. - (ASM_OUTPUT_ADDR_DIFF_ELT): Likewise. + * config/i386/i386.h: Update copyright date. + (HALF_PIC_PTR): Add parenthesis. + (OPTIMIZATION_OPTIONS): Whitespace, add parenthesis and wrap. + (CONSTANT_ALIGNMENT): Add parenthesis. + (DATA_ALIGNMENT): Likewise. + (LOCAL_ALIGNMENT): Likewise. + (FUNCTION_ARG_BOUNDARY): Whitespace, add parenthesis and wrap. + (IS_STACK_MODE): Uppercase macro parameter, add parenthesis and wrap. + (CONDITIONAL_REGISTER_USAGE): Wrap in do {...} while (0). + (HARD_REGNO_NREGS): Add paranethesis. + (VALID_SSE_REG_MODE): Whitespace. + (VALID_MMX_REG_MODE): Whitespace. + (VALID_FP_MODE_P): Uppercase macros parameter and whitespace. + (ix86_hard_regno_mode_ok): Add parenthesis. + (HARD_REGNO_CALLER_SAVE_MODE): Whitespace. + (RETURN_IN_MEMORY): Whitespace. + (N_REG_CLASSES): Add parenthesis. + (INTEGER_CLASS_P): Add parenthesis and wrap. + (FLOAT_CLASS_P): Likewise. + (SSE_CLASS_P): Likewise. + (MMX_CLASS_P): Likewise. + (MAYBE_INTEGER_CLASS_P): Likewise. + (MAYBE_FLOAT_CLASS_P): Likewise. + (MAYBE_SSE_CLASS_P): Likewise. + (MAYBE_MMX_CLASS_P): Likewise. + (Q_CLASS_P): Likewise. + (GENERAL_REGNO_P): Uppercase macro parameter. + (REX_INT_REGNO_P): Uppercase macro parameter and wrap. + (FP_REGNO_P): Likewise. + (ANY_FP_REGNO_P): Uppercase macro parameter. + (SSE_REGNO_P): Likewise. + (SSE_REGNO): Likewise. + (SSE_REG_P): Likewise. + (SSE_FLOAT_MODE_P): Likewise. + (MMX_REGNO_P): Likewise. + (MMX_REG_P):Likewise. + (STACK_REG_P): Likewise. + (NON_STACK_REG_P): Likewise. + (STACK_TOP_P): Likewise. + (CONVERT_HARD_REGISTER_TO_SSA_P): Add parenthesis. + (PREFERRED_RELOAD_CLASS): Add parenthesis and whitespace. + (SECONDARY_MEMORY_NEEDED): Likewise. + (SECONDARY_OUTPUT_RELOAD_CLASS): Whitespace. + (MD_ASM_CLOBBERS): Whitespace and wrap. + (MUST_PASS_IN_STACK): Whitespace and wrap. + (RETURN_POPS_ARGS): Add parenthesis. + (INIT_CUMULATIVE_ARGS): Likewise. + (FUNCTION_ARG): Likewise. + (FUNCTION_OK_FOR_SIBCALL): Add parenthesis and whitespace. + (SETUP_INCOMING_VARARGS): Likewise. + (BUILD_VA_LIST_TYPE): Add parenthesis. + (EXPAND_BUILTIN_VA_START): Uppercase macro paremeters and add + parenthsis. + (EXPAND_BUILTIN_VA_ARG): Likewise. + (FUNCTION_PROFILER): Wrap in do { ... } while (0) and add parenthesis. + (INITIALIZE_TRAMPOLINE): Add parenthesis. + (INITIAL_ELIMINATION_OFFSET): Likewise. + (REGNO_OK_FOR_INDEX_P): Add parenthesis. + (REGNO_OK_FOR_BASE_P): Likewise. + (REGNO_OK_FOR_SIREG_P): Add parenthesis and wrap. + (REGNO_OK_FOR_DIREG_P): Likewise. + (REG_OK_FOR_INDEX_P): Whitespace. + (REG_OK_FOR_BASE_P): Whitespace. + (GO_IF_LEGITIMATE_ADDRESS): Wrap in do { ... } while (0) and add + parenthesis. + (FIND_BASE_TERM): Fix typo. + (LEGITIMIZE_ADDRESS): Wrap in { .. } while (0) and add parenthesis. + (REWRITE_ADDRESS): Uppercase macro parameter and whitespace. + (SYMBOLIC_CONST; Whitespace. + (GO_IF_MODE_DEPENDENT_ADDRESS):Wrap in { .. } while (0) and wrap. + (ENCODE_SECTION_INFO): Whitespace. + (FINALIZE_PIC): Remove do { ... } while (0). + (PROMOTE_MODE): Wrap in do { ... } while (0). + (CONST_COSTS): Whitespace. + (RTX_COSTS): Add paramethesis, whitespace and wrap. + (REGISTER_MOVE_COST): Add parenthesis. + (MEMORY_MOVE_COST): Likewise. + (EXTRA_CC_MODES): Whitespace. + (SELECT_CC_MODE): Add parenthesis and whitespace. + (DBX_REGISTER_NUMBER): Uppercase macro parameter and add parenthsis. + (ASM_PREFERRED_EH_DATA_FORMAT): Add parenthesis and whitespace. + (ASM_OUTPUT_LABEL): Add paramethesis. + (ASM_OUTPUT_REG_PUSH): Add parenthesis and whitespace. + (ASM_OUTPUT_REG_POP): Likewise. + (ASM_OUTPUT_ADDR_VEC_ELT): Add parenthesis. + (ASM_OUTPUT_ADDR_DIFF_ELT): Likewise. * config/i386/i386.c: Update copyright. (CHECK_STACK_LIMIT): Add parenthesis. @@ -260,7 +282,7 @@ Mon Jan 7 11:59:34 CET 2002 Jan Hubicka 2002-01-06 Aldy Hernandez - * config.gcc: Add support for --enable-altivec. + * config.gcc: Add support for --enable-altivec. 2002-01-06 Craig Rodrigues @@ -338,7 +360,7 @@ Mon Jan 7 11:59:34 CET 2002 Jan Hubicka * lcm.c: Revert change, due to performance regression it causes on SPEC because it's slightly more conservative (sigh, I hate edge-based LCM). - + Sat Jan 5 11:52:05 CET 2002 Jan Hubicka * cfgcleanup.c (try_forward_edges): Allow multiple jump threading. @@ -402,15 +424,15 @@ Sat Jan 5 01:35:29 CET 2002 Jan Hubicka Fri Jan 4 11:45:05 2002 Jeffrey A Law (law@redhat.com) - * c-common.c (c_expand_start_cond): Expect the IF_STMT node to - be passed in, do not build it. - (c_begin_if_stmt): New function. - (c_begin_while_stmt, c_finish_while_stmt_cond): Likewise. - * c-common.h (c_expand_start_cond): Update prototype. - (c_begin_if_stmt): Prototype new function. - (c_begin_while_stmt, c_finish_while_stmt_cond): Likewise. - * c-parse.in (if_prefix): Use c_begin_if_stmt, - c_begin_while_stmt and c_finish_while_stmt_cond. + * c-common.c (c_expand_start_cond): Expect the IF_STMT node to + be passed in, do not build it. + (c_begin_if_stmt): New function. + (c_begin_while_stmt, c_finish_while_stmt_cond): Likewise. + * c-common.h (c_expand_start_cond): Update prototype. + (c_begin_if_stmt): Prototype new function. + (c_begin_while_stmt, c_finish_while_stmt_cond): Likewise. + * c-parse.in (if_prefix): Use c_begin_if_stmt, + c_begin_while_stmt and c_finish_while_stmt_cond. 2002-01-04 William Cohen @@ -725,9 +747,9 @@ Fri Jan 4 11:45:05 2002 Jeffrey A Law (law@redhat.com) 2002-01-03 Graham Stott * loop.h: Update copyright date. - (LOOP_MOVABLES): Fix typo. - (LOOP_REGS): Likewise. - (LOOP_IVS): Likewise. + (LOOP_MOVABLES): Fix typo. + (LOOP_REGS): Likewise. + (LOOP_IVS): Likewise. 2002-01-03 Graham Stott diff --git a/gcc/Makefile.in b/gcc/Makefile.in index ce5307de790..5e3a447cfc6 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -839,19 +839,10 @@ cs-hconfig.h: Makefile TARGET_CPU_DEFAULT="$(target_cpu_default)" \ $(SHELL) $(srcdir)/mkconfig.sh hconfig.h -cs-tconfig.h: Makefile $(CONFIG_H) except.h +cs-tconfig.h: Makefile HEADERS="$(xm_file)" DEFINES="$(xm_defines)" \ TARGET_CPU_DEFAULT="" \ $(SHELL) $(srcdir)/mkconfig.sh tconfig.h -# ??? Need extra help to get this definition copied to where libgcc can -# see it. It shouldn't matter which compiler we use to get there. - echo '#include "config.h"' > conftest.c - echo '#include "except.h"' >> conftest.c - echo 'xyzzy USING_SJLJ_EXCEPTIONS' >> conftest.c - $(HOST_CC) -E conftest.c $(ALL_CFLAGS) $(INCLUDES) > conftest.out - sed -e 's/xyzzy/#define USING_SJLJ_EXCEPTIONS/' -e '/#define/p' \ - -e d conftest.out >> tconfig.h - rm conftest.* cs-tm_p.h: Makefile HEADERS="$(tm_p_file)" DEFINES="" TARGET_CPU_DEFAULT="" \ @@ -1273,6 +1264,30 @@ gencheck.o : gencheck.c gencheck.h tree.def $(HCONFIG_H) $(SYSTEM_H) \ $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \ $(srcdir)/gencheck.c $(OUTPUT_OPTION) +gencheck.h : s-gencheck ; @true +s-gencheck : Makefile + for t in $(lang_tree_files); do \ + echo "#include \"$$t\""; \ + done | sed 's|$(srcdir)/||' > tmp-gencheck.h + $(SHELL) $(srcdir)/move-if-change tmp-gencheck.h gencheck.h + $(STAMP) s-gencheck + +options.h : s-options ; @true +s-options : Makefile + for t in $(lang_options_files); do \ + echo "#include \"$$t\""; \ + done | sed 's|$(srcdir)/||' > tmp-options.h + $(SHELL) $(srcdir)/move-if-change tmp-options.h options.h + $(STAMP) s-options + +specs.h : s-specs ; @true +s-specs : Makefile + for t in $(lang_specs_files); do \ + echo "#include \"$$t\""; \ + done | sed 's|$(srcdir)/||' > tmp-specs.h + $(SHELL) $(srcdir)/move-if-change tmp-specs.h specs.h + $(STAMP) s-specs + dumpvers: dumpvers.c version.o: version.c version.h @@ -1964,7 +1979,7 @@ cpplib.o: cpplib.c $(CONFIG_H) $(LIBCPP_DEPS) cpphash.o: cpphash.c $(CONFIG_H) $(LIBCPP_DEPS) cppfiles.o: cppfiles.c $(CONFIG_H) $(LIBCPP_DEPS) $(SPLAY_TREE_H) mkdeps.h cppinit.o: cppinit.c $(CONFIG_H) $(LIBCPP_DEPS) cppdefault.h \ - mkdeps.h prefix.h version.h + mkdeps.h prefix.h version.h except.h cppdefault.o: cppdefault.c $(CONFIG_H) $(SYSTEM_H) cppdefault.h Makefile $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ diff --git a/gcc/config.in b/gcc/config.in index 099a0d2cd47..e70b7794e7b 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -1,4 +1,4 @@ -/* config.in. Generated automatically from configure.in by autoheader. */ +/* config.in. Generated automatically from configure.in by autoheader 2.13. */ /* Define if using alloca.c. */ #undef C_ALLOCA @@ -468,12 +468,6 @@ /* Define if host mkdir takes a single argument. */ #undef MKDIR_TAKES_ONE_ARG -/* Define to the name of the distribution. */ -#undef PACKAGE - -/* Define to the version of the distribution. */ -#undef VERSION - /* Define if you have the iconv() function. */ #undef HAVE_ICONV diff --git a/gcc/config/ia64/unwind-ia64.c b/gcc/config/ia64/unwind-ia64.c index 045abe5b7f6..add03aa5f77 100644 --- a/gcc/config/ia64/unwind-ia64.c +++ b/gcc/config/ia64/unwind-ia64.c @@ -35,7 +35,7 @@ #include "unwind.h" #include "unwind-ia64.h" -#if !USING_SJLJ_EXCEPTIONS +#ifndef __USING_SJLJ_EXCEPTIONS__ #define UNW_VER(x) ((x) >> 48) #define UNW_FLAG_MASK 0x0000ffff00000000 #define UNW_FLAG_OSMASK 0x0000f00000000000 diff --git a/gcc/configure b/gcc/configure index 5479946e070..d4a6ece8c62 100755 --- a/gcc/configure +++ b/gcc/configure @@ -5113,14 +5113,6 @@ EOF # Internationalization PACKAGE=gcc VERSION="$gcc_version" -cat >> confdefs.h <> confdefs.h <&6 -echo "configure:5149: checking for library containing strerror" >&5 +echo "configure:5141: checking for library containing strerror" >&5 if eval "test \"`echo '$''{'ac_cv_search_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_strerror="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_strerror="none required" else @@ -5174,7 +5166,7 @@ rm -f conftest* test "$ac_cv_search_strerror" = "no" && for i in cposix; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_strerror="-l$i" break @@ -5208,12 +5200,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5212: checking for working const" >&5 +echo "configure:5204: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5283,12 +5275,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5287: checking for off_t" >&5 +echo "configure:5279: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5316,12 +5308,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5320: checking for size_t" >&5 +echo "configure:5312: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5351,19 +5343,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:5355: checking for working alloca.h" >&5 +echo "configure:5347: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:5367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -5384,12 +5376,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:5388: checking for alloca" >&5 +echo "configure:5380: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -5449,12 +5441,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:5453: checking whether alloca needs Cray hooks" >&5 +echo "configure:5445: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5483: checking for $ac_func" >&5 +echo "configure:5475: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5534,7 +5526,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:5538: checking stack direction for C alloca" >&5 +echo "configure:5530: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5542,7 +5534,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -5584,12 +5576,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:5588: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:5580: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5625,17 +5617,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5629: checking for $ac_hdr" >&5 +echo "configure:5621: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5666,12 +5658,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5670: checking for $ac_func" >&5 +echo "configure:5662: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5734,7 +5726,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:5738: checking for iconv" >&5 +echo "configure:5730: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5742,7 +5734,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -5752,7 +5744,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:5756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -5764,7 +5756,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -5774,7 +5766,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -5795,13 +5787,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:5799: checking for iconv declaration" >&5 +echo "configure:5791: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5820,7 +5812,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -5849,19 +5841,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:5853: checking for nl_langinfo and CODESET" >&5 +echo "configure:5845: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:5865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -5884,19 +5876,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:5888: checking for LC_MESSAGES" >&5 +echo "configure:5880: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:5900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -5917,7 +5909,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:5921: checking whether NLS is requested" >&5 +echo "configure:5913: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -5940,7 +5932,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:5944: checking whether included gettext is requested" >&5 +echo "configure:5936: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -5960,17 +5952,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:5964: checking for libintl.h" >&5 +echo "configure:5956: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5991,12 +5983,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:5995: checking for GNU gettext in libc" >&5 +echo "configure:5987: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -6005,7 +5997,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:6009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libc=yes else @@ -6021,14 +6013,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 if test "$gt_cv_func_gnugettext1_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:6025: checking for GNU gettext in libintl" >&5 +echo "configure:6017: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -6037,7 +6029,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:6041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libintl=yes else @@ -6070,12 +6062,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6074: checking for $ac_func" >&5 +echo "configure:6066: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6127,7 +6119,7 @@ done # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6131: checking for $ac_word" >&5 +echo "configure:6123: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6161,7 +6153,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6165: checking for $ac_word" >&5 +echo "configure:6157: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6198,7 +6190,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6202: checking for $ac_word" >&5 +echo "configure:6194: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6248,7 +6240,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6252: checking for $ac_word" >&5 +echo "configure:6244: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6282,7 +6274,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6286: checking for $ac_word" >&5 +echo "configure:6278: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6318,7 +6310,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6322: checking for $ac_word" >&5 +echo "configure:6314: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6390,7 +6382,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6394: checking for $ac_word" >&5 +echo "configure:6386: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6423,7 +6415,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:6427: checking version of bison" >&5 +echo "configure:6419: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -6468,7 +6460,7 @@ EOF if test "x$CATOBJEXT" != x; then echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:6472: checking for catalogs to be installed" >&5 +echo "configure:6464: checking for catalogs to be installed" >&5 # Look for .po and .gmo files in the source directory. CATALOGS= XLINGUAS= @@ -6526,7 +6518,7 @@ fi case $host_os in win32 | pe | cygwin* | mingw32* | uwin*) echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 -echo "configure:6530: checking whether windows registry support is requested" >&5 +echo "configure:6522: checking whether windows registry support is requested" >&5 if test "x$enable_win32_registry" != xno; then cat >> confdefs.h <<\EOF #define ENABLE_WIN32_REGISTRY 1 @@ -6535,14 +6527,14 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6 -echo "configure:6539: checking for library containing RegOpenKeyExA" >&5 +echo "configure:6531: checking for library containing RegOpenKeyExA" >&5 if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_RegOpenKeyExA="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_RegOpenKeyExA="none required" else @@ -6564,7 +6556,7 @@ rm -f conftest* test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_RegOpenKeyExA="-l$i" break @@ -6617,7 +6609,7 @@ esac if test "x$enable_win32_registry" != xno; then echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6 -echo "configure:6621: checking registry key on windows hosts" >&5 +echo "configure:6613: checking registry key on windows hosts" >&5 cat >> confdefs.h <&6 -echo "configure:6826: checking what assembler to use" >&5 +echo "configure:6818: checking what assembler to use" >&5 gcc_cv_as= gcc_cv_gas_major_version= gcc_cv_gas_minor_version= @@ -6908,7 +6900,7 @@ fi # Figure out what linker we will be using. echo $ac_n "checking what linker to use""... $ac_c" 1>&6 -echo "configure:6912: checking what linker to use" >&5 +echo "configure:6904: checking what linker to use" >&5 gcc_cv_ld= gcc_cv_gld_major_version= gcc_cv_gld_minor_version= @@ -6994,7 +6986,7 @@ fi # Figure out what nm we will be using. echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:6998: checking what nm to use" >&5 +echo "configure:6990: checking what nm to use" >&5 if test -x nm$host_exeext; then gcc_cv_nm=./nm$host_exeext elif test x$host = x$target; then @@ -7005,7 +6997,7 @@ echo "$ac_t""$gcc_cv_nm" 1>&6 # Figure out what objdump we will be using. echo $ac_n "checking what objdump to use""... $ac_c" 1>&6 -echo "configure:7009: checking what objdump to use" >&5 +echo "configure:7001: checking what objdump to use" >&5 if test -x objdump$host_exeext; then gcc_cv_objdump=./objdump$host_exeext elif test x$host = x$target; then @@ -7016,7 +7008,7 @@ echo "$ac_t""$gcc_cv_objdump" 1>&6 # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:7020: checking assembler alignment features" >&5 +echo "configure:7012: checking assembler alignment features" >&5 gcc_cv_as_alignment_features=none if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then # Gas version 2.6 and later support for .balign and .p2align. @@ -7064,7 +7056,7 @@ fi echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6 -echo "configure:7068: checking assembler subsection support" >&5 +echo "configure:7060: checking assembler subsection support" >&5 gcc_cv_as_subsections=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7104,7 +7096,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:7108: checking assembler weak support" >&5 +echo "configure:7100: checking assembler weak support" >&5 gcc_cv_as_weak=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -7127,7 +7119,7 @@ fi echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:7131: checking assembler hidden support" >&5 +echo "configure:7123: checking assembler hidden support" >&5 gcc_cv_as_hidden=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7151,7 +7143,7 @@ fi echo "$ac_t""$gcc_cv_as_hidden" 1>&6 echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6 -echo "configure:7155: checking assembler leb128 support" >&5 +echo "configure:7147: checking assembler leb128 support" >&5 gcc_cv_as_leb128=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7196,7 +7188,7 @@ fi echo "$ac_t""$gcc_cv_as_leb128" 1>&6 echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6 -echo "configure:7200: checking assembler eh_frame optimization" >&5 +echo "configure:7192: checking assembler eh_frame optimization" >&5 gcc_cv_as_eh_frame=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7277,7 +7269,7 @@ fi echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6 echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6 -echo "configure:7281: checking assembler section merging support" >&5 +echo "configure:7273: checking assembler section merging support" >&5 gcc_cv_as_shf_merge=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7303,7 +7295,7 @@ case "$target" in # All TARGET_ABI_OSF targets. alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*) echo $ac_n "checking assembler supports explicit relocations""... $ac_c" 1>&6 -echo "configure:7307: checking assembler supports explicit relocations" >&5 +echo "configure:7299: checking assembler supports explicit relocations" >&5 if eval "test \"`echo '$''{'gcc_cv_as_explicit_relocs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7353,7 +7345,7 @@ EOF ;; sparc*-*-*) echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 -echo "configure:7357: checking assembler .register pseudo-op support" >&5 +echo "configure:7349: checking assembler .register pseudo-op support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7381,7 +7373,7 @@ EOF fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:7385: checking assembler supports -relax" >&5 +echo "configure:7377: checking assembler supports -relax" >&5 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7409,7 +7401,7 @@ EOF fi echo $ac_n "checking assembler and linker support unaligned pc related relocs""... $ac_c" 1>&6 -echo "configure:7413: checking assembler and linker support unaligned pc related relocs" >&5 +echo "configure:7405: checking assembler and linker support unaligned pc related relocs" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7439,7 +7431,7 @@ EOF case "$tm_file" in *64*) echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6 -echo "configure:7443: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 +echo "configure:7435: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7484,7 +7476,7 @@ EOF if test "x$gcc_cv_as_flags64" != xno; then echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 -echo "configure:7488: checking for assembler offsetable %lo() support" >&5 +echo "configure:7480: checking for assembler offsetable %lo() support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7524,7 +7516,7 @@ EOF i[34567]86-*-* | x86_64-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:7528: checking assembler instructions" >&5 +echo "configure:7520: checking assembler instructions" >&5 gcc_cv_as_instructions= if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -7551,7 +7543,7 @@ EOF echo "$ac_t""$gcc_cv_as_instructions" 1>&6 echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6 -echo "configure:7555: checking assembler GOTOFF in data directives" >&5 +echo "configure:7547: checking assembler GOTOFF in data directives" >&5 gcc_cv_as_gotoff_in_data=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x then @@ -7581,7 +7573,7 @@ EOF esac echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:7585: checking assembler dwarf2 debug_line support" >&5 +echo "configure:7577: checking assembler dwarf2 debug_line support" >&5 gcc_cv_as_dwarf2_debug_line=no # ??? Not all targets support dwarf2 debug_line, even within a version # of gas. Moreover, we need to emit a valid instruction to trigger any @@ -7637,7 +7629,7 @@ fi echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6 echo $ac_n "checking assembler --gdwarf2 support""... $ac_c" 1>&6 -echo "configure:7641: checking assembler --gdwarf2 support" >&5 +echo "configure:7633: checking assembler --gdwarf2 support" >&5 gcc_cv_as_gdwarf2_flag=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then @@ -7666,7 +7658,7 @@ fi echo "$ac_t""$gcc_cv_as_gdwarf2_flag" 1>&6 echo $ac_n "checking assembler --gstabs support""... $ac_c" 1>&6 -echo "configure:7670: checking assembler --gstabs support" >&5 +echo "configure:7662: checking assembler --gstabs support" >&5 gcc_cv_as_gstabs_flag=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then @@ -7694,7 +7686,7 @@ fi echo "$ac_t""$gcc_cv_as_gstabs_flag" 1>&6 echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6 -echo "configure:7698: checking linker PT_GNU_EH_FRAME support" >&5 +echo "configure:7690: checking linker PT_GNU_EH_FRAME support" >&5 gcc_cv_ld_eh_frame_hdr=no if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 12 -o "$gcc_cv_gld_major_version" -gt 2 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then @@ -7857,7 +7849,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:7861: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:7853: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -7893,21 +7885,16 @@ fi lang_specs_files= lang_options_files= lang_tree_files= -rm -f specs.h options.h gencheck.h -touch specs.h options.h gencheck.h for subdir in . $subdirs do if test -f $srcdir/$subdir/lang-specs.h; then - echo "#include \"$subdir/lang-specs.h\"" >>specs.h - lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h" + lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h" fi if test -f $srcdir/$subdir/lang-options.h; then - echo "#include \"$subdir/lang-options.h\"" >>options.h - lang_options_files="$lang_options_files $srcdir/$subdir/lang-options.h" + lang_options_files="$lang_options_files $srcdir/$subdir/lang-options.h" fi if test -f $srcdir/$subdir/$subdir-tree.def; then - echo "#include \"$subdir/$subdir-tree.def\"" >>gencheck.h - lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def" + lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def" fi done @@ -8682,36 +8669,8 @@ fi; done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff --git a/gcc/configure.in b/gcc/configure.in index 11e66310f99..03e87a79a61 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -908,10 +908,6 @@ changequote([,])dnl # Internationalization PACKAGE=gcc VERSION="$gcc_version" -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", - [Define to the name of the distribution.]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", - [Define to the version of the distribution.]) AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -2140,21 +2136,16 @@ AC_DEFINE_UNQUOTED(CONFIG_SJLJ_EXCEPTIONS, $sjlj, lang_specs_files= lang_options_files= lang_tree_files= -rm -f specs.h options.h gencheck.h -touch specs.h options.h gencheck.h for subdir in . $subdirs do if test -f $srcdir/$subdir/lang-specs.h; then - echo "#include \"$subdir/lang-specs.h\"" >>specs.h - lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h" + lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h" fi if test -f $srcdir/$subdir/lang-options.h; then - echo "#include \"$subdir/lang-options.h\"" >>options.h - lang_options_files="$lang_options_files $srcdir/$subdir/lang-options.h" + lang_options_files="$lang_options_files $srcdir/$subdir/lang-options.h" fi if test -f $srcdir/$subdir/$subdir-tree.def; then - echo "#include \"$subdir/$subdir-tree.def\"" >>gencheck.h - lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def" + lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def" fi done @@ -2464,35 +2455,7 @@ if test -f intl/libintl.h; then echo creating libintl.h echo '#include "intl/libintl.h"' >libintl.h fi -], -[ -host='${host}' -build='${build}' -target='${target}' -target_alias='${target_alias}' -srcdir='${srcdir}' -subdirs='${subdirs}' -symbolic_link='${symbolic_link}' -program_transform_set='${program_transform_set}' -program_transform_name='${program_transform_name}' -dep_host_xmake_file='${dep_host_xmake_file}' -host_xmake_file='${host_xmake_file}' -dep_tmake_file='${dep_tmake_file}' -tmake_file='${tmake_file}' -thread_file='${thread_file}' -gcc_config_arguments='${gcc_config_arguments}' -gcc_version='${gcc_version}' -gcc_version_full='${gcc_version_full}' -gcc_version_trigger='${gcc_version_trigger}' -local_prefix='${local_prefix}' -build_install_headers_dir='${build_install_headers_dir}' -build_exeext='${build_exeext}' -host_exeext='${host_exeext}' -out_file='${out_file}' -gdb_needs_out_file_path='${gdb_needs_out_file_path}' -SET_MAKE='${SET_MAKE}' -target_list='${target_list}' -target_overrides='${target_overrides}' -host_overrides='${host_overrides}' -cpp_install_dir='${cpp_install_dir}' +], +[subdirs='$subdirs' +symbolic_link='$symbolic_link' ]) diff --git a/gcc/cppinit.c b/gcc/cppinit.c index 93b27025d47..c0f0348ff65 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -28,6 +28,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "version.h" #include "mkdeps.h" #include "cppdefault.h" +#include "except.h" /* for USING_SJLJ_EXCEPTIONS */ /* Predefined symbols, built-in macros, and the default include path. */ @@ -641,6 +642,10 @@ static const struct builtin builtin_array[] = X("__USER_LABEL_PREFIX__", ULP), C("__REGISTER_PREFIX__", REGISTER_PREFIX), C("__HAVE_BUILTIN_SETJMP__", "1"), +#if USING_SJLJ_EXCEPTIONS + /* libgcc needs to know this. */ + C("__USING_SJLJ_EXCEPTIONS__","1"), +#endif #ifndef NO_BUILTIN_SIZE_TYPE C("__SIZE_TYPE__", SIZE_TYPE), #endif diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi index a4eaf840bed..39ff7fdce9a 100644 --- a/gcc/doc/cpp.texi +++ b/gcc/doc/cpp.texi @@ -1975,6 +1975,10 @@ typedefs, respectively. They exist to make the standard header files these macros directly; instead, include the appropriate headers and use the typedefs. +@item __USING_SJLJ_EXCEPTIONS__ +This macro is defined, with value 1, if the compiler uses the old +mechanism based on @code{setjmp} and @code{longjmp} for exception +handling. @end table @node System-specific Predefined Macros diff --git a/gcc/intl.c b/gcc/intl.c index feefc3e5f63..87dad513539 100644 --- a/gcc/intl.c +++ b/gcc/intl.c @@ -39,8 +39,8 @@ gcc_init_libintl () setlocale (LC_ALL, ""); #endif - (void) bindtextdomain (PACKAGE, LOCALEDIR); - (void) textdomain (PACKAGE); + (void) bindtextdomain ("gcc", LOCALEDIR); + (void) textdomain ("gcc"); } #endif diff --git a/gcc/unwind-dw2.c b/gcc/unwind-dw2.c index ef9b33bddbf..45d2923d2f8 100644 --- a/gcc/unwind-dw2.c +++ b/gcc/unwind-dw2.c @@ -27,7 +27,7 @@ #include "gthr.h" -#if !USING_SJLJ_EXCEPTIONS +#ifndef __USING_SJLJ_EXCEPTIONS__ #ifndef STACK_GROWS_DOWNWARD #define STACK_GROWS_DOWNWARD 0 diff --git a/gcc/unwind-sjlj.c b/gcc/unwind-sjlj.c index ff39ca4385f..9bf27a1a529 100644 --- a/gcc/unwind-sjlj.c +++ b/gcc/unwind-sjlj.c @@ -23,7 +23,7 @@ #include "unwind.h" #include "gthr.h" -#if USING_SJLJ_EXCEPTIONS +#ifdef __USING_SJLJ_EXCEPTIONS__ #ifdef DONT_USE_BUILTIN_SETJMP #ifndef inhibit_libc