Commit Graph

36005 Commits

Author SHA1 Message Date
Jeremy Nimmer
e2a6abb6d5 For PR libgcj/3523:
2001-07-01  Jeremy Nimmer  <jwnimmer@alum.mit.edu>

	For PR libgcj/3523:
	* java/io/LineNumberReader.java (reset): Pass correct arguments to
	countLines.

From-SVN: r43683
2001-07-02 05:16:24 +00:00
Richard Kenner
21266f819a c-common.c (decl_attributes, [...]): Don't call layout_decl for FIELD_DECL.
* c-common.c (decl_attributes, case A_MODE): Don't call layout_decl
	for FIELD_DECL.

From-SVN: r43682
2001-07-01 19:23:28 -04:00
Geoffrey Keating
1cc5e43240 tm.texi (FUNCTION_ARG): Document that the last call is special.
* doc/tm.texi (FUNCTION_ARG): Document that the last call
	is special.

From-SVN: r43681
2001-07-01 23:21:11 +00:00
Mark Mitchell
c54b0a5e4b expr.c (expand_expr, [...]): Correct check for side-effects in the value of an array element.
* expr.c (expand_expr, case ARRAY_REF): Correct check for
	side-effects in the value of an array element.

From-SVN: r43680
2001-07-01 20:50:03 +00:00
Toon Moene
074919faea fio.h: Include <sys/types.h> for off_t.
2001-07-01  Toon Moene  <toon@moene.indiv.nluug.nl>

	* libI77/fio.h: Include <sys/types.h> for off_t.

From-SVN: r43678
2001-07-01 20:19:33 +00:00
Nathan Sidwell
3746c4a2d6 tlink.c (recompile_files): Remove COMPILER_PATH and LIBRARY_PATH from the environment.
* tlink.c (recompile_files): Remove COMPILER_PATH and
	LIBRARY_PATH from the environment.

From-SVN: r43677
2001-07-01 20:01:47 +00:00
Michael Chamberlain
809353e149 mg.exp (compiler_output): Support tcl 8.3.1.
2000-09-10  Michael Chamberlain <michael@chamberlain.net.au>

	* gcc.misc-tests/mg.exp (compiler_output): Support tcl 8.3.1.

From-SVN: r43675
2001-07-01 18:55:46 +00:00
Zack Weinberg
b8363a243d c-common.h (enum rid): Add RID_FIRST_AT, RID_LAST_AT, RID_LAST_PQ.
* c-common.h (enum rid): Add RID_FIRST_AT, RID_LAST_AT,
	RID_LAST_PQ.  Move RID_FIRST_PQ down with the other FIRST/LAST
	enumerators.
	(OBJC_IS_AT_KEYWORD, OBJC_IS_PQ_KEYWORD): New macros.

	* c-parse.in (OBJC_STRING): Kill.
	(objc_string): Decompose to [objc_string] '@' STRING.
	(reswords): Take the leading '@' off all the Objective C keywords.
	(objc_rid_sans_at): Kill.
	(init_reswords): Don't initialize it.
	(yylexname): Use OBJC_IS_AT_KEYWORD and OBJC_IS_PQ_KEYWORD.
	(_yylex): Kill reconsider label.  Look ahead one token after
	an '@'; if we get an identifier, check whether it's an
	Objective C @-keyword.  If so, return the keyword.  Otherwise,
	put back the token and return the '@' as a terminal.

	* cpplib.c (lex_macro_node): Remove unnecessary check for
	leading '@' on identifier.  Clarify control flow and commentary.

From-SVN: r43674
2001-07-01 18:48:13 +00:00
Richard Kenner
128e8aa952 Minor comment and whitespace changes
From-SVN: r43673
2001-07-01 12:50:11 -04:00
Richard Kenner
be8ac49a3e cse.c (new_label_ref): Variable deleted.
* cse.c (new_label_ref): Variable deleted.
	(insert): Remove set of new_label_ref.
	(check_for_label_ref): New function.
	(cse_basic_block): Don't check new_label_ref; call check_for_label_ref.

From-SVN: r43672
2001-07-01 11:52:26 -04:00
Richard Kenner
b987f23731 Trivial whitespace changes
From-SVN: r43671
2001-07-01 09:34:02 -04:00
Toon Moene
cf382a9154 fio.h: Use off_t when appropriate.
2001-07-01  Toon Moene  <toon@moene.indiv.nluug.nl>
            Pedro Vazquez  <vazquez@penelope.iqm.unicamp.br>

	* libI77/fio.h: Use off_t when appropriate.
	* libI77/backspace.c (f_back): Ditto.
	* libI77/endfile.c (t_runc): Ditto.
	* libI77/err.c (f__nowreading): Ditto.
	* libI77/ftell_.c (unit_chk): Ditto.
	* libI77/sue.c (global f__recloc, s_wsue): Ditto.

Co-Authored-By: Pedro Vazquez <vazquez@penelope.iqm.unicamp.br>

From-SVN: r43670
2001-07-01 13:18:08 +00:00
Zoltan Felleg
e514984118 * warn_summary: Fix typo in a comment.
From-SVN: r43669
2001-07-01 10:25:32 +00:00
GCC Administrator
80617fee7e Daily bump.
From-SVN: r43668
2001-07-01 07:16:41 +00:00
Zack Weinberg
b3da804c23 * ns32k.md: Remove stray backslash-newline in output template.
From-SVN: r43666
2001-06-30 18:07:44 +00:00
Zack Weinberg
1f3b37a3d5 rtl.def (DEFINE_INSN, [...]): Change output-template slot to format 'T'.
* rtl.def (DEFINE_INSN, DEFINE_INSN_AND_SPLIT, DEFINE_PEEPHOLE):
	Change output-template slot to format 'T'.
	* rtl.h (XTMPL): New.
	* read-rtl.c (read_escape): New function.
	(read_quoted_string, read_braced_string): Use it.
	(read_rtx): Set star_if_braced from the format string.
	Use XTMPL where appropriate.
	* genoutput.c (gen_insn, gen_peephole): Use XTMPL to get the
	template string.

	* rtl.c: Include errors.h for sake of rtl_check_failed* routines.
	Document 'T' in rtx format strings.
	* Makefile.in (rtl.o, $(HOST_PREFIX_1)rtl.o): Depend on errors.h.
	* errors.c (internal_error): Add missing ": " at end of string.

	* i860.md: Change triple backslashes to double backslashes at
	ends of lines in output templates.

From-SVN: r43665
2001-06-30 17:23:53 +00:00
Nick Clifton
07804c3b7d Append a DIR_SEPARATOR to a path specified by the -B switch, if doing so would
create a valid directory name.

From-SVN: r43664
2001-06-30 08:46:31 +00:00
GCC Administrator
bc2fa2fd2e Daily bump.
From-SVN: r43663
2001-06-30 07:17:41 +00:00
Benjamin Kosnik
13f83598b3 locale_facets.tcc (locale::combine): Clone _Impl.
2001-06-29  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/locale_facets.tcc (locale::combine): Clone _Impl.
	before replacing facet.
	* include/bits/localefwd.h (locale::_Impl::_M_remove_reference):
	Correct decrement.
	* src/localename.cc (locale::_Impl): Correct ctor initialization
	lists. Initialize ref count with one. Simplify.
	* src/locale.cc: Add comment.
	* testsuite/22_locale/numpunct.cc (test01): Add derivation test.
	* testsuite/22_locale/numpunct_char_members.cc (test01): Add tests.
	* testsuite/22_locale/members.cc (test02): Fix.

From-SVN: r43661
2001-06-30 04:35:49 +00:00
Jeffrey A Law
8f1ae09ac2 gcc.texi (Passes): Update due to recent -fdce -> -fssa-dce changes.
* gcc.texi (Passes): Update due to recent -fdce -> -fssa-dce
        changes.  Fix documentation for SSA DCE pass.

From-SVN: r43660
2001-06-29 16:04:40 -06:00
DJ Delorie
9199d62b82 simplify-rtx.c (simplify_subreg): When simplifying a CONCAT...
* simplify-rtx.c (simplify_subreg): When simplifying a CONCAT, at
least get rid of the CONCAT if we can't simplify further.

From-SVN: r43659
2001-06-29 17:15:01 -04:00
Jeffrey A Law
62d285ff3a ssa-dce.c (ssa_eliminate_dead_code): Renamed from eliminate_date_code.
* ssa-dce.c (ssa_eliminate_dead_code): Renamed from
        eliminate_date_code.
        * ssa.h (ssa_eliminate_dead_code): Corresponding changes.
        * timevar.def (TV_SSA_DCE): Renamed from TV_DEAD_CODE_ELIM.
        * toplev.c (DFI_ssa_dce): Renamed from DFI_dce.
        (dump_file_info): Similar changes.
        (flag_ssa_dce): Similarly
        (f_options): Similar changes.
        (rest_of_compilation): Corresponding changes.
        * doc/invoke.texi: Update as option is now -fssa-dce instead
        of -fdce.  Update dump file name.

From-SVN: r43658
2001-06-29 14:35:53 -06:00
Jeffrey A Law
8f2f6da110 ssa-dce.c (note_inherently_necessary_set): New function.
* ssa-dce.c (note_inherently_necessary_set): New function.
        (find_inherently_necessary): Use it.  Do not consider
        NOTEs, CODE_LABELs or BARRIERS are necessary.  Improve
        handling of asms and unspecs.
        (delete_insn_bb): Only delete INSNs, CALL_INSNs or JUMP_INSNs.

From-SVN: r43656
2001-06-29 12:26:21 -06:00
Joseph Myers
8d8e52be8a target.h (struct gcc_target): Add comp_type_attributes and set_default_type_attributes.
* target.h (struct gcc_target): Add comp_type_attributes and
	set_default_type_attributes.
	* target-def.h (TARGET_COMP_TYPE_ATTRIBUTES,
	TARGET_SET_DEFAULT_TYPE_ATTRIBUTES): Define.
	(TARGET_INITIALIZER): Update.
	* doc/tm.texi (COMP_TYPE_ATTRIBUTES, TARGET_COMP_TYPE_ATTRIBUTES,
	SET_DEFAULT_TYPE_ATTRIBUTES, TARGET_SET_DEFAULT_TYPE_ATTRIBUTES):
	Update documentation of old target macros to describe new target
	hooks.
	* tree.c (make_node): Use target.set_default_type_attributes.
	(default_comp_type_attributes,
	default_set_default_type_attributes): New functions.
	* tree.h (default_comp_type_attributes,
	default_set_default_type_attributes): Declare.
	* c-typeck.c (COMP_TYPE_ATTRIBUTES): Don't define.
	(comptypes): Use target.comp_type_attributes.
	* config/arc/arc-protos.h, config/arc/arc.c, config/arc/arc.h
	(arc_comp_type_attributes, arc_set_default_type_attributes,
	COMP_TYPE_ATTRIBUTES, SET_DEFAULT_TYPE_ATTRIBUTES): Remove
	functions and macros with default behaviour.
	* config/m32r/m32r-protos.h, config/m32r/m32r.c,
	config/m32r/m32r.h (m32r_comp_type_attributes,
	m32r_set_default_type_attributes, COMP_TYPE_ATTRIBUTES,
	SET_DEFAULT_TYPE_ATTRIBUTES): Likewise.
	* config/m68hc11/m68hc11-protos.h, config/m68hc11/m68hc11.c,
	config/m68hc11/m68hc11.h (m68hc11_comp_type_attributes,
	m68hc11_set_default_type_attributes, COMP_TYPE_ATTRIBUTES,
	SET_DEFAULT_TYPE_ATTRIBUTES): Likewise.
	* config/ns32k/ns32k-protos.h, config/ns32k/ns32k.c,
	config/ns32k/ns32k.h (ns32k_comp_type_attributes,
	COMP_TYPE_ATTRIBUTES): Likewise.
	* config/rs6000/rs6000-protos.h, config/rs6000/rs6000.c,
	config/rs6000/rs6000.h (rs6000_comp_type_attributes,
	rs6000_set_default_type_attributes, COMP_TYPE_ATTRIBUTES,
	SET_DEFAULT_TYPE_ATTRIBUTES): Likewise.
	* config/d30v/d30v.h (COMP_TYPE_ATTRIBUTES,
	SET_DEFAULT_TYPE_ATTRIBUTES): Remove commented out macro
	definitions.
	* config/i386/i386.h (SET_DEFAULT_TYPE_ATTRIBUTES): Likewise.
	* config/ns32k/ns32k.h (SET_DEFAULT_TYPE_ATTRIBUTES): Likewise.
	* config/arm/arm.c (arm_comp_type_attributes,
	arm_set_default_type_attributes): Make static.
	(TARGET_COMP_TYPE_ATTRIBUTES, TARGET_SET_DEFAULT_TYPE_ATTRIBUTES):
	Define.
	* config/arm/arm.h (COMP_TYPE_ATTRIBUTES,
	SET_DEFAULT_TYPE_ATTRIBUTES): Don't define.
	* config/arm/arm-protos.h (arm_comp_type_attributes,
	arm_set_default_type_attributes): Don't declare.
	* config/i386/i386.c (ix86_comp_type_attributes): Make static.
	(TARGET_COMP_TYPE_ATTRIBUTES): Define.
	* config/i386/i386.h (COMP_TYPE_ATTRIBUTES): Don't define.
	* config/i386/i386-protos.h (ix86_comp_type_attributes): Don't
	declare.

cp:
	* typeck.c (COMP_TYPE_ATTRIBUTES): Don't define.
	(comptypes): Use target.comp_type_attributes.

From-SVN: r43655
2001-06-29 18:21:16 +01:00
Daniel Berlin
8440bf4367 dwarf2.h: Add dwarf 2.1 tags/attributes/etc to the enums.
2001-06-28  Daniel Berlin  <dan@cgsoftware.com>

	* dwarf2.h: Add dwarf 2.1 tags/attributes/etc to the enums.

From-SVN: r43654
2001-06-29 16:52:08 +00:00
Nathan Sidwell
5a0db1930a * cp-tree.h (flag_dump_class_layout): Remove unneeded declaration.
From-SVN: r43653
2001-06-29 14:10:31 +00:00
GCC Administrator
b669108540 Daily bump.
From-SVN: r43652
2001-06-29 07:16:59 +00:00
Jan van Male
35d6d8c165 Also, fix formatting problem in previous ChangeLog commit.
2001-06-28  Jan van Male  <jan.vanmale@fenk.wau.nl>

	* predict.c (dump_prediction): Eliminate fprintf warning.

From-SVN: r43650
2001-06-29 00:46:11 -04:00
Diego Novillo
b02c22542a flow.c (dump_bb): Remove unused third argument to call to fprintf when...
2001-06-28  Diego Novillo  <dnovillo@redhat.com>

      * flow.c (dump_bb): Remove unused third argument to call
      to fprintf when displaying the basic block header.

From-SVN: r43649
2001-06-28 23:30:17 -04:00
Jeff Law
10c4b247fd Makefile.in (OBJS): Add df.o
* Makefile.in (OBJS): Add df.o
        (df.o): Add dependencies.
        * basic-block.h (flow_depth_first_order_compute): Declare.
        * flow.c (flow_depth_first_order_compute): No longer declare.
        Make external.
        * df.c, df.h: New files.
	* po/POTFILES.in: Update for new files.

From-SVN: r43647
2001-06-28 16:11:19 -06:00
Zack Weinberg
0f40f9f7c6 i386.md: Global update to use new string syntax where it will improve readability.
* config/i386/i386.md: Global update to use new string syntax
	where it will improve readability.  Warning fixes:
	(*truncdfsf2_2): Abort if which_alternative is not 0 or 1.
	(*adddi_1_rex64, *adddi_2_rex64, *adddi_3_rex64,
	*adddi_4_rex64, *adddi_5_rex64): Cast 1 to unsigned int.

	* read-rtl.c: Syntactic sugar for C embedded in strings in
	machine descriptions.
	(read_string): Break inner loop into separate function.  Takes
	an int.  Dispatch to read_quoted_string or read_braced_string
	as appropriate.  Automatically insert a leading star on braced
	strings if STAR_IF_BRACED is true.
	(read_quoted_string, read_braced_string): New functions.
	* doc/rtl.texi, doc/md.texi: Document new syntax.  Update
	examples to match.

	* rtl.c: Split RTL reader (read_rtx, read_skip_spaces,
	traverse_md_constants, fatal_with_file_and_line,
	fatal_expected_char, read_name, read_string, def_hash,
	def_name_eq_p, read_constants, and related data) to its own
	file.  Weed out now-unnecessary #includes.
	* read-rtl.c: New file.
	* Makefile.in (HOST_RTL): Add read-rtl.o.
	(read-rtl.o): New rule.
	(rtl.o, $(HOST_PREFIX_1)rtl.o): Update dependencies.
	* doc/gcc.texi (Passes): Talk briefly about the support
	library used by genfoo.
	* doc/rtl.texi (Reading RTL): read_rtx is not available in the
	compiler itself.

From-SVN: r43646
2001-06-28 21:50:09 +00:00
Stan Shebs
0168a84948 darwin.h (REGISTER_TARGET_PRAGMAS): Define.
* config/darwin.h (REGISTER_TARGET_PRAGMAS): Define.
        * config/darwin-c.c: New file.
        * config/darwin-protos.h: Declare new functions.
        * config/rs6000/t-darwin (darwin-c.o): New rule.
        * config.gcc (powerpc-*-darwin*): Define c_target_objs and
        cxx_target_objs.
        * doc/extend.texi (Pragmas): New section.

        * gcc.dg/pragma-darwin.c: New test.

From-SVN: r43645
2001-06-28 19:55:53 +00:00
Tom Tromey
d475215a7b re PR java/3441 (fastjar zlib)
* configure: Rebuilt.
	* configure.in: Accept --with-system-zlib.  Fixes PR java/3441.

From-SVN: r43644
2001-06-28 19:42:24 +00:00
Jeffrey A Law
fa2eec9a67 ssa-dce.c (eliminate_dead_code): Properly handle control dependencies implied by PHI nodes.
* ssa-dce.c (eliminate_dead_code): Properly handle control
        dependencies implied by PHI nodes.

From-SVN: r43643
2001-06-28 12:24:55 -06:00
Jan Hubicka
7a442791bb flow.c (try_merge_block): Rename to try_optimize_cfg; do basic simplifications on the CFG.
* flow.c (try_merge_block): Rename to try_optimize_cfg;
	do basic simplifications on the CFG.
	(is_forwarder_block_p, can_fallthru, try_redirect_by_replacing_jump,
	 try_simplify_condjump): New.
	(redirect_edge_and_branch): Try replace jump insn.
	(flow_delete_insn): Handle deleting of ADDR_VEC insns.

	* basic-block.h (FALLTHRU_EDGE, BRANCH_EDGE): New macros.

From-SVN: r43642
2001-06-28 18:14:05 +00:00
Jeffrey A Law
d72c3ec3f6 ssa-dce.c (eliminate_dead_code): Remove fake edges from the CFG after dead code elimination is complete.
* ssa-dce.c (eliminate_dead_code): Remove fake edges from the
        CFG after dead code elimination is complete.

From-SVN: r43641
2001-06-28 11:18:36 -06:00
Rainer Orth
f4b20cd963 gthr-posix.h [LIBOBJC]: Add weak definitions of sched_get_priority_max, sched_get_priority_min.
* gthr-posix.h [LIBOBJC]: Add weak definitions of
        sched_get_priority_max, sched_get_priority_min.

        testsuite:
        * lib/objc.exp (objc_target_compile): Don't need -lposix4 on any
        Solaris 2.[678] system.

From-SVN: r43640
2001-06-28 12:57:55 +00:00
Gabriel Dos Reis
46f018e138 diagnostic.c (default_print_error_function): Tweak.
* diagnostic.c (default_print_error_function): Tweak.
	(report_error_function): Likewise.
	* toplev.h (default_print_error_function): Move to...
	* diagnostic.h: ...here. Add a `diagnostic_context *' parameter.
	* tree.h (print_error_function): Move to...
	* diagnostic.h: ...here. Add a `diagnostic_context *' parameter.

ch/

	* lang.c: #include diagnostic.h
	(chill_print_error_function): Add a dummy `diagnostic_context *'.
	* Makefile.in (lang.o): Depend on diagnostic.h

cp/

	* error.c (lang_print_error_function): Add a `diagnostic_context *'
	parameter. Tweak.

f/

	* Make-lang.in (f/com.o): Depend on diagnostic.h
	* com.c: #include diagnostic.h
	(lang_print_error_function): Take a 'diagnostic_context *'.

java/

	* lang.c: #include diagnostic.h
	(lang_print_error): Add a `diagnostic_context *' parameter.
	(java_dummy_print): Likewise.
	* Make-lang.in (JAVA_LEX_C): Depend on diagnostic.h

From-SVN: r43638
2001-06-28 12:26:38 +00:00
Richard Kenner
eeb35b4552 expr.c (expand_assignment): When have varying-length object, make MEM a BLKmode.
* expr.c (expand_assignment): When have varying-length object,
	make MEM a BLKmode.
	(expand_expr, case ADDR_EXPR): Use SAVE_EXPR_RTL after putting
	SAVE_EXPR stack in case we had a SUBREG.

From-SVN: r43637
2001-06-28 06:16:03 -04:00
Jan Hubicka
b9b2c33963 i386.md (cmp?i): Simplify; refuse immediate operand in alternative 0
* i386.md (cmp?i): Simplify; refuse immediate operand
	in alternative 0
	* i386.c (cmpsi_operand): Refuse constants.

	* i386.md (movsi_insv_1, movsi_insv_1_rex64): Allow immediate operand.

	* flow.c (block_label, redirect_edge_and_branch): Split out from ....
	(split_edge) .... here;

From-SVN: r43635
2001-06-28 08:44:16 +00:00
GCC Administrator
72beea5653 Daily bump.
From-SVN: r43630
2001-06-28 07:16:17 +00:00
Neil Booth
9959db6d6b i386.c (ix86_valid_type_attribute_p): Give external linkage, move declaration to...
* i386/i386.c (ix86_valid_type_attribute_p): Give external
	linkage, move declaration to...
	* i386/i386-protos.h: ...here.

From-SVN: r43629
2001-06-28 06:27:27 +00:00
H.J. Lu
d920e82592 Add CFLAGS_FOR_BUILD for canadian cross build.
From-SVN: r43628
2001-06-27 21:38:51 -07:00
Jim Wilson
09482e0de5 Fix ia64-linux bootstrap failure.
* emit-rtl.c (gen_highpart): Call validize_mem.

From-SVN: r43627
2001-06-27 20:52:28 -07:00
Bruce Korb
eb5593634b inline pow fix/PTHREAD_*_INITIALIZER for Solaris/UW7 Byteorder.h search problem
From-SVN: r43623
2001-06-28 03:13:49 +00:00
Stan Shebs
f60b945b39 objc-act.c (handle_impent): Rewrite to be more portable and to use ASM_DECLARE_CLASS_REFERENCE.
* objc/objc-act.c (handle_impent): Rewrite to be more portable
        and to use ASM_DECLARE_CLASS_REFERENCE.
        * config/darwin.h (ASM_DECLARE_CLASS_REFERENCE): Rename from
        undocumented DECLARE_CLASS_REFERENCE, add file argument.
        * doc/tm.texi (ASM_DECLARE_CLASS_REFERENCE): Document.

From-SVN: r43622
2001-06-28 01:34:25 +00:00
Jeffrey A Law
b42abad88a simplify-rtx.c (simplify_rtx): Canonicalize commutative expressions by putting complex operands first and...
* simplify-rtx.c (simplify_rtx): Canonicalize commutative expressions
        by putting complex operands first and constants second.

From-SVN: r43621
2001-06-27 18:14:23 -06:00
Tom Tromey
6dc04dec65 IOConverter.java: Manually maintained alias now lowercase.
* gnu/gcj/convert/IOConverter.java: Manually maintained alias now
	lowercase.

From-SVN: r43620
2001-06-27 21:56:08 +00:00
Alexandre Petit-Bianco
4a70e37e75 class.c (set_super_info): Call `set_class_decl_access_flags.'
2001-06-27  Alexandre Petit-Bianco  <apbianco@redhat.com>

	* class.c (set_super_info): Call `set_class_decl_access_flags.'
	(set_class_decl_access_flags): New function.
	* java-tree.h (set_class_decl_access_flags): New prototype.
	* jcf-parse.c (handle_innerclass_attribute): Read and set access flags.
	(parse_class_file): New local `decl_max_locals.' Take wide types
	into account to compute DECL_MAX_LOCALS.
	* parse.y (type_import_on_demand_declaration:): Ignore duplicate
	imports on demand.

(http://gcc.gnu.org/ml/gcc-patches/2001-06/msg01718.html )

From-SVN: r43618
2001-06-27 13:38:20 -07:00
Neil Booth
af27aff6ae * tm.texi: Remove merge conflicts.
From-SVN: r43617
2001-06-27 19:33:17 +00:00