diff options
43 files changed, 785 insertions, 596 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 809396ba4e9..7d7dd7e11aa 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * gcc-version.m4: Delete. + 2005-02-28 Paolo Bonzini <bonzini@gnu.org> PR bootstrap/17383 diff --git a/config/gcc-version.m4 b/config/gcc-version.m4 deleted file mode 100644 index 8de74bb2a63..00000000000 --- a/config/gcc-version.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl Usage: TL_AC_GCC_VERSION(TOPSRCDIR) -dnl -dnl Set up the variables: -dnl -dnl gcc_version_trigger: pathname of gcc's version.c, if available -dnl gcc_version_full: full gcc version string -dnl gcc_version: the first "word" in $gcc_version_full -dnl -dnl TOPSRCDIR is the top-level source directory. -AC_DEFUN([TL_AC_GCC_VERSION], -[ -changequote(,)dnl -if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger -else - gcc_version_trigger=$1/gcc/version.c -fi -if test -f "${gcc_version_trigger}"; then - gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` -else - gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` -fi -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` -changequote([,])dnl -AC_SUBST(gcc_version_trigger) -AC_SUBST(gcc_version_full) -AC_SUBST(gcc_version) -])dnl diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index a429a6369cb..2adedb2af45 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,13 @@ +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * Makefile.am (fastjar_TEXINFOS): Add gcc-vers.texi. + (BASEVER, DEVPHASE): New variables. + (POD2MAN): Adjust setting of --release option. + (fastjar.1, grepjar.1, gcc-vers.texi): New rules. + * Makefile.in: Regenerate. + * configure.ac: Do not invoke TL_AC_GCC_VERSION. + * aclocal.m4, configure: Regenerate. + 2004-12-02 Richard Sandiford <rsandifo@redhat.com> * configure.ac: Use TL_AC_GCC_VERSION to set gcc_version. @@ -56,47 +66,47 @@ * Makefile.in: Regenerate. * fastjar.texi: Update for '-u'. - + 2004-07-06 Casey Marshall <csm@gnu.org> PR 7854 * Makefile.am (jar_SOURCES): added shift.c, shift.h. - (jar_CPPFLAGS): define WITH_SHIFT_DOWN. - - * compress.c - Added FSF copyright. - (write_data): new function. - (compress_file): call write_data. - - * jartool.c - Updated copyright year. - (progname): new variable. - (end_of_entries): new variable. - (main): open and read file when updating. - (find_entry): new function. - (looks_like_dir): new function. - (read_entries): new function. - (make_manifest): added parameter `updating'. - Call `add_file_to_jar' with `updating'. - (add_to_jar_with_dir): added parameter `updating'. - Call `add_to_jar' with `updating'. - (add_to_jar): added parameter `updating'. - Call `add_file_to_jar' with `updating'. - Don't add directories if they already exist. - (add_file_to_jar): added parameter `updating'. - Update entries if they already exist. - - * jartool.h - Added #ifndef __FASTJAR_JARTOOL_H__. - (struct zipentry): added `flags'. - - * shift.c: new file. - - * shift.h: new file. - - * zipfile.h - (CEN_FLAGS): new constant. + (jar_CPPFLAGS): define WITH_SHIFT_DOWN. + + * compress.c + Added FSF copyright. + (write_data): new function. + (compress_file): call write_data. + + * jartool.c + Updated copyright year. + (progname): new variable. + (end_of_entries): new variable. + (main): open and read file when updating. + (find_entry): new function. + (looks_like_dir): new function. + (read_entries): new function. + (make_manifest): added parameter `updating'. + Call `add_file_to_jar' with `updating'. + (add_to_jar_with_dir): added parameter `updating'. + Call `add_to_jar' with `updating'. + (add_to_jar): added parameter `updating'. + Call `add_file_to_jar' with `updating'. + Don't add directories if they already exist. + (add_file_to_jar): added parameter `updating'. + Update entries if they already exist. + + * jartool.h + Added #ifndef __FASTJAR_JARTOOL_H__. + (struct zipentry): added `flags'. + + * shift.c: new file. + + * shift.h: new file. + + * zipfile.h + (CEN_FLAGS): new constant. 2004-07-05 Kelley Cook <kcook@gcc.gnu.org> diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am index fa90753fdea..6e105b5ba59 100644 --- a/fastjar/Makefile.am +++ b/fastjar/Makefile.am @@ -63,12 +63,16 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex info_TEXINFOS = fastjar.texi fastjar_TEXINFOS = \ ../gcc/doc/include/gcc-common.texi \ - ../gcc/doc/include/gpl.texi + ../gcc/doc/include/gpl.texi \ + gcc-vers.texi man_MANS = fastjar.1 grepjar.1 EXTRA_DIST = $(man_MANS) +BASEVER = $(srcdir)/../gcc/BASE-VER +DEVPHASE = $(srcdir)/../gcc/DEV-PHASE + TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl -POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" +POD2MAN = pod2man --center="GNU" --release="gcc-$(shell cat $(BASEVER))" .pod.1: -($(POD2MAN) --section=1 $< > $(@).T$$$$ && \ @@ -83,6 +87,17 @@ fastjar.pod: $(srcdir)/fastjar.texi grepjar.pod: $(srcdir)/fastjar.texi -$(TEXI2POD) -D grepjar $< > $@ +fastjar.1 grepjar.1: $(BASEVER) + +# gcc-vers.texi is generated from the version files. +gcc-vers.texi: $(BASEVER) $(DEVPHASE) + (echo "@set version-GCC $(shell cat $(BASEVER))"; \ + if [ "$(shell cat $(DEVPHASE))" = "experimental" ]; \ + then echo "@set DEVELOPMENT"; \ + else echo "@clear DEVELOPMENT"; \ + fi) > $@T + mv -f $@T $@ + # GCC LOCAL CHANGE # The following commands allow us to release tarballs with the man pages # and info documentation prebuilt. This feature is enabled via diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index 309e5ea70e9..49716a1d5fb 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -49,7 +49,6 @@ DIST_COMMON = README $(am__configure_deps) $(fastjar_TEXINFOS) \ COPYING ChangeLog INSTALL NEWS ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \ - $(top_srcdir)/../config/gcc-version.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -175,9 +174,6 @@ build_alias = @build_alias@ datadir = @datadir@ exec_prefix = @exec_prefix@ fastjar_warn_cflags = @fastjar_warn_cflags@ -gcc_version = @gcc_version@ -gcc_version_full = @gcc_version_full@ -gcc_version_trigger = @gcc_version_trigger@ host_alias = @host_alias@ includedir = @includedir@ infodir = @infodir@ @@ -253,12 +249,15 @@ TEXINFO_TEX = ../gcc/doc/include/texinfo.tex info_TEXINFOS = fastjar.texi fastjar_TEXINFOS = \ ../gcc/doc/include/gcc-common.texi \ - ../gcc/doc/include/gpl.texi + ../gcc/doc/include/gpl.texi \ + gcc-vers.texi man_MANS = fastjar.1 grepjar.1 EXTRA_DIST = $(man_MANS) +BASEVER = $(srcdir)/../gcc/BASE-VER +DEVPHASE = $(srcdir)/../gcc/DEV-PHASE TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl -POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" +POD2MAN = pod2man --center="GNU" --release="gcc-$(shell cat $(BASEVER))" @GENINSRC_FALSE@STAMP_GENINSRC = # GCC LOCAL CHANGE @@ -924,6 +923,17 @@ fastjar.pod: $(srcdir)/fastjar.texi grepjar.pod: $(srcdir)/fastjar.texi -$(TEXI2POD) -D grepjar $< > $@ +fastjar.1 grepjar.1: $(BASEVER) + +# gcc-vers.texi is generated from the version files. +gcc-vers.texi: $(BASEVER) $(DEVPHASE) + (echo "@set version-GCC $(shell cat $(BASEVER))"; \ + if [ "$(shell cat $(DEVPHASE))" = "experimental" ]; \ + then echo "@set DEVELOPMENT"; \ + else echo "@clear DEVELOPMENT"; \ + fi) > $@T + mv -f $@T $@ + all-local: $(STAMP_GENINSRC) stamp-geninsrc: fastjar.1 grepjar.1 fastjar.info diff --git a/fastjar/aclocal.m4 b/fastjar/aclocal.m4 index 5710bf10775..f8ccf0d9654 100644 --- a/fastjar/aclocal.m4 +++ b/fastjar/aclocal.m4 @@ -1083,5 +1083,4 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([../config/accross.m4]) -m4_include([../config/gcc-version.m4]) m4_include([acinclude.m4]) diff --git a/fastjar/configure b/fastjar/configure index 765bee8caca..9ab4cf0184c 100755 --- a/fastjar/configure +++ b/fastjar/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RM CP CHMOD MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT fastjar_warn_cflags CPP EGREP ZLIBS ZDEPS ZINCS GENINSRC_TRUE GENINSRC_FALSE gcc_version_trigger gcc_version_full gcc_version LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RM CP CHMOD MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT fastjar_warn_cflags CPP EGREP ZLIBS ZDEPS ZINCS GENINSRC_TRUE GENINSRC_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5226,23 +5226,6 @@ else fi - -if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger -else - gcc_version_trigger=$srcdir/../gcc/version.c -fi -if test -f "${gcc_version_trigger}"; then - gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` -else - gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` -fi -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` - - - - - ac_config_files="$ac_config_files Makefile install-defs.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5948,9 +5931,6 @@ s,@ZDEPS@,$ZDEPS,;t t s,@ZINCS@,$ZINCS,;t t s,@GENINSRC_TRUE@,$GENINSRC_TRUE,;t t s,@GENINSRC_FALSE@,$GENINSRC_FALSE,;t t -s,@gcc_version_trigger@,$gcc_version_trigger,;t t -s,@gcc_version_full@,$gcc_version_full,;t t -s,@gcc_version@,$gcc_version,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/fastjar/configure.ac b/fastjar/configure.ac index 935c49dfeb6..bdb556d40cb 100644 --- a/fastjar/configure.ac +++ b/fastjar/configure.ac @@ -89,6 +89,4 @@ AC_MSG_CHECKING([whether to place generated files in the source directory]) AC_MSG_RESULT($generated_files_in_srcdir) AM_CONDITIONAL(GENINSRC, test x$generated_files_in_srcdir = xyes) -TL_AC_GCC_VERSION([$srcdir/..]) - AC_OUTPUT(Makefile install-defs.sh) diff --git a/gcc/BASE-VER b/gcc/BASE-VER new file mode 100644 index 00000000000..ee74734aa22 --- /dev/null +++ b/gcc/BASE-VER @@ -0,0 +1 @@ +4.1.0 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cb2ec2a291c..65c1a67a790 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,42 @@ +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * BASE-VER, DATESTAMP, DEV-PHASE: New files. + * Makefile.in (gcc_version, gcc_version_trigger, ): Delete. + (BASEVER, DEVPHASE, DATESTAMP, BASEVER_c, DEVPHASE_c, DATESTAMP_c) + (BASEVER_s, DEVPHASE_s, DATESTAMP_s): New variables. + (version): Define using $(BASEVER_c). + (Makefile, config.status, build/gcov-iov.o): No longer depends on + version.c. + (version.o): Depend on version files; add custom generation command. + (prefix.o): Define BASEVER on command line. + (s-iov): Depend on version files; adjust command. + (TEXI_CPP_FILES, TEX_IGCC_FILES, TEXI_GCCINT_FILES, TEXI_CPPINT_FILES): + Add gcc-vers.texi. + (gcc-vers.texi): New rule. + (doc/%.info, doc/%.dvi): Add -I . to command line. + (doc/gccinstall.dvi): Likewise. + (PACKAGE): Delete. All uses replaced with "gcc". + * aclocal.m4: Do not include gcc-version.m4. + * configure.ac: Do not invoke TL_AC_GCC_VERSION. + Do not AC_SUBST nor AC_DEFINE PACKAGE or VERSION. + Set is_release based on contents of DEV-PHASE. + Set gcc_version based on contents of BASE-VER. + Define WIN32_REGISTRY_KEY only if the user overrode the default. + * config.in, configure: Regenerate. + * gccbug.in: Determine version of GCC in use at runtime. + * gcov-iov.c: Get version number and development phase from + command line, not by including version.c. + * intl.c: Replace all uses of PACKAGE with "gcc". + * libada-mk.in: Delete unused "gcc_version" variable. + * prefix.c: Default WIN32_REGISTRY_KEY to BASEVER. + * version.c: (VERSUFFIX): New hook for redistributors; adjust + commentary to match. + (version_string): Put together from pieces. + * config/alpha/x-vms: Do not use $(gcc_version). + * config/i386/t-nwld: Likewise. + * doc/include/gcc-common.texi: Include gcc-vers.texi for + version-GCC and DEVELOPMENT. + 2005-03-15 Roger Sayle <roger@eyesopen.com> PR tree-optimization/17454 @@ -132,7 +171,7 @@ * config/mips/mips.h (DWARF_CIE_DATA_ALIGNMENT): Change for STACK_GROWS_DOWNWARD. - + 2005-03-14 Roger Sayle <roger@eyesopen.com> * real.h (struct real_format): Split the signbit field into two @@ -162,7 +201,7 @@ subvars. * tree-tailcall.c (suitable_for_tail_opt_p): Look at STRUCT_FIELD tags too. - + 2005-03-14 Geoffrey Keating <geoffk@apple.com> * doc/cppopts.texi (-fexec-charset): Add concept index entry. @@ -175,7 +214,7 @@ 2005-03-14 Devang Patel <dpatel@apple.com> * doc/invoke.texi: Add reference to Visibility document. - + 2005-03-14 Richard Sandiford <rsandifo@redhat.com> * config.gcc (mips*-*-*): Rename MASK_SPLIT_ADDRS to @@ -239,7 +278,7 @@ * opth-gen.awk: Declare target_flags. Declare MASK_* and TARGET_* macros for the "Mask" and "InverseMask" options. * opts.h (cl_var_cond): New enum. - (cl_option): Replace the "has_set_value" and "set_value" fields with + (cl_option): Replace the "has_set_value" and "set_value" fields with "var_cond" and "var_value". (CL_TARGET): New macro. (option_enabled, print_filtered_help): Declare. @@ -343,7 +382,7 @@ (TARGET_USE_HIMODE_FIOP): New. (x86_use_simode_fiop): Rename from x86_use_fiop. (TARGET_USE_SIMODE_FIOP): Rename from TARGET_USE_FIOP. - + * config/i386/i386.md (X87MODEI12): New mode macro define. (*cmpfp_<mode>): Rename from *cmpfp_si. Use X87MODEI12 mode macro to implement x87 FP compare with HImode input operands. @@ -515,7 +554,7 @@ * expmed.c (expand_mult): Use synthetic multiplication sequences for more classes of DImode multiplication by constant. Allow both - multiplication by small negative constants (by performing a + multiplication by small negative constants (by performing a multiplication by a positive constant and negating the result) and multiplications by large powers of two, by using a left shift. @@ -597,7 +636,7 @@ Don't mark variables non-addressable if they still have addressable subvars. Also mark subvars addressable when the real variable is marked - addressable. + addressable. (add_pointed_to_var): Try to prune the pointed-to set by only pointing to subvars when possible. Otherwise, make sure we set addresses_needed and pt_vars to @@ -628,13 +667,13 @@ (STMT_VINFO_SUBVARS): New macro. * common.opts: add flag_tree_salias. - + * opts.c (decode_options): flag_tree_salias defaults to on. - + * doc/invoke.texi: Document fdump-tree-svars and -ftree-salias. * doc/tree-ssa.texi: Document structural alias analysis. - + 2005-03-12 Steven Bosscher <stevenb@suse.de> * tree-cfg.c (make_goto_expr_edges): Don't use error_mark_node. @@ -690,7 +729,7 @@ 2005-03-12 Geoffrey Keating <geoffk@apple.com> - * c-lex.c (c_lex_with_flags): Add parameter to call to + * c-lex.c (c_lex_with_flags): Add parameter to call to cpp_spell_token. 2005-03-11 Per Bothner <per@bothner.com> @@ -773,7 +812,7 @@ ATTR_NOTHROW_NONNULL_1_4, ATTR_CONST_NOTHROW_NONNULL_1, ATTR_PURE_NOTHROW_NONNULL_1, ATTR_PURE_NOTHROW_NONNULL_1_2, ATTR_MALLOC_NOTHROW_NONNULL_1): Delete. - + * builtins.def: Use the non-specific "nonnull" attibute lists. 2005-03-11 Zdenek Dvorak <dvorakz@suse.cz> @@ -1092,17 +1131,17 @@ 2005-03-08 Fariborz Jahanian <fjahanian@apple.com> - * config/rs6000/rs6000.c (invalid_arg_for_unprototyped_fn): + * config/rs6000/rs6000.c (invalid_arg_for_unprototyped_fn): Define the real function for ppc-darwin. * c-typeck.c (convert_arguments): Check for target-specific invalid argument call to unprototyped function. - * target-def.h (TARGET_INVALID_ARG_FOR_UNPROTOTYPED_FN): + * target-def.h (TARGET_INVALID_ARG_FOR_UNPROTOTYPED_FN): New Macro. - * target.h (invalid_arg_for_unprototyped_fn): New field + * target.h (invalid_arg_for_unprototyped_fn): New field in struct calls. - * targhooks.c (hook_invalid_arg_for_unprototyped_fn): New + * targhooks.c (hook_invalid_arg_for_unprototyped_fn): New default target hook. - * targhooks.h (hook_invalid_arg_for_unprototyped_fn): + * targhooks.h (hook_invalid_arg_for_unprototyped_fn): Declare. 2005-03-08 Kazu Hirata <kazu@cs.umass.edu> @@ -1166,9 +1205,9 @@ (alpha_v8qi_u, alpha_v8qi_s, alpha_v4hi_u, alpha_v4hi_s): New. (alpha_init_builtins): Init them. Set nothrow and const attributes on builtins. - (alpha_fold_builtin_cmpbge, alpha_fold_builtin_zapnot, - alpha_fold_builtin_extxx, alpha_fold_builtin_insxx, - alpha_fold_builtin_mskxx, alpha_fold_builtin_umulh, + (alpha_fold_builtin_cmpbge, alpha_fold_builtin_zapnot, + alpha_fold_builtin_extxx, alpha_fold_builtin_insxx, + alpha_fold_builtin_mskxx, alpha_fold_builtin_umulh, alpha_fold_vector_minmax, alpha_fold_builtin_perr, alpha_fold_builtin_pklb, alpha_fold_builtin_pkwb, alpha_fold_builtin_unpkbl, alpha_fold_builtin_unpkbw, @@ -1226,7 +1265,7 @@ * tree.h (DECL_IS_BUILTIN): Reverted my patch from earlier today. 2005-03-06 Andrew Pinski <pinskia@physics.uc.edu> - + PR tree-opt/17671 * tree-ssa-phiopt.c (tree_ssa_phiopt): Rewrite so we base the bbs on the COND_EXPR instead of the PHI_NODEs. @@ -1281,7 +1320,7 @@ * tree-cfg.c (remove_bb): If USE_MAPPED_LOCATION, change type of local variable loc. Change logic appropriately. * tree-vect-transform.c (vect_finish_stmt_generation): Use - EXPR_LOCATION rather than EXPR_LOCUS if USE_MAPPED_LOCATION. + EXPR_LOCATION rather than EXPR_LOCUS if USE_MAPPED_LOCATION. * c-parser.c (c_parser_for_statement): Initialize loc variable. * tree.h (DECL_IS_BUILTIN): Temporarily revert definition of DECL_IS_BUILTIN in the USE_MAPPED_LOCATION because of jc1 issues. @@ -1476,7 +1515,7 @@ (ASM_SPEC): Pass down -msym32 and -mno-sym32. 2005-03-04 Devang Patel <dpatel@apple.com> - + PR tree-optimization/18815 * tree-if-conv.c (combine_blocks): Adjust loop header edges for loops with zero exit edges. @@ -1484,7 +1523,7 @@ 2005-03-04 Devang Patel <dpatel@apple.com> * doc/invoke.texi: Remove reference to webpage that does not exist. - + 2005-03-04 John David Anglin <dave.danglin@nrc-cnrc.gc.ca> Joseph S. Myers <joseph@codesourcery.com> @@ -1539,7 +1578,7 @@ 2005-03-04 Kazu Hirata <kazu@cs.umass.edu> * fold-const.c (fold_ternary): Unroll the "for" loop to - extract operands. + extract operands. 2005-03-04 Andrew Haley <aph@redhat.com> @@ -1604,13 +1643,13 @@ 2005-03-03 Daniel Berlin <dberlin@dbrelin.org> Fix PR debug/20253 - + * c-opts.c (c_common_parse_file): Call start_source_file and end_source_file at the approriate times. * dwarf2out.c (dwarf2out_finish): Don't auto-end the main file, it will be done for us now. - + 2005-03-04 Kazu Hirata <kazu@cs.umass.edu> * fold-const.c (fold_ternary): New. @@ -1726,15 +1765,15 @@ * config/darwin8.h (LIB_SPEC): Switch -lmx and -lSystem. 2005-03-02 Devang Patel <dpatel@apple.com> - + Undo PR tree-optimization/18815 fix. - + 2005-03-02 Devang Patel <dpatel@apple.com> PR tree-optimization/18815 * tree-if-conv.c (combine_blocks): Adjust loop header edges for loops with zero exit edges. - + 2005-03-02 Kazu Hirata <kazu@cs.umass.edu> * cfg.c (connect_src, connect_dest, disconnect_src, diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP new file mode 100644 index 00000000000..4ba9f1d8cfa --- /dev/null +++ b/gcc/DATESTAMP @@ -0,0 +1 @@ +20050315 diff --git a/gcc/DEV-PHASE b/gcc/DEV-PHASE new file mode 100644 index 00000000000..9839eb20815 --- /dev/null +++ b/gcc/DEV-PHASE @@ -0,0 +1 @@ +experimental diff --git a/gcc/Makefile.in b/gcc/Makefile.in index fbdc9e11ac9..9306e384e45 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -427,10 +427,6 @@ GTHREAD_FLAGS=@gthread_flags@ extra_modes_file=@extra_modes_file@ extra_opt_files=@extra_opt_files@ host_hook_obj=@out_host_hook_obj@ -# Be prepared for gcc2 merges. -gcc_version=@gcc_version@ -gcc_version_trigger=@gcc_version_trigger@ -version=$(gcc_version) # ------------------------ # Installation directories @@ -688,6 +684,27 @@ TM_P_H = tm_p.h $(tm_p_file_list) GTM_H = tm.h $(tm_file_list) TM_H = $(GTM_H) insn-constants.h insn-flags.h +# Variables for version information. +BASEVER = $(srcdir)/BASE-VER # 4.x.y +DEVPHASE = $(srcdir)/DEV-PHASE # experimental, prerelease, "" +DATESTAMP = $(srcdir)/DATESTAMP # YYYYMMDD or empty + +BASEVER_c = $(shell cat $(BASEVER)) +DEVPHASE_c = $(shell cat $(DEVPHASE)) +DATESTAMP_c = $(shell cat $(DATESTAMP)) + +version = $(BASEVER_c) + +# For use in version.c - double quoted strings, with appropriate +# surrounding punctuation and spaces, and with the datestamp and +# development phase collapsed to the empty string in release mode +# (i.e. if DEVPHASE_c is empty). The space immediately after the +# comma in the $(if ...) constructs is significant - do not remove it. +BASEVER_s = "\"$(BASEVER_c)\"" +DEVPHASE_s = "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\"" +DATESTAMP_s = "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\"" + +# Shorthand variables for dependency lists. TARGET_H = $(TM_H) target.h insn-modes.h MACHMODE_H = machmode.h mode-classes.def insn-modes.h HOOKS_H = hooks.h $(MACHMODE_H) @@ -1042,7 +1059,7 @@ endif # Rebuilding this configuration # ----------------------------- -Makefile: config.status $(srcdir)/Makefile.in $(srcdir)/version.c $(LANG_MAKEFRAGS) +Makefile: config.status $(srcdir)/Makefile.in $(LANG_MAKEFRAGS) LANGUAGES="$(CONFIG_LANGUAGES)" \ CONFIG_HEADERS= \ CONFIG_SHELL="$(SHELL)" \ @@ -1119,7 +1136,7 @@ cstamp-h: config.in config.status # Really, really stupid make features, such as SUN's KEEP_STATE, may force # a target to build even if it is up-to-date. So we must verify that # config.status does not exist before failing. -config.status: $(srcdir)/configure $(srcdir)/config.gcc version.c +config.status: $(srcdir)/configure $(srcdir)/config.gcc @if [ ! -f config.status ] ; then \ echo You must configure gcc. Look at http://gcc.gnu.org/install/ for details.; \ false; \ @@ -1553,7 +1570,10 @@ options.o: options.c options.h opts.h intl.h dumpvers: dumpvers.c -version.o: version.c version.h +version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) + $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ + -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ + -DDEVPHASE=$(DEVPHASE_s) -c $(srcdir)/version.c $(OUTPUT_OPTION) gtype-desc.o: gtype-desc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ varray.h $(HASHTAB_H) $(SPLAY_TREE_H) bitmap.h $(TREE_H) $(RTL_H) \ @@ -1575,9 +1595,10 @@ ggc-none.o: ggc-none.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(GGC_H) stringpool.o: stringpool.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(GGC_H) gt-stringpool.h -prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) Makefile prefix.h +prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) prefix.h \ + Makefile $(BASEVER) $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - -DPREFIX=\"$(prefix)\" \ + -DPREFIX=\"$(prefix)\" -DBASEVER=$(BASEVER_s) \ -c $(srcdir)/prefix.c $(OUTPUT_OPTION) convert.o: convert.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(FLAGS_H) \ @@ -2765,15 +2786,16 @@ test-protoize-simple: ./protoize ./unprotoize $(GCC_PASSES) -rm -f tmp-proto.[cs] tmp-proto$(objext) # gcov-iov.c is run on the build machine to generate gcov-iov.h from version.c -build/gcov-iov.o: gcov-iov.c version.c $(BCONFIG_H) coretypes.h $(GTM_H) \ +build/gcov-iov.o: gcov-iov.c $(BCONFIG_H) coretypes.h $(GTM_H) \ $(SYSTEM_H) coretypes.h $(TM_H) build/gcov-iov$(build_exeext): build/gcov-iov.o $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) build/gcov-iov.o -o $@ gcov-iov.h: s-iov -s-iov: build/gcov-iov$(build_exeext) - build/gcov-iov$(build_exeext) > tmp-gcov-iov.h +s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE) + build/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \ + > tmp-gcov-iov.h $(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h $(STAMP) s-iov @@ -2970,24 +2992,37 @@ info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo srcinfo: $(INFOFILES) -cp -p $^ $(srcdir)/doc -TEXI_CPP_FILES = cpp.texi fdl.texi cppenv.texi cppopts.texi +TEXI_CPP_FILES = cpp.texi fdl.texi cppenv.texi cppopts.texi \ + gcc-common.texi gcc-vers.texi -TEXI_GCC_FILES = gcc.texi gcc-common.texi frontends.texi standards.texi \ - invoke.texi extend.texi md.texi objc.texi gcov.texi trouble.texi \ - bugreport.texi service.texi contribute.texi compat.texi funding.texi \ - gnu.texi gpl.texi fdl.texi contrib.texi cppenv.texi cppopts.texi \ +TEXI_GCC_FILES = gcc.texi gcc-common.texi gcc-vers.texi frontends.texi \ + standards.texi invoke.texi extend.texi md.texi objc.texi \ + gcov.texi trouble.texi bugreport.texi service.texi \ + contribute.texi compat.texi funding.texi gnu.texi gpl.texi \ + fdl.texi contrib.texi cppenv.texi cppopts.texi \ implement-c.texi -TEXI_GCCINT_FILES = gccint.texi gcc-common.texi contribute.texi makefile.texi \ - configterms.texi portability.texi interface.texi passes.texi \ - c-tree.texi rtl.texi md.texi tm.texi hostconfig.texi fragments.texi \ - configfiles.texi collect2.texi headerdirs.texi funding.texi gnu.texi \ - gpl.texi fdl.texi contrib.texi languages.texi sourcebuild.texi \ - gty.texi libgcc.texi cfg.texi tree-ssa.texi options.texi +TEXI_GCCINT_FILES = gccint.texi gcc-common.texi gcc-vers.texi \ + contribute.texi makefile.texi configterms.texi options.texi \ + portability.texi interface.texi passes.texi c-tree.texi \ + rtl.texi md.texi tm.texi hostconfig.texi fragments.texi \ + configfiles.texi collect2.texi headerdirs.texi funding.texi \ + gnu.texi gpl.texi fdl.texi contrib.texi languages.texi \ + sourcebuild.texi gty.texi libgcc.texi cfg.texi tree-ssa.texi TEXI_GCCINSTALL_FILES = install.texi install-old.texi fdl.texi -TEXI_CPPINT_FILES = cppinternals.texi +TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi + +# gcc-vers.texi is generated from the version files. +gcc-vers.texi: $(BASEVER) $(DEVPHASE) + (echo "@set version-GCC $(BASEVER_c)"; \ + if [ "$(DEVPHASE_c)" = "experimental" ]; \ + then echo "@set DEVELOPMENT"; \ + else echo "@clear DEVELOPMENT"; \ + fi) > $@T + mv -f $@T $@ + # The *.1, *.7, *.info, and *.dvi files are being generated from implicit # patterns. To use them, put each of the specific targets with its @@ -3000,7 +3035,7 @@ doc/cppinternals.info: $(TEXI_CPPINT_FILES) doc/%.info: %.texi if [ x$(BUILD_INFO) = xinfo ]; then \ - $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) \ + $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(docdir) \ -I $(docdir)/include -o $@ $<; \ fi @@ -3025,11 +3060,11 @@ dvi:: doc/gcc.dvi doc/gccint.dvi doc/gccinstall.dvi doc/cpp.dvi \ doc/cppinternals.dvi doc/%.dvi: %.texi - $(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $< + $(TEXI2DVI) -I . -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $< # Duplicate entry to handle renaming of gccinstall.dvi doc/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES) - $(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $< + $(TEXI2DVI) -I . -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $< html:: $(htmldir)/cpp/index.html $(htmldir)/gcc/index.html \ $(htmldir)/gccinstall/index.html $(htmldir)/gccint/index.html \ @@ -4185,8 +4220,6 @@ risky-stage4: stage4 XGETTEXT = @XGETTEXT@ GMSGFMT = @GMSGFMT@ MSGMERGE = msgmerge - -PACKAGE = @PACKAGE@ CATALOGS = @CATALOGS@ .PHONY: build- install- build-po install-po update-po @@ -4210,13 +4243,13 @@ update-po: $(CATALOGS:.gmo=.pox) # The new .po has to be gone over by hand, so we deposit it into # build/po with a different extension. -# If build/po/$(PACKAGE).pot exists, use it (it was just created), +# If build/po/gcc.pot exists, use it (it was just created), # else use the one in srcdir. .po.pox: -test -d po || mkdir po - $(MSGMERGE) $< `if test -f po/$(PACKAGE).pot; \ - then echo po/$(PACKAGE).pot; \ - else echo $(srcdir)/po/$(PACKAGE).pot; fi` -o $@ + $(MSGMERGE) $< `if test -f po/gcc.pot; \ + then echo po/gcc.pot; \ + else echo $(srcdir)/po/gcc.pot; fi` -o $@ # This rule has to look for .gmo modules in both srcdir and # the cwd, and has to check that we actually have a catalog @@ -4233,8 +4266,8 @@ install-po: dir=$(localedir)/$$lang/LC_MESSAGES; \ echo $(mkinstalldirs) $(DESTDIR)$$dir; \ $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \ - echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ - $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \ + $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \ done # Rule for regenerating the message template (gcc.pot). @@ -4244,9 +4277,9 @@ install-po: # Note that exgettext has an awk script embedded in it which requires a # fairly modern (POSIX-compliant) awk. # The .pot file is left in the build directory. -$(PACKAGE).pot: po/$(PACKAGE).pot -po/$(PACKAGE).pot: force options.c +gcc.pot: po/gcc.pot +po/gcc.pot: force options.c -test -d po || mkdir po $(MAKE) srcextra AWK=$(AWK) $(SHELL) $(srcdir)/po/exgettext \ - $(XGETTEXT) $(PACKAGE) $(srcdir) + $(XGETTEXT) gcc $(srcdir) diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index abb84b0f6e9..dfcc20be148 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -2,7 +2,6 @@ m4_include([../config/accross.m4]) m4_include([../config/acx.m4]) m4_include([../config/gettext-sister.m4]) m4_include([../config/gcc-lib-path.m4]) -m4_include([../config/gcc-version.m4]) m4_include([../config/iconv.m4]) m4_include([../config/lcmessage.m4]) m4_include([../config/lib-ld.m4]) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 37e1c5a9815..847df062778 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,9 +1,15 @@ +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * Make-lang.in (doc/gnat_ugn_unw.info, doc/gnat_rm.info) + (doc/gnat_ugn_unw.dvi, doc/gnat_rm.dvi): Add gcc-vers.texi + to dependencies. + 2005-03-15 Vincent Celier <celier@adacore.com> - * mlib-tgt-darwin.adb (Library_Exist_For, Library_File_Name_For): - Add new parameter In_Tree to specify the project tree: needed - by the project manager. Adapt to changes in project manager - using new parameter In_Tree. + * mlib-tgt-darwin.adb (Library_Exist_For, Library_File_Name_For): + Add new parameter In_Tree to specify the project tree: needed + by the project manager. Adapt to changes in project manager + using new parameter In_Tree. 2005-03-15 Jakub Jelinek <jakub@redhat.com> @@ -267,7 +273,7 @@ PR ada/13470 - * a-stunau.ads, a-stunau.adb: + * a-stunau.ads, a-stunau.adb: Change interface to allow efficient (and correct) implementation The previous changes to allow extra space in unbounded strings had left this interface a bit broken. @@ -345,7 +351,7 @@ new syntax rule of Ada 2005 interfaces (for AI-251 and AI-345): INTERFACE_TYPE_DEFINITION ::= [limited | task | protected | synchronized] interface - [AND interface_list] + [AND interface_list] * par-ch3.adb (P_Type_Declaration): Modified to give support to interfaces. @@ -387,8 +393,8 @@ * exp_ch11.adb (Expand_N_Raise_Statement): Deal with case where "with string" given. - * sem_ch11.adb (Analyze_Raise_Statement): Handle case where string - expression given. + * sem_ch11.adb (Analyze_Raise_Statement): Handle case where string + expression given. * par-ch11.adb (P_Raise_Statement): Recognize with string expression in 2005 mode @@ -789,32 +795,32 @@ * system-linux-sparc.ads: Fix typo in previous commit. 2005-03-07 James A. Morrison <phython@gcc.gnu.org> - Laurent Guerby <laurent@guerby.net> + Laurent Guerby <laurent@guerby.net> - PR ada/20035 - * system-linux-sparc.ads: New. - * Makefile.in: Add sparc linux entry. + PR ada/20035 + * system-linux-sparc.ads: New. + * Makefile.in: Add sparc linux entry. -2005-02-27 Danny Smith <dannysmith@users.sourceforge.net> +2005-02-27 Danny Smith <dannysmith@users.sourceforge.net> - * seh_init.c (__gnat_SEH_error_handler): Mark third and fourth + * seh_init.c (__gnat_SEH_error_handler): Mark third and fourth parameters as unused. 2005-02-26 Nathanael Nerode <neroden@gcc.gnu.org> Partial merge from libada-gnattools-branch: 2004-12-02 Nathanael Nerode <neroden@gcc.gnu.org> - * Makefile.in: Move gnattools{1,1re,2,3,4} and corresponding flags - into code in gnattools/Makefile.in. Remove direct dependencies on - stamp-tools by tools clauses. + * Makefile.in: Move gnattools{1,1re,2,3,4} and corresponding flags + into code in gnattools/Makefile.in. Remove direct dependencies on + stamp-tools by tools clauses. 2004-12-02 Nathanael Nerode <neroden@gcc.gnu.org> - * config-lang.in: Add gnattools to $lang_dirs. + * config-lang.in: Add gnattools to $lang_dirs. 2005-02-13 Andrew Pinski <pinskia@physics.uc.edu> PR ada/19942 * utils.c (gnat_type_for_mode): Return null instead of ICE because - we asked for an unknown mode. + we asked for an unknown mode. 2005-02-12 Richard Henderson <rth@redhat.com> @@ -1004,7 +1010,7 @@ (Structured Exception handling). (Gen_Main_C): Idem. - * bindgen.adb: + * bindgen.adb: (Gen_Main_Ada): Set the default exit code if specified. (Gen_Main_C): Likewise. Part of *DC20-006. @@ -1258,8 +1264,8 @@ 2005-02-09 Robert Dewar <dewar@adacore.com> - * a-strunb.ads, a-strunb.adb: Add missing pragma Ada_05 statements - Fix name of Set routine + * a-strunb.ads, a-strunb.adb: Add missing pragma Ada_05 statements + Fix name of Set routine * a-strfix.ads, a-strfix.adb: Add new index functions from AI-301 to fixed packages. @@ -1301,7 +1307,7 @@ Fix for c330001 - PR ada/19386 - * decl.c: + * decl.c: (gnat_to_gnu_field): Do not necessarily invoke make_packable_type on the field if Pragma Component_Alignment (Storage_Unit). (gnat_to_gnu_entity, case object): Do not treat a renaming that has @@ -1512,7 +1518,7 @@ 2005-02-09 Pascal Obry <obry@adacore.com> - * gnat_ugn.texi: + * gnat_ugn.texi: Document the procedure to debug the DllMain routine on Windows. Add note about -funwind-tables and mixed Ada and C/C++ programming in ZCX mode. @@ -1525,7 +1531,7 @@ 2005-02-09 Robert Dewar <dewar@adacore.com> - * gnat_rm.texi: + * gnat_rm.texi: Changes to document new wide wide character support For AI-285 Update documentation on Normalize_Scalars and Initialize_Scalars @@ -1606,7 +1612,7 @@ 2005-01-27 Laurent GUERBY <laurent@guerby.net> * Makefile.in: Rename GNAT RTEMS specific files. - * 5rtpopsp.adb, 4rintnam.ads, 5rosinte.adb, + * 5rtpopsp.adb, 4rintnam.ads, 5rosinte.adb, 5rosinte.ads, 5rparame.adb: Replaced by files below. * s-tpopsp-rtems.adb, a-intman-rtems.ads, s-osinte-rtems.adb, s-osinte-rtems.ads, s-parame-rtems.adb: Replace files above. @@ -1616,14 +1622,14 @@ PR ada/19488 * 5rosinte.ads: Add No_Key constant. - * 5rtpopsp.adb: Initialize ATCB_Key with No_Key and fix style. - * gsocket.h: Do not include <sys/socket.h> with RTEMS either. + * 5rtpopsp.adb: Initialize ATCB_Key with No_Key and fix style. + * gsocket.h: Do not include <sys/socket.h> with RTEMS either. 2005-01-26 Laurent GUERBY <laurent@guerby.net> PR ada/19414 * i-cobol.adb (Valid_Numeric): Handle zero length case. - + 2005-01-20 Richard Henderson <rth@redhat.com> * Makefile.in (alpha-linux, LIBGNAT_TARGET_PAIRS): Use @@ -1703,7 +1709,7 @@ pragma restrictions. New entry for Ada 2005 attribute Mod. - * par-prag.adb: + * par-prag.adb: Add recognition of new pragma Restrictions No_Dependence Recognize restriction No_Obsolescent_Features at parse time @@ -1819,7 +1825,7 @@ * eval_fat.adb: (Eps_Model,Eps_Denorm): Remove, no longer used. (Succ): Re-implement using Scaling, Exponent and Ceiling attributes. (Pred): Implement in terms of Succ. - + * trans.c (convert_with_check): Reimplement conversion of float to integer. @@ -1844,7 +1850,7 @@ 2005-01-03 Thomas Quinot <quinot@adacore.com> - * exp_dist.adb: + * exp_dist.adb: Declare subprogram index in Build_RPC_Receiver_Body, to reduce the amount of PCS-specific code in RACW stubs generation. (Copy_Specification): Set Etype on copied formal parameter entities, as @@ -2282,10 +2288,10 @@ (Insert_Partition_Check): Use runtime library function to perform E.4(19) check. - * rtsfind.ads: New entity System.PolyORB_Interface.Make_Ref - (RE_Same_Partition): New entity, from s-parint. + * rtsfind.ads: New entity System.PolyORB_Interface.Make_Ref + (RE_Same_Partition): New entity, from s-parint. - * s-parint.ads, s-parint.adb (Same_Partition): New subprogram. + * s-parint.ads, s-parint.adb (Same_Partition): New subprogram. 2004-12-07 Gary Dismukes <dismukes@adacore.com> @@ -3169,7 +3175,7 @@ 2004-10-05 Vincent Celier <celier@gnat.com> - * mlib-tgt.ads: (Build_Dynamic_Library): New parameter Options_2 + * mlib-tgt.ads: (Build_Dynamic_Library): New parameter Options_2 2004-10-04 Laurent GUERBY <laurent@guerby.net> diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in index 23b6a45d9b9..251fa79cbb6 100644 --- a/gcc/ada/Make-lang.in +++ b/gcc/ada/Make-lang.in @@ -379,16 +379,18 @@ doc/gnat_ugn_unw.texi: $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words ada/doctools/xgnatugn unw $(srcdir)/ada/gnat_ugn.texi \ $(srcdir)/ada/ug_words doc/gnat_ugn_unw.texi -doc/gnat_ugn_unw.info: doc/gnat_ugn_unw.texi \ - $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi +doc/gnat_ugn_unw.info: doc/gnat_ugn_unw.texi \ + $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \ + gcc-vers.texi + if [ x$(BUILD_INFO) = xinfo ]; then \ rm -f $(@)*; \ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \ -I$(srcdir)/ada -o $@ $<; \ else true; fi -doc/gnat_rm.info: ada/gnat_rm.texi $(docdir)/include/fdl.texi \ - $(docdir)/include/gcc-common.texi +doc/gnat_rm.info: ada/gnat_rm.texi $(docdir)/include/fdl.texi \ + $(docdir)/include/gcc-common.texi gcc-vers.texi if [ x$(BUILD_INFO) = xinfo ]; then \ rm -f $(@)*; \ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \ @@ -417,12 +419,12 @@ install-info:: $(DESTDIR)$(infodir)/gnat_ugn_unw.info \ dvi:: doc/gnat_ugn_unw.dvi \ doc/gnat_rm.dvi doc/gnat-style.dvi -doc/gnat_ugn_unw.dvi: doc/gnat_ugn_unw.texi \ - $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi +doc/gnat_ugn_unw.dvi: doc/gnat_ugn_unw.texi $(docdir)/include/fdl.texi \ + $(docdir)/include/gcc-common.texi gcc-vers.texi $(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $< -doc/gnat_rm.dvi: ada/gnat_rm.texi \ - $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi +doc/gnat_rm.dvi: ada/gnat_rm.texi $(docdir)/include/fdl.texi \ + $(docdir)/include/gcc-common.texi gcc-vers.texi $(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $< doc/gnat-style.dvi: ada/gnat-style.texi $(docdir)/include/fdl.texi diff --git a/gcc/config.in b/gcc/config.in index d6338729f62..34fb521f4da 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -64,8 +64,8 @@ valgrind (a memory checker). This is extremely expensive. */ #undef ENABLE_VALGRIND_CHECKING -/* Define to 1 if installation paths should be looked up in Windows32 - Registry. Ignored on non windows32 hosts. */ +/* Define to 1 if installation paths should be looked up in the Windows + Registry. Ignored on non-Windows hosts. */ #undef ENABLE_WIN32_REGISTRY /* Define to the name of a file containing a list of extra machine modes for @@ -534,9 +534,6 @@ /* Define to 1 if your C compiler doesn't accept -c and -o together. */ #undef NO_MINUS_C_MINUS_O -/* The name of this program for internationalization purposes. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -592,7 +589,10 @@ /* Define if location_t is fileline integer cookie. */ #undef USE_MAPPED_LOCATION -/* Define to be the last portion of registry key on windows hosts. */ +/* Define to be the last component of the Windows registry key under which to + look for installation paths. The full key used will be + HKEY_LOCAL_MACHINE/SOFTWARE/Free Software Foundation/{WIN32_REGISTRY_KEY}. + The default is the GCC version number. */ #undef WIN32_REGISTRY_KEY /* whether byteorder is bigendian */ diff --git a/gcc/config/alpha/x-vms b/gcc/config/alpha/x-vms index a0ee2148e83..053263a60c5 100644 --- a/gcc/config/alpha/x-vms +++ b/gcc/config/alpha/x-vms @@ -1,5 +1,5 @@ # Under VMS, directory names cannot contain dots. -version:=$(shell echo $(gcc_version) | sed -e 's/\./_/g') +version:=$(shell echo $(BASEVER_c) | sed -e 's/\./_/g') libsubdir=$(libdir)/gcc-lib diff --git a/gcc/config/i386/t-nwld b/gcc/config/i386/t-nwld index ec12d12251c..0eff188dfa8 100644 --- a/gcc/config/i386/t-nwld +++ b/gcc/config/i386/t-nwld @@ -38,7 +38,7 @@ SHLIB_SRC = $(srcdir)/config/i386/netware-libgcc.c SHLIB_LINK = set -e; \ cat $(SHLIB_DEF) >@shlib_base_name@.def; \ echo "name $(SHLIB_NAME)" >>@shlib_base_name@.def; \ - echo "version $(gcc_version)" | sed "s!\.!,!g" >>@shlib_base_name@.def; \ + echo "version $(version)" | sed "s!\.!,!g" >>@shlib_base_name@.def; \ touch libgcc/build; \ echo "build $$$$(($$$$(<libgcc/build)+0))" >>@shlib_base_name@.def; \ echo "export @$(SHLIB_MAP)" >>@shlib_base_name@.def; \ diff --git a/gcc/configure b/gcc/configure index 02fdf0bb596..dfefaebfd17 100755 --- a/gcc/configure +++ b/gcc/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir gcc_version_trigger gcc_version_full gcc_version GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files PACKAGE VERSION USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default set_gcc_lib_path GMPLIBS GMPINC LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default set_gcc_lib_path GMPLIBS GMPINC LIBOBJS LTLIBOBJS' ac_subst_files='language_hooks' # Initialize some variables set by options. @@ -1032,7 +1032,7 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi @@ -1383,9 +1383,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers auto-host.h:config.in" -#Set to 1 on a release branch -is_release= - # Determine the host, build, and target systems ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -1606,23 +1603,6 @@ echo "$as_me: error: { (exit 1); exit 1; }; } fi - -if test "${with_gcc_version_trigger+set}" = set; then - gcc_version_trigger=$with_gcc_version_trigger -else - gcc_version_trigger=$srcdir/../gcc/version.c -fi -if test -f "${gcc_version_trigger}"; then - gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` -else - gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` -fi -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` - - - - - # ----------- # Directories # ----------- @@ -1669,7 +1649,7 @@ if test x${gcc_gxx_include_dir} = x; then if test x${enable_version_specific_runtime_libs} = xyes; then gcc_gxx_include_dir='${libsubdir}/include/c++' else - libstdcxx_incdir=c++/${gcc_version} + libstdcxx_incdir='c++/$(version)' gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir} fi fi @@ -2406,7 +2386,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2464,7 +2445,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2580,7 +2562,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2634,7 +2617,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2679,7 +2663,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2723,7 +2708,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3145,7 +3131,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3216,7 +3203,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3275,7 +3263,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3357,7 +3346,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3527,7 +3517,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3592,7 +3583,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3654,7 +3646,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3694,7 +3687,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3750,7 +3744,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3790,7 +3785,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3854,7 +3850,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3885,8 +3882,10 @@ See \`config.log' for more details." >&2;} esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -3998,7 +3997,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4060,7 +4060,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4100,7 +4101,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4156,7 +4158,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4196,7 +4199,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4260,7 +4264,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4291,8 +4296,10 @@ See \`config.log' for more details." >&2;} esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -4404,7 +4411,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4466,7 +4474,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4506,7 +4515,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4562,7 +4572,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4602,7 +4613,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4666,7 +4678,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4697,8 +4710,10 @@ See \`config.log' for more details." >&2;} esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -4810,7 +4825,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4872,7 +4888,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4912,7 +4929,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4968,7 +4986,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5008,7 +5027,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5072,7 +5092,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5103,8 +5124,10 @@ See \`config.log' for more details." >&2;} esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -5217,7 +5240,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5279,7 +5303,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5319,7 +5344,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5375,7 +5401,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5415,7 +5442,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5479,7 +5507,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5510,8 +5539,10 @@ See \`config.log' for more details." >&2;} esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -5625,7 +5656,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5687,7 +5719,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5727,7 +5760,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5783,7 +5817,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5823,7 +5858,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5887,7 +5923,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5918,8 +5955,10 @@ See \`config.log' for more details." >&2;} esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -6035,7 +6074,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6085,7 +6125,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6143,7 +6184,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6195,6 +6237,10 @@ fi # Enable -Werror in bootstrap stage2 and later. +is_release= +if test x"`cat $srcdir/DEV-PHASE`" != xexperimental; then + is_release=yes +fi # Check whether --enable-werror or --disable-werror was given. if test "${enable_werror+set}" = set; then enableval="$enable_werror" @@ -6361,7 +6407,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7331,7 +7378,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:7334: version of makeinfo is $ac_prog_version" >&5 + echo "configure:7381: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; 4.[2-9]*) @@ -7586,7 +7633,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7656,7 +7704,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7821,7 +7870,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7882,7 +7932,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7952,7 +8003,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8227,7 +8279,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8300,7 +8353,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8341,7 +8395,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8543,7 +8598,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8617,7 +8673,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8671,7 +8728,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8749,7 +8807,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8803,7 +8862,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8871,7 +8931,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9001,7 +9062,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9122,7 +9184,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9473,7 +9536,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9590,7 +9654,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9702,7 +9767,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9860,7 +9926,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10732,7 +10799,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10782,7 +10850,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10872,7 +10941,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10941,7 +11011,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11004,7 +11075,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11107,7 +11179,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11192,7 +11265,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11261,7 +11335,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11336,7 +11411,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11419,7 +11495,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11495,7 +11572,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11561,7 +11639,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11697,7 +11776,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12006,7 +12086,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12145,16 +12226,6 @@ static const struct { EOF # Internationalization -PACKAGE=gcc -VERSION="$gcc_version" - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - - # If we haven't got the data from the intl directory, # assume NLS is disabled. USE_NLS=no @@ -12229,19 +12300,11 @@ if test "${enable_win32_registry+set}" = set; then enableval="$enable_win32_registry" fi; -case $host_os in - win32 | pe | cygwin* | mingw32* | uwin*) -echo "$as_me:$LINENO: checking whether windows registry support is requested" >&5 -echo $ECHO_N "checking whether windows registry support is requested... $ECHO_C" >&6 -if test "x$enable_win32_registry" != xno; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_WIN32_REGISTRY 1 -_ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - echo "$as_me:$LINENO: checking for library containing RegOpenKeyExA" >&5 +case $host_os in + win32 | pe | cygwin* | mingw32* | uwin*) + if test "x$enable_win32_registry" != xno; then + echo "$as_me:$LINENO: checking for library containing RegOpenKeyExA" >&5 echo $ECHO_N "checking for library containing RegOpenKeyExA... $ECHO_C" >&6 if test "${ac_cv_search_RegOpenKeyExA+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12279,7 +12342,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12333,7 +12397,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12363,41 +12428,29 @@ echo "${ECHO_T}$ac_cv_search_RegOpenKeyExA" >&6 if test "$ac_cv_search_RegOpenKeyExA" != no; then test "$ac_cv_search_RegOpenKeyExA" = "none required" || LIBS="$ac_cv_search_RegOpenKeyExA $LIBS" -fi - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + enable_win32_registry=no fi -# Check if user specified a different registry key. -case "x${enable_win32_registry}" in -x | xyes) - # default. - gcc_cv_win32_registry_key="$VERSION" - ;; -xno) - # no registry lookup. - gcc_cv_win32_registry_key='' - ;; -*) - # user-specified key. - gcc_cv_win32_registry_key="$enable_win32_registry" - ;; -esac + fi + + if test "x$enable_win32_registry" != xno; then + +cat >>confdefs.h <<\_ACEOF +#define ENABLE_WIN32_REGISTRY 1 +_ACEOF -if test "x$enable_win32_registry" != xno; then - echo "$as_me:$LINENO: checking registry key on windows hosts" >&5 -echo $ECHO_N "checking registry key on windows hosts... $ECHO_C" >&6 + + if test "x$enable_win32_registry" != xyes \ + && test "x$enable_win32_registry" != x; then cat >>confdefs.h <<_ACEOF -#define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key" +#define WIN32_REGISTRY_KEY "$enable_win32_registry" _ACEOF - echo "$as_me:$LINENO: result: $gcc_cv_win32_registry_key" >&5 -echo "${ECHO_T}$gcc_cv_win32_registry_key" >&6 -fi -;; + fi + fi + ;; esac # Get an absolute path to the GCC top-level source directory @@ -12717,6 +12770,8 @@ elif test -x "$AS" && test x$host = x$target; then gcc_cv_as="$AS" fi +gcc_version=`cat $srcdir/BASE-VER` + if test "x$gcc_cv_as" = x; then # Search the same directories that the installed compiler will # search. Else we may find the wrong assembler and lose. If we @@ -15975,9 +16030,6 @@ s,@target_noncanonical@,$target_noncanonical,;t t s,@build_subdir@,$build_subdir,;t t s,@host_subdir@,$host_subdir,;t t s,@target_subdir@,$target_subdir,;t t -s,@gcc_version_trigger@,$gcc_version_trigger,;t t -s,@gcc_version_full@,$gcc_version_full,;t t -s,@gcc_version@,$gcc_version,;t t s,@GENINSRC@,$GENINSRC,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t @@ -16037,8 +16089,6 @@ s,@objext@,$objext,;t t s,@gthread_flags@,$gthread_flags,;t t s,@extra_modes_file@,$extra_modes_file,;t t s,@extra_opt_files@,$extra_opt_files,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t s,@USE_NLS@,$USE_NLS,;t t s,@LIBINTL@,$LIBINTL,;t t s,@LIBINTL_DEP@,$LIBINTL_DEP,;t t @@ -16295,6 +16345,11 @@ esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -16333,12 +16388,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;} fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub diff --git a/gcc/configure.ac b/gcc/configure.ac index dedb8002970..d8be15830ff 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -30,9 +30,6 @@ AC_INIT AC_CONFIG_SRCDIR(tree.c) AC_CONFIG_HEADER(auto-host.h:config.in) -#Set to 1 on a release branch -is_release= - # Determine the host, build, and target systems AC_CANONICAL_BUILD AC_CANONICAL_HOST @@ -100,8 +97,6 @@ AC_MSG_ERROR([ *** and run configure again.]) fi -TL_AC_GCC_VERSION([$srcdir/..]) - # ----------- # Directories # ----------- @@ -139,7 +134,7 @@ if test x${gcc_gxx_include_dir} = x; then if test x${enable_version_specific_runtime_libs} = xyes; then gcc_gxx_include_dir='${libsubdir}/include/c++' else - libstdcxx_incdir=c++/${gcc_version} + libstdcxx_incdir='c++/$(version)' changequote(<<, >>)dnl gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir} changequote([, ])dnl @@ -375,6 +370,10 @@ fi AC_SUBST(warn_cflags) # Enable -Werror in bootstrap stage2 and later. +is_release= +if test x"`cat $srcdir/DEV-PHASE`" != xexperimental; then + is_release=yes +fi AC_ARG_ENABLE(werror, [ --enable-werror enable -Werror in bootstrap stage2 and later], [], [if test x$is_release = x ; then @@ -1418,13 +1417,6 @@ EOF changequote([,])dnl # Internationalization -PACKAGE=gcc -VERSION="$gcc_version" -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", - [The name of this program for internationalization purposes.]) -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) - ZW_GNU_GETTEXT_SISTER_DIR # If LIBINTL contains LIBICONV, then clear LIBICONV so we don't get @@ -1442,44 +1434,30 @@ AC_ARG_ENABLE(win32-registry, --enable-win32-registry=KEY use KEY instead of GCC version as the last portion of the registry key],,) + case $host_os in - win32 | pe | cygwin* | mingw32* | uwin*) -AC_MSG_CHECKING(whether windows registry support is requested) -if test "x$enable_win32_registry" != xno; then - AC_DEFINE(ENABLE_WIN32_REGISTRY, 1, -[Define to 1 if installation paths should be looked up in Windows32 - Registry. Ignored on non windows32 hosts.]) - AC_MSG_RESULT(yes) - AC_SEARCH_LIBS(RegOpenKeyExA, advapi32) -else - AC_MSG_RESULT(no) -fi + win32 | pe | cygwin* | mingw32* | uwin*) + if test "x$enable_win32_registry" != xno; then + AC_SEARCH_LIBS(RegOpenKeyExA, advapi32,, [enable_win32_registry=no]) + fi -# Check if user specified a different registry key. -case "x${enable_win32_registry}" in -x | xyes) - # default. - gcc_cv_win32_registry_key="$VERSION" - ;; -xno) - # no registry lookup. - gcc_cv_win32_registry_key='' - ;; -*) - # user-specified key. - gcc_cv_win32_registry_key="$enable_win32_registry" + if test "x$enable_win32_registry" != xno; then + AC_DEFINE(ENABLE_WIN32_REGISTRY, 1, + [Define to 1 if installation paths should be looked up in the Windows + Registry. Ignored on non-Windows hosts.]) + + if test "x$enable_win32_registry" != xyes \ + && test "x$enable_win32_registry" != x; then + AC_DEFINE_UNQUOTED(WIN32_REGISTRY_KEY, "$enable_win32_registry", + [Define to be the last component of the Windows registry key under which + to look for installation paths. The full key used will be + HKEY_LOCAL_MACHINE/SOFTWARE/Free Software Foundation/{WIN32_REGISTRY_KEY}. + The default is the GCC version number.]) + fi + fi ;; esac -if test "x$enable_win32_registry" != xno; then - AC_MSG_CHECKING(registry key on windows hosts) - AC_DEFINE_UNQUOTED(WIN32_REGISTRY_KEY, "$gcc_cv_win32_registry_key", - [Define to be the last portion of registry key on windows hosts.]) - AC_MSG_RESULT($gcc_cv_win32_registry_key) -fi -;; -esac - # Get an absolute path to the GCC top-level source directory holddir=`${PWDCMD-pwd}` cd $srcdir @@ -1776,6 +1754,8 @@ elif test -x "$AS" && test x$host = x$target; then gcc_cv_as="$AS" fi +gcc_version=`cat $srcdir/BASE-VER` + if test "x$gcc_cv_as" = x; then # Search the same directories that the installed compiler will # search. Else we may find the wrong assembler and lose. If we diff --git a/gcc/doc/include/gcc-common.texi b/gcc/doc/include/gcc-common.texi index 777e88621f8..1cbfc64edad 100644 --- a/gcc/doc/include/gcc-common.texi +++ b/gcc/doc/include/gcc-common.texi @@ -2,14 +2,13 @@ @c This is part of the GCC manual. @c For copying conditions, see the file gcc.texi. -@c Common values used in the GCC manuals: +@c Version number and development mode. +@c version-GCC is @set to the base GCC version number. +@c DEVELOPMENT is @set for an in-development version, @clear for a +@c release version (corresponding to ``experimental''/anything else +@c in gcc/DEV-PHASE). -@set version-GCC 4.1.0 - -@c DEVELOPMENT is set to indicate an in-development version, -@c as compared to a release version. When making a release -@c branch, clear this. -@set DEVELOPMENT +@include gcc-vers.texi @c Common macros to support generating man pages: diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 32e6c02b0c4..07c5aaf9446 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * Make-lang.in (GFORTRAN_TEXI): Add gcc-vers.texi. + 2005-03-15 Feng Wang <fengwang@nudt.edu.cn> * trans-stmt.c (gfc_trans_label_assign): Don't set DECL_ARTIFICIAL flag @@ -68,7 +72,7 @@ * primary.c (match_complex_constant): Mangled complex constant may be an implied do-loop. Give implied do-loop matcher a chance. -2005-03-05 Steven G. Kargl <kargls@comcast.net> +2005-03-05 Steven G. Kargl <kargls@comcast.net> PR fortran/19754 * resolve.c (compare_shapes): New function. @@ -200,7 +204,7 @@ (compare_actual_formal): Check for NULL pointer instead of empty string. * intrinsic.c (gfc_current_intrinsic, gfc_current_intrinsic_arg): - Add 'const' qualifier. + Add 'const' qualifier. (conv_name): Return a heap allocated string. (find_conv): Add 'const' qualifier to 'target'. (add_sym): Use 'gfc_get_string' instead of 'strcpy'. @@ -258,7 +262,7 @@ * expr.c (gfc_type_convert_binary): Typo in comment. 2005-02-19 Steven G. Kargl <kargls@comcast.net> - + * check.c (gfc_check_selected_int_kind): New function. * intrinsic.h: Prototype it. * intrinsic.c (add_function): Use it. @@ -266,12 +270,12 @@ BT_REAL to BT_INTEGER and use gfc_default_integer_kind. 2005-02-19 Steven G. Kargl <kargls@comcast.net> - + * check.c (gfc_check_int): improve checking of optional kind * simplify.c (gfc_simplify_int): Change BT_REAL to BT_INTEGER 2005-02-19 Steven G. Kargl <kargls@comcast.net> - + * check.c (gfc_check_achar): New function * intrinsic.h: Prototype it. * intrinsic.c (add_function): Use it. @@ -405,7 +409,7 @@ 2005-01-22 Steven G. Kargl <kargls@comcast.net> - * intrinsic.c (make_alias): Add standard argument. + * intrinsic.c (make_alias): Add standard argument. (add_functions): Update make_alias calls. 2005-01-22 Paul Brook <paul@codesourcery.com> @@ -580,7 +584,7 @@ gfc_check_getcwd_sub, gfc_check_exit, gfc_check_flush, gfc_check_umask, gfc_check_umask_sub, gfc_check_unlink, gfc_check_unlink_sub): Fix formatting issues. - + 2005-01-08 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de> * gfortran.h: Remove outdated comment. Don't include stdio.h @@ -629,7 +633,7 @@ * gfortran.h (gfc_case): fix typo in comment. -2004-12-27 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> +2004-12-27 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> * trans-intrinsic.c (gfc_conv_intrinsic_ishft): Change to logical shift. Call fold. Remove 0-bit shift shortcut. @@ -913,7 +917,7 @@ 2004-10-30 Canqun Yang <canqun@nudt.edu.cn> - * check.c (gfc_check_rand): Allow missing optional argument. + * check.c (gfc_check_rand): Allow missing optional argument. (gfc_check_irand): Ditto. * intrinsic.c (add_functions): Set arg optional flag for {i,}rand. @@ -958,7 +962,7 @@ 2004-10-08 Tobias Schlueter <tobias.shclueter@physik.uni-muenchen.de> * arith.c: Fix formatting issues. - + 2004-10-07 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> PR fortran/17676 @@ -1012,7 +1016,7 @@ * trans-const.h (gfc_build_cstring_const): Add prototype. * trans-io.c (set_string, set_error_locus): Use new function. * trans-stmt.c (gfc_trans_goto): Use new function. - + PR fortran/17708 * parse.c (accept_statement): Don't treat END DO like END IF and END SELECT. @@ -1097,7 +1101,7 @@ PR fortran/17615 * trans-expr.c (gfc_trans_arrayfunc_assign): Look at resolved function to determine return type. - + 2004-09-20 Jan Hubicka <jh@suse.cz> * trans-decl.c (build_entry_thunks): Finalize the function; do not lower diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index 9bb34faba51..84199737858 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -147,7 +147,8 @@ GFORTRAN_TEXI = \ $(srcdir)/doc/include/fdl.texi \ $(srcdir)/doc/include/gpl.texi \ $(srcdir)/doc/include/funding.texi \ - $(srcdir)/doc/include/gcc-common.texi + $(srcdir)/doc/include/gcc-common.texi \ + gcc-vers.texi doc/gfortran.info: $(GFORTRAN_TEXI) if [ x$(BUILD_INFO) = xinfo ]; then \ diff --git a/gcc/gccbug.in b/gcc/gccbug.in index 965d5077b42..3b8b83d714b 100755 --- a/gcc/gccbug.in +++ b/gcc/gccbug.in @@ -31,7 +31,11 @@ SUBMITTER=net GNATS_ADDR=gcc-gnats@gcc.gnu.org # The default release for this host. -DEFAULT_RELEASE="@gcc_version_full@" +# We have to guess at what program_transform_name might have done. +# "sed 1q" because neither "head -1" nor "head -n 1" is universal, argh. + +DEFAULT_GCC="`echo $0 | sed -e 's/bug//'`" +DEFAULT_RELEASE="`$DEFAULT_GCC --version | sed 1q`" # The default organization. DEFAULT_ORGANIZATION= diff --git a/gcc/gcov-iov.c b/gcc/gcov-iov.c index d6b39de3da1..df90b5cf12f 100644 --- a/gcc/gcov-iov.c +++ b/gcc/gcov-iov.c @@ -1,6 +1,6 @@ /* Generate gcov version string from version.c. See gcov-io.h for description of how the version string is generated. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. Contributed by Nathan Sidwell <nathan@codesourcery.com> This file is part of GCC. @@ -20,46 +20,50 @@ along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "bconfig.h" -#include "system.h" -#include "coretypes.h" -#include "tm.h" -#include "version.c" /* We want the actual string. */ +#include <stdio.h> +#include <stdlib.h> -int main (int, char **); +/* Command line arguments are the base GCC version and the development + phase (the latter may be an empty string). */ int -main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) +main (int argc, char **argv) { - unsigned version = 0; + unsigned int version = 0; unsigned char v[4]; - unsigned ix; - char const *ptr = version_string; - unsigned major, minor = 0; - char s = 0; + unsigned int ix; + unsigned long major; + unsigned long minor = 0; + char phase = 0; + char *ptr; - major = atoi (ptr); - while (*ptr && *ptr != '.') - ptr++; - if (*ptr) - minor = atoi (ptr + 1); - while (*ptr) - if (*ptr++ == '(') - { - s = *ptr; - break; - } + if (argc != 3) + { + fprintf (stderr, "usage: %s 'version' 'phase'\n", argv[0]); + return 1; + } + + ptr = argv[1]; + major = strtoul (ptr, &ptr, 10); + + if (*ptr == '.') + minor = strtoul (ptr + 1, 0, 10); + + phase = argv[2][0]; + if (phase == '\0') + phase = '*'; v[0] = (major < 10 ? '0' : 'A' - 10) + major; v[1] = (minor / 10) + '0'; v[2] = (minor % 10) + '0'; - v[3] = s ? s : '*'; + v[3] = phase; for (ix = 0; ix != 4; ix++) version = (version << 8) | v[ix]; printf ("/* Generated automatically by the program `%s'\n", argv[0]); - printf (" from `%s'. */\n", version_string); + printf (" from `%s (%lu %lu) and %s (%c)'. */\n", + argv[1], major, minor, argv[2], phase); printf ("\n"); printf ("#define GCOV_VERSION ((gcov_unsigned_t)%#08x) /* %.4s */\n", version, v); diff --git a/gcc/intl.c b/gcc/intl.c index 2b2a9f09732..e5aa941021f 100644 --- a/gcc/intl.c +++ b/gcc/intl.c @@ -51,8 +51,8 @@ gcc_init_libintl (void) setlocale (LC_ALL, ""); #endif - (void) bindtextdomain (PACKAGE, LOCALEDIR); - (void) textdomain (PACKAGE); + (void) bindtextdomain ("gcc", LOCALEDIR); + (void) textdomain ("gcc"); /* Opening quotation mark. */ open_quote = _("`"); diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e32c9e82c95..adf8762d4b0 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * Make-lang.in (TEXI_JAVA_FILES): Add gcc-vers.texi. + 2005-03-11 Tom Tromey <tromey@redhat.com> * gcj.texi (Invoking gcj-dbtool): Document 'gcj-dbtool -p'. @@ -13,7 +17,7 @@ 2005-03-09 Ranjit Mathew <rmathew@hotmail.com> PR java/20338 - * decl.c (finish_method): Emit _Jv_InitClass for private static + * decl.c (finish_method): Emit _Jv_InitClass for private static methods inside inner classes as well. 2005-03-08 Julian Brown <julian@codesourcery.com> @@ -26,7 +30,7 @@ 2005-03-07 Ranjit Mathew <rmathew@hotmail.com> - * lang.c (flag_new_verifier): Enable by default, regardless of ABI. + * lang.c (flag_new_verifier): Enable by default, regardless of ABI. 2005-03-07 Bryce McKinlay <mckinlay@redhat.com> @@ -86,11 +90,11 @@ 2005-03-04 Andrew Haley <aph@redhat.com> - PR java/18362 - * class.c (set_method_index): Don't set method_index if it is - NULL_TREE. - (layout_class_method): Don't complain about "non-static method foo - overrides static method" in the case of indirect dispatch. + PR java/18362 + * class.c (set_method_index): Don't set method_index if it is + NULL_TREE. + (layout_class_method): Don't complain about "non-static method foo + overrides static method" in the case of indirect dispatch. 2005-03-02 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> @@ -157,7 +161,7 @@ new verifier. (find_local_variable): Promote all boolean types to int when searching for local variable decls. - + 2005-02-12 Kazu Hirata <kazu@cs.umass.edu> * builtins.c, java-except.h, jcf-parse.c, jv-scan.c, lex.c, @@ -322,7 +326,7 @@ * convert.h (convert_to_boolean, convert_to_char) : Remove. * expr.c (expand_load_internal): Do type conversion if type is not as required. - + 2004-12-13 Danny Smith <dannysmith@users.sourceforge.net> PR target/18459 @@ -334,7 +338,7 @@ PR java/18811: * jcf-parse.c (load_class): Remove sanity test for missing inner class file. - + 2004-12-06 Tom Tromey <tromey@redhat.com> * Make-lang.in (JAVA_MANFILES): Added gcj-dbtool. @@ -376,8 +380,8 @@ range we're demoting. 2004-12-03 Andrew Haley <aph@redhat.com> - - PR java/18697 + + PR java/18697 * class.c (layout_class_method): Don't fail to override a method simply because it has DECL_ARTIFICIAL set. @@ -479,7 +483,7 @@ (build_signature_for_libgcj): Move here from expr.c. (add_assertion_table_entry): New function. Callback for assertion hashtable traversal. - (emit_assertion_table): New. Take class argument, and generate + (emit_assertion_table): New. Take class argument, and generate assertion table DECL based on the TYPE_ASSERTIONS hashtable. * decl.c (init_decl_processing): Define assertion_entry_type record. Push 'assertion_table' class field instead of 'verify'. @@ -488,7 +492,7 @@ (add_type_assertion): Rewritten. Take class and assertion_code arguments. Add assertions to the TYPE_ASSERTIONS hashtable. (can_widen_reference_to): Use new add_type_assertion() arguments. - * java-tree.h (java_tree_index): Add JTI_ASSERTION_ENTRY_TYPE, + * java-tree.h (java_tree_index): Add JTI_ASSERTION_ENTRY_TYPE, JTI_ASSERTION_TABLE_TYPE. Remove JTI_VERIFY_IDENTIFIER_NODE. (verify_identifier_node): Removed. (assertion_entry_type, assertion_table_type): New. @@ -504,7 +508,7 @@ (vfy_note_local_type): Likewise. * verify.h (vfy_is_assignable_from): Declare. * verify-impl.c (is_assignable_from_slow): Remove unused function. - (ref_compatible): Rename arguments. Call vfy_is_assignable_from() + (ref_compatible): Rename arguments. Call vfy_is_assignable_from() instead of is_assignable_from_slow(). (types_compatible): Reinstate ref_compatible() call. @@ -605,10 +609,10 @@ 2004-10-20 Bryce McKinlay <mckinlay@redhat.com> - * verify-impl.c (type_array_elementpop_raw, vfy_pop_type_t, + * verify-impl.c (type_array_elementpop_raw, vfy_pop_type_t, vfy_push_type_t, set_variable, add_new_state, merge_into, handle_jsr_insn, branch_prepass, check_class_constant, - check_wide_constant, get_one_type, compute_static_types, + check_wide_constant, get_one_type, compute_static_types, verify_instructions_0): Clean up C99 declarations after statements. 2004-10-20 Tom Tromey <tromey@redhat.com> @@ -653,7 +657,7 @@ if flag_new_verifier is set. * java-tree.h (flag_new_verifier): Declare. * lang.opt (fnew-verifier): New option. - * verify-impl.c: Work around namespace pollution by undef'ing + * verify-impl.c: Work around namespace pollution by undef'ing 'current_class'. (struct verifier_context): Make 'bytecode' const. (verify_fail_pc): Pass -1 PC argument to vfy_fail. @@ -701,7 +705,7 @@ 2004-10-13 Bryce McKinlay <mckinlay@redhat.com> - * verify-impl.c: Formatting fixes. Reformat C++-style comments to + * verify-impl.c: Formatting fixes. Reformat C++-style comments to C-style. 2004-10-06 Bryce McKinlay <mckinlay@redhat.com> @@ -761,7 +765,7 @@ interfaces. * expr.c (add_type_assertion): Don't generate assertions when source type is array of Object. - + 2004-09-03 Andrew Haley <aph@redhat.com> * class.c (finish_class): Nullify TYPE_VERIFY_METHOD. @@ -926,7 +930,7 @@ soft_lookupinterfacemethodbyname_node. * gjavah.c (print_method_info): Final methods have vtable entries, - so gjavah needs to output them. + so gjavah needs to output them. * class.c (layout_class_method): Generate vtable entries for final methods. * parse.y (invocation_mode): Use INVOKE_VIRTUAL for indirect @@ -937,17 +941,17 @@ * class.c (build_symbol_entry): Convert the names of constructors to init_identifier_node when generating an entry for the indirect dispatch table. - + * expr.c (build_known_method_ref): Generate indirect calls for all methods marked DECL_EXTERNAL or TREE_PUBLIC. 2004-05-24 Andrew Haley <aph@redhat.com> - * expr.c (build_known_method_ref): Make sure ARRAY_REF access to - atable element is of the right type. + * expr.c (build_known_method_ref): Make sure ARRAY_REF access to + atable element is of the right type. - * class.c (build_static_field_ref): Cast pointer to correct type - for field. + * class.c (build_static_field_ref): Cast pointer to correct type + for field. 2004-04-20 Bryce McKinlay <mckinlay@redhat.com> @@ -997,7 +1001,7 @@ (build_known_method_ref): Always use indirect dispatch via the atable for static methods. - (expand_java_NEW): Break out object creation into new function, + (expand_java_NEW): Break out object creation into new function, java_create_object. (can_widen_reference_to): Issue a warning to say that we need to @@ -1067,7 +1071,7 @@ * gjavah.c (output_directory): Make static. (temp_directory): Likewise. - + 2004-11-15 Tom Tromey <tromey@redhat.com> * decl.c (instn_ptr_type_node): Removed. @@ -1099,7 +1103,7 @@ * decl.c (end_java_method): Remove duplicated code. 2004-11-06 Zack Weinberg <zack@codesourcery.com> - Gerald Pfeifer <gerald@pfeifer.com> + Gerald Pfeifer <gerald@pfeifer.com> * lex.h (HAVE_ICONV): Undefine if we do not have HAVE_ICONV_H as well. @@ -1107,7 +1111,7 @@ 2004-11-02 Bryce McKinlay <mckinlay@redhat.com> PR java/17265 - * class.c: Reinstate 2004-08-18 patch. + * class.c: Reinstate 2004-08-18 patch. (make_local_function_alias): Don't create an alias for extern (native) functions. @@ -1186,7 +1190,7 @@ * lang.c (java_tree_inlining_walk_subtrees): Last arg is struct pointer_set_t* now. - + 2004-10-13 Tom Tromey <tromey@redhat.com> PR java/15578: diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index d3e63069c76..a6d201379d9 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -370,8 +370,9 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ -DDEFAULT_TARGET_VERSION=\"$(version)\" \ $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION) -TEXI_JAVA_FILES = java/gcj.texi $(docdir)/include/fdl.texi $(docdir)/include/gpl.texi \ - $(docdir)/include/gcc-common.texi +TEXI_JAVA_FILES = java/gcj.texi $(docdir)/include/fdl.texi \ + $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi \ + gcc-vers.texi # Documentation doc/gcj.info: $(TEXI_JAVA_FILES) diff --git a/gcc/libada-mk.in b/gcc/libada-mk.in index 9815ea0446a..77a5c2b4ec1 100644 --- a/gcc/libada-mk.in +++ b/gcc/libada-mk.in @@ -23,7 +23,6 @@ exeext=@host_exeext@ libdir=@libdir@ -gcc_version=@gcc_version@ NOCOMMON_FLAG=@nocommon_flag@ WARN_CFLAGS=@warn_cflags@ gcc_tmake_file=@tmake_file@ diff --git a/gcc/prefix.c b/gcc/prefix.c index ab199b5cf51..ceaf61b1e9f 100644 --- a/gcc/prefix.c +++ b/gcc/prefix.c @@ -124,6 +124,10 @@ save_string (const char *s, int len) #if defined(_WIN32) && defined(ENABLE_WIN32_REGISTRY) +#ifndef WIN32_REGISTRY_KEY +# define WIN32_REGISTRY_KEY BASEVER +#endif + /* Look up "key" in the registry, as above. */ static char * diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog index 236d633fbb6..3a780f58b24 100644 --- a/gcc/treelang/ChangeLog +++ b/gcc/treelang/ChangeLog @@ -1,3 +1,7 @@ +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * Make-lang.in (TEXI_TREELANG_FILES): Add gcc-vers.texi. + 2005-03-06 James A. Morrison <phython@gcc.gnu.org> PR other/20326 @@ -61,7 +65,7 @@ rest_of_decl_compilation on static variables. (pushdecl): Put DECL_EXPRs into the current BIND_EXPR for automatic variables. - + 2005-02-24 James A. Morrison <phython@gcc.gnu.org> PR other/19897 diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in index 9c198d7c3dc..239d3f9bf49 100644 --- a/gcc/treelang/Make-lang.in +++ b/gcc/treelang/Make-lang.in @@ -166,7 +166,8 @@ TEXI_TREELANG_FILES = treelang/treelang.texi \ $(docdir)/include/gcc-common.texi \ $(docdir)/include/gpl.texi \ $(docdir)/include/fdl.texi \ - $(docdir)/include/funding.texi + $(docdir)/include/funding.texi \ + gcc-vers.texi doc/treelang.info: $(TEXI_TREELANG_FILES) $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include -o $@ $< diff --git a/gcc/version.c b/gcc/version.c index a1e8dad304e..c839cbd272d 100644 --- a/gcc/version.c +++ b/gcc/version.c @@ -1,11 +1,14 @@ #include "version.h" -/* This is the string reported as the version number by all components - of the compiler. If you distribute a modified version of GCC, - please modify this string to indicate that, e.g. by putting your - organization's name in parentheses at the end of the string. */ +/* This is the trailing component of the string reported as the + version number by all components of the compiler. For an official + FSF release, it is empty. If you distribute a modified version of + GCC, please change this string to indicate that. The suggested + format is a leading space, followed by your organization's name + in parentheses. You may also wish to include a number indicating + the revision of your modified compiler. */ -const char version_string[] = "4.1.0 20050316 (experimental)"; +#define VERSUFFIX "" /* This is the location of the online document giving instructions for reporting bugs. If you distribute a modified version of GCC, @@ -15,3 +18,8 @@ const char version_string[] = "4.1.0 20050316 (experimental)"; not bugs in your modifications.) */ const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>"; + +/* The complete version string, assembled from several pieces. + BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile. */ + +const char version_string[] = BASEVER DATESTAMP DEVPHASE VERSUFFIX; diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 20544556679..338228da8fa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * include/Makefile.am (c++config.h): Depend on DATESTAMP from gcc + subdirectory. Generate #define of __GLIBCXX__ from contents of + that file. + * include/Makefile.in: Regenerate. + * include/bits/c++config: Do not define __GLIBCXX__. + 2005-03-15 Paolo Carlini <pcarlini@suse.de> PR libstdc++/20352 @@ -92,14 +100,14 @@ New test of reference_wrapper typedefs and base classes. * testsuite/tr1/3_function_objects/result_of.cc: Trivial cleanup (e-mail address). - + 2005-03-02 Douglas Gregor <doug.gregor@gmail.com> * include/tr1/function (result_of): New class template. * include/tr1/functional/iterator.h: Implementation of TR1 result_of. * testsuite/tr1/3_function_objects/result_of.cc: New test - + 2005-03-01 Vladimir Merzliakov <wanderer@rsu.ru> * testsuite/26_numerics/cmath/c99_classification_macros_c.cc: Tweak. @@ -110,7 +118,7 @@ cons/auto_ptr_neg.cc: Correct line numbers. * testsuite/testsuite_abi.cc: Add CXXABI_1.3.1. - + 2005-02-28 Jonathan Wakely <redi@gcc.gnu.org> * include/tr1/memory: Replace checked_deleter with (unchecked) @@ -158,7 +166,7 @@ * acconfig.h: Same. * configure: Regenerate. * config.h.in: Same. - + 2005-02-24 Paolo Carlini <pcarlini@suse.de> * include/tr1/functional (mem_fn): Avoid _T, badname on @@ -170,7 +178,7 @@ (mem_fn): New function template. Implementations of TR1 function and mem_fn facilities. * include/tr1/functional_iterate.h: Implementations of TR1 - function and mem_fn facilities. + function and mem_fn facilities. * testsuite/tr1/3_function_objects/function/1.cc: New test of std::tr1::function. * testsuite/tr1/3_function_objects/function/2.cc: New @@ -190,8 +198,8 @@ * testsuite/tr1/3_function_objects/function/9.cc: New test of std::tr1::function. * testsuite/tr1/3_function_objects/mem_fn.cc: New test of - std::tr1::mem_fn. - + std::tr1::mem_fn. + 2005-02-23 Paolo Carlini <pcarlini@suse.de> * include/tr1/type_traits: Implement is_convertible. @@ -207,7 +215,7 @@ is_function/is_function.cc: Add testcase. 2005-02-22 Benjamin Kosnik <bkoz@redhat.com> - + * scripts/check_performance: Tweaks. * testsuite/27_io/basic_ostream/inserters_other/wchar_t/2.cc: Name @@ -338,7 +346,7 @@ * testsuite/tr1/6_containers/unordered/find/map1.cc: New test. * testsuite/tr1/6_containers/unordered/find/multimap1.cc: New test. * testsuite/tr1/6_containers/unordered/find/multiset1.cc: New test. - + 2005-02-19 Hans-Peter Nilsson <hp@axis.com> PR libstdc++/20071 @@ -365,7 +373,7 @@ * testsuite/tr1/6_containers/unordered/insert/multimap_range.cc: New test. * testsuite/tr1/6_containers/unordered/insert/multiset_range.cc: New test. * testsuite/tr1/6_containers/unordered/insert/set_range.cc: New test. - + 2005-02-18 Eric Botcazou <ebotcazou@libertysurf.fr> * testsuite/thread/pthread1.cc: Do not invoke pthread_setconcurrency @@ -395,7 +403,7 @@ * testsuite/tr1/6_containers/unordered/instantiate/multimap.cc: New test. * testsuite/tr1/6_containers/unordered/instantiate/multiset.cc: New test. * testsuite/tr1/6_containers/unordered/instantiate/set.cc: New test. - + 2005-02-16 Paolo Carlini <pcarlini@suse.de> * testsuite/23_containers/set/modifiers/16728.cc: @@ -410,7 +418,7 @@ 2005-02-15 Paolo Carlini <pcarlini@suse.de> Jon Grimm <jgrimm2@us.ibm.com> - + PR libstdc++/19955 * include/bits/locale_facets.h (ctype<char>::_M_narrow_init()): Fix the logic setting _M_narrow_ok: first check whether the @@ -493,7 +501,7 @@ 2005-01-31 Brad Spencer <spencer@infointeractive.com> * crossconfig.m4: Repair Solaris cross bits for strtold and strtof. - * configure: Regenerated. + * configure: Regenerated. 2005-01-31 Mark Mitchell <mark@codesourcery.com> @@ -589,7 +597,7 @@ is_abstract.cc: New. * testsuite/tr1/4_metaprogramming/type_properties/is_abstract/ typedefs.cc: Likewise. - + * include/tr1/type_traits (is_function): Rewrite, use the conversion F& -> F* instead, thus avoiding problems with abstract classes. * testsuite/tr1/4_metaprogramming/primary_type_categories/ @@ -750,7 +758,7 @@ * testsuite/27_io/basic_ostream/endl/char/1.cc: Minor tweaks. * testsuite/27_io/basic_ostream/ends/char/1.cc: Likewise. - * testsuite/27_io/basic_ostream/exceptions/char/9561.cc: Likewise. + * testsuite/27_io/basic_ostream/exceptions/char/9561.cc: Likewise. * testsuite/27_io/basic_ostream/flush/char/1.cc: Likewise. * testsuite/27_io/basic_ostream/flush/char/2.cc: Likewise. * testsuite/27_io/basic_ostream/flush/char/ @@ -793,7 +801,7 @@ of aligned. 2005-01-23 Paolo Carlini <pcarlini@suse.de> - Andreas Jaeger <aj@suse.de> + Andreas Jaeger <aj@suse.de> PR libstdc++/19343 * include/bits/functexcept.h: Mark the helpers as 'noreturn'. @@ -818,7 +826,7 @@ 2005-01-20 Benjamin Kosnik <bkoz@redhat.com> * testsuite/Makefile.am (check-compile): New. - * testsuite/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. * scripts/check_compile_time: New. * scripts/check_performance: Tweaks. @@ -851,7 +859,7 @@ * testsuite/performance/20_util/allocator/insert.cc: Remove bogus return, add return. * testsuite/performance/20_util/allocator/map_thread.cc: Same. - + 2005-01-17 Paolo Carlini <pcarlini@suse.de> PR libstdc++/19433 @@ -860,10 +868,10 @@ Obtain amortized constant complexity if t is inserted right after p - not before p - as per Table 69. * testsuite/performance/23_containers/set_insert_from_sorted.cc: New. - + * testsuite/23_containers/multiset/insert/2.cc: New. * testsuite/23_containers/set/insert/1.cc: Likewise. - + * testsuite/performance/23_containers/set_create_from_sorted.cc: Simplify. @@ -972,7 +980,7 @@ enc_traits to... * config/locale/ieee_1003.1-2001/codecvt_specializations.h: Move... * include/ext/codecvt_specializations.h: ...here. Remove - _GLIBCXX_USE___ENC_TRAITS. + _GLIBCXX_USE___ENC_TRAITS. (__enc_traits): To __encoding_state, put in __gnu_cxx namespace. (enc_char_traits): To __encoding_char_traits, put in __gnu_cxx namespace. @@ -986,10 +994,10 @@ uglified data members of basic_filebuf, including _M_buf, _M_buf_size, _M_mode, _M_pback_init. * include/std/std_fstream.h: Same. - + 2005-01-05 Benjamin Kosnik <bkoz@redhat.com> - * testsuite/testsuite_hooks.h: + * testsuite/testsuite_hooks.h: (copy_constructor::mark_call): Use __throw_runtime_error. (assignment_operator::mark_call): Same. * testsuite/testsuite_hooks.cc (verify_demangle): Same. @@ -1010,14 +1018,14 @@ * testsuite/27_io/basic_filebuf/open/char/9507.cc: Remove child process. - + 2005-01-05 Paolo Carlini <pcarlini@suse.de> * src/istream.cc (basic_istream<char>::ignore(streamsize), basic_istream<char>::ignore(streamsize, int_type), basic_istream<wchar_t>::ignore(streamsize), basic_istream<wchar_t>::ignore(streamsize, int_type)): At the end, - first check _M_gcount vs __n. + first check _M_gcount vs __n. * include/bits/istream.tcc (ignore(streamsize), ignore(streamsize, int_type)): Likewise. * testsuite/27_io/basic_istream/ignore/char/4.cc: New. @@ -1045,7 +1053,7 @@ * testsuite/27_io/objects/wchar_t/7.cc: Likewise. * testsuite/27_io/objects/wchar_t/9661-1.cc: Likewise. - * configure.ac: Check for sys/ipc.h and sys/sem.h. + * configure.ac: Check for sys/ipc.h and sys/sem.h. * config.h.in: Regenerated. * configure: Likewise. * testsuite/testsuite_hooks.cc (_GLIBCXX_SYSV_SEM): Conditionally @@ -1088,7 +1096,7 @@ basic_istream<char>::ignore(streamsize, int_type), basic_istream<wchar_t>::ignore(streamsize), basic_istream<wchar_t>::ignore(streamsize, int_type)): Avoid - _M_gcount overflows. + _M_gcount overflows. * include/bits/istream.tcc (ignore(streamsize), ignore(streamsize, int_type)): Likewise; use snextc in the main loop, consistently with the specializations above. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 2b260b2ac6d..84ed1bfdad0 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -521,8 +521,11 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} # Host includes dynamic. ${host_builddir}/c++config.h: ${top_builddir}/config.h \ ${glibcxx_srcdir}/include/bits/c++config \ - stamp-${host_alias} + stamp-${host_alias} \ + ${toplevel_srcdir}/gcc/DATESTAMP @cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\ + sed -e 's/^/#define __GLIBCXX__ /' \ + < ${toplevel_srcdir}/gcc/DATESTAMP >> $@ ;\ sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \ -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 6fbb9433714..0476f465984 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -900,8 +900,11 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} # Host includes dynamic. ${host_builddir}/c++config.h: ${top_builddir}/config.h \ ${glibcxx_srcdir}/include/bits/c++config \ - stamp-${host_alias} + stamp-${host_alias} \ + ${toplevel_srcdir}/gcc/DATESTAMP @cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\ + sed -e 's/^/#define __GLIBCXX__ /' \ + < ${toplevel_srcdir}/gcc/DATESTAMP >> $@ ;\ sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \ -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \ -e 's/VERSION/_GLIBCXX_VERSION/g' \ diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 872d78bb579..526ab8c7355 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -34,9 +34,6 @@ // Pick up any OS-specific definitions. #include <bits/os_defines.h> -// The current version of the C++ library in compressed ISO date format. -#define __GLIBCXX__ 20050316 - // Allow use of "export template." This is currently not a feature // that g++ supports. // #define _GLIBCXX_EXPORT_TEMPLATE 1 diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 3393ecb9cb5..991f1fd9795 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,11 @@ +2005-03-15 Zack Weinberg <zack@codesourcery.com> + + * README: Update. + * gcc_release: Update gcc/DEV-PHASE if that file exists, instead + of gcc/version.c. + * update_version: Handle updating gcc/DATESTAMP. + * update_web_docs: Generate gcc-vers.texi first. + 2005-03-10 Ranjit Mathew <rmathew@hotmail.com> * gcc_release (ADA_DIRS): Add "gnattools". @@ -8,7 +16,7 @@ 2004-12-30 Sebastian Pop <pop@cri.ensmp.fr> - * update_version (ADD_BRANCHES): Replace lno-branch with + * update_version (ADD_BRANCHES): Replace lno-branch with autovect-branch. 2004-09-11 Gerald Pfeifer <gerald@pfeifer.com> @@ -24,7 +32,7 @@ * gcc_release (snapshot_print): Accept arguments. Don't use echo -e. (announce_snapshot): Update for above. Don't use echo -e. - + 2004-08-03 Kelley Cook <kcook@gcc.gnu.org> * maintainer-scripts (snapshot_print): New function. @@ -84,11 +92,11 @@ * crontab: Move GCC 3.4 snapshots from Wednesday afternoon to Friday night, where gcc.gnu.org has less load. - + 2004-05-02 Gerald Pfeifer <gerald@pfeifer.com> * crontab: Adjust temporary directory used for snapshot generation. - Move GCC 3.3 snapshots to Wednesday 22:32, where gcc.gnu.org has + Move GCC 3.3 snapshots to Wednesday 22:32, where gcc.gnu.org has less load. 2004-04-19 Mark Mitchell <mark@codesourcery.com> @@ -120,7 +128,7 @@ * gcc_release (announce_snapshot): Use changedir instead of plain cd. - + 2004-02-10 Arnaud Charlet <charlet@act-europe.fr> * gcc_release: Add libada as part of ADA_DIRS. @@ -146,7 +154,7 @@ 2004-01-02 Gerald Pfeifer <gp@suse.de> * update_version: Add some documentation. - + 2004-01-02 Pop Sébastian <pop@gauvain.u-strasbg.fr> * update_version (ADD_BRANCHES): Add lno-branch. @@ -169,7 +177,7 @@ * gcc_release (build_sources): Create/update the LAST_UPDATED file in the source directory with information how sources were obtained. - + 2003-08-16 Gerald Pfeifer <gerald@pfeifer.com> * gcc_release (build_sources): Use two new variables EXPORTTAG and @@ -194,7 +202,7 @@ (BRANCH): Remove default initialization for snapshots. (CVSBRANCH): Ditto. Do not lay down a CVS tag if generating a snapshot from mainline. - + 2003-07-19 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * gcc_release (announce_snapshot): Use ${RELEASE} instead @@ -214,7 +222,7 @@ * snapshot-index.html: Ditto. 2003-07-09 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> - + * gcc_release (announce_snapshot): Add substitution of @BRANCH@ for README and index.html. Remove substitution of @LONG_DATE@. Put index.html into the respective snapshot directory. @@ -234,7 +242,7 @@ general link to the diff/ subdirectory. Mention the concrete snapshot in <title> and <h1>. Adjust links to the new location of index.html. - + 2003-07-08 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * gcc_release: Move handling of complex modes directly after @@ -266,7 +274,7 @@ * gcc_release (build_sources): Do not include gnats.html any longer. Make an error message more descriptive. - + 2003-06-25 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * gcc_release: Factor the updating of links and READMEs on the @@ -302,7 +310,7 @@ 2003-06-14 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> - * snapshot-README: Use GCC instead of gcc, C++ front end instead of + * snapshot-README: Use GCC instead of gcc, C++ front end instead of g++ language, and note that Java includes a run time. * snapshot.index.html: Ditto. @@ -313,11 +321,11 @@ 2003-05-28 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> - * snapshot-index.html: Refer to .bz2 files instead of .gz files. + * snapshot-index.html: Refer to .bz2 files instead of .gz files. Simplify the note on not using unannounced snapshots. - + 2003-05-28 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> - + * snapshot-README: Refer to .bz2 files instead of .gz files. Add a note on where to find the diff files. Simplify the note on not using unannounced snapshots. diff --git a/maintainer-scripts/README b/maintainer-scripts/README index 1735002adbc..eeffed413d8 100644 --- a/maintainer-scripts/README +++ b/maintainer-scripts/README @@ -1,6 +1,6 @@ This directory contains various files used by the gccadmin account on gcc.gnu.org, mainly for automated tasks such as the daily update of -the date in version.c. There isn't presently any scheme for files +the date in gcc/DATESTAMP. There isn't presently any scheme for files checked in here to be automatically checked out and used by gccadmin, so the files in CVS and those used by gccadmin must be kept in sync manually. diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release index f75d9befa14..51422b99af6 100755 --- a/maintainer-scripts/gcc_release +++ b/maintainer-scripts/gcc_release @@ -140,15 +140,25 @@ EOF fi done - # Update `gcc/version.c'. - for x in gcc/version.c; do - y=`basename ${x}` - (changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \ - sed -e 's|version_string\[\] = \".*\"|version_string\[\] = \"'${RELEASE}'\"|g' < ${y} > ${y}.new && \ - mv ${y}.new ${y} && \ - ${CVS} ci -m 'Update version' ${y}) || \ - error "Could not update ${x}" - done + # Update gcc/DEV-PHASE if it exists, otherwise gcc/version.c. + + if [ -f ${SOURCE_DIRECTORY}/gcc/DEV-PHASE ]; then + [ `cat ${SOURCE_DIRECTORY}/gcc/BASE-VER` = ${RELEASE} ] || \ + error "Release number ${RELEASE} does not match BASE-VER" + (changedir ${SOURCE_DIRECTORY}/gcc && \ + : > DEV-PHASE && \ + ${CVS} ci -m 'Mark as release' DEV-PHASE) || \ + error "Could not update DEV-PHASE" + else + for x in gcc/version.c; do + y=`basename ${x}` + (changedir `dirname ${SOURCE_DIRECTORY}/${x}` && \ + sed -e 's|version_string\[\] = \".*\"|version_string\[\] = \"'${RELEASE}'\"|g' < ${y} > ${y}.new && \ + mv ${y}.new ${y} && \ + ${CVS} ci -m 'Update version' ${y}) || \ + error "Could not update ${x}" + done + fi # Make sure we tag the sources for a final release. TAG="gcc_`echo ${RELEASE} | tr . _`_release" diff --git a/maintainer-scripts/update_version b/maintainer-scripts/update_version index ba05fe58f48..47109bd7464 100755 --- a/maintainer-scripts/update_version +++ b/maintainer-scripts/update_version @@ -36,6 +36,11 @@ textstring_FILES="gcc/gcc/version.c" # version is contained within a #define cppdefine_FILES="gcc/libstdc++-v3/include/bits/c++config" +# version is all there is +datestamp_FILES="gcc/gcc/DATESTAMP" + +FILES="$textstring_FILES $cppdefine_FILES $datestamp_FILES" + # Assume all will go well. RESULT=0 @@ -45,9 +50,9 @@ for BRANCH in $BRANCHES; do # you check out files with -r HEAD, CVS will not let you check # in changes. if test "$BRANCH" = HEAD; then - ${CVS} co $textstring_FILES $cppdefine_FILES + ${CVS} co $FILES else - ${CVS} co -r $BRANCH $textstring_FILES $cppdefine_FILES + ${CVS} co -r $BRANCH $FILES fi # There are no files to commit yet. @@ -81,6 +86,19 @@ for BRANCH in $BRANCHES; do fi done + for file in $datestamp_FILES; do + if test -f $file; then + echo ${CURR_DATE} > $file.new + + if /usr/bin/cmp -s $file $file.new; then + rm -f $file.new + else + mv -f $file.new $file + COMMIT_FILES="$COMMIT_FILES $file" + fi + fi + done + if test -n "$COMMIT_FILES" \ && ! ${CVS} commit -m "Daily bump." $COMMIT_FILES; then # If we could not commit the files, indicate failure. diff --git a/maintainer-scripts/update_web_docs b/maintainer-scripts/update_web_docs index e22779c7bcc..d7b3da116fd 100755 --- a/maintainer-scripts/update_web_docs +++ b/maintainer-scripts/update_web_docs @@ -88,7 +88,7 @@ find $CVSROOT/gcc -name \*.texi,v -print | fgrep -v -f/home/gccadmin/scripts/doc # Checkout all the texi files. -cvs -Q export -r$RELEASE `cat FILES` gcc/gcc/doc/install.texi2html gcc/gcc/doc/include/texinfo.tex gcc/gcc/ada/xgnatugn.adb gcc/gcc/ada/ug_words +cvs -Q export -r$RELEASE `cat FILES` gcc/gcc/doc/install.texi2html gcc/gcc/doc/include/texinfo.tex gcc/gcc/ada/xgnatugn.adb gcc/gcc/ada/ug_words gcc/gcc/BASE-VER gcc/gcc/DEV-PHASE # Build a tarball of the sources. tar cf docs-sources.tar gcc @@ -107,6 +107,16 @@ if [ -f gcc/gcc/ada/xgnatugn.adb ]; then gcc/gcc/ada/ug_words gnat_ugn_unw.texi fi +# Generate gcc-vers.texi. +( + echo "@set version-GCC $(cat gcc/gcc/BASE-VER)" + if "$(cat gcc/gcc/DEV-PHASE)" = "experimental"; then + echo "@set DEVELOPMENT" + else + echo "@clear DEVELOPMENT" + fi +) > $includedir/gcc-vers.texi + # Now convert the relevant files from texi to HTML and PostScript. for file in $MANUALS; do filename=`find . -name ${file}.texi` |