Commit Graph

99009 Commits

Author SHA1 Message Date
Jason Merrill
bff0b1a6df re PR c++/43502 ([C++0x] uninitialised read in grokfndecl() with lambda functions cause -fcompare-debug failures)
PR c++/43502
	* parser.c (make_declarator): Initialize id_loc.
	(cp_parser_lambda_declarator_opt): And set it.

From-SVN: r157701
2010-03-24 12:49:06 -04:00
Martin Jambor
1e06efb6eb ipa-1.c: Delete trailing spaces, put the call to f into a loop.
2010-03-24  Martin Jambor  <mjambor@suse.cz>

	* gcc.dg/ipa/ipa-1.c: Delete trailing spaces, put the call to f into
	a loop.	
	* gcc.dg/ipa/ipa-2.c: Likewise.
	* gcc.dg/ipa/ipa-3.c: Likewise.
	* gcc.dg/ipa/ipa-4.c: Likewise.
	* gcc.dg/ipa/ipa-5.c: Likewise.
	* gcc.dg/ipa/ipa-7.c: Likewise.
	* gcc.dg/ipa/ipa-6.c: Delete trailing spaces, put the call to foo into
	a loop.
	* gcc.dg/ipa/ipacost-2.c: Delete trailing spaces, put the call to
	i_can_not_be_propagated_fully2 into a loop.
	* gcc.dg/ipa/ipa-8.c: New test.
	* g++.dg/ipa/iinline-1.C: Put the call to docalling into a loop.

From-SVN: r157698
2010-03-24 17:26:52 +01:00
Mike Stump
b98aa20c89 re PR java/43504 (many libjava testsuite regressions on x86_64-apple-darwin10)
PR java/43504
	Revert fix for PR target/33120.

From-SVN: r157697
2010-03-24 16:07:51 +00:00
Jakub Jelinek
d0ed412a96 re PR debug/19192 (Current development gcc generates inaccurate line info for example code)
PR debug/19192
	PR debug/43479
	* cfgexpand.c (gimple_assign_rhs_to_tree): Also set TREE_BLOCK
	from gimple_block.
	* expr.c (expand_expr_real): Restore previous
	curr_insn_source_location and curr_insn_block after
	expand_expr_real_1 call.
	(expand_expr_real_1) <case SSA_NAME>: Call expand_expr_real
	instead of expand_expr_real_1.

	* gcc.dg/guality/pr43479.c: New test.
	* gcc.dg/debug/dwarf2/inline2.c (third): Make a a global var
	and add volatile keyword.

From-SVN: r157693
2010-03-24 14:41:30 +01:00
Mike Stump
012cd3b6b5 * g++.dg/warn/Wstrict-aliasing-float-ref-int-obj.C: Enhance portability.
From-SVN: r157690
2010-03-24 03:04:16 +00:00
Jason Merrill
5c3bacee38 * g++.dg/ext/altivec-17.C: Adjust error message.
From-SVN: r157689
2010-03-23 22:49:55 -04:00
GCC Administrator
9b3dcf1f8c Daily bump.
From-SVN: r157688
2010-03-24 00:16:57 +00:00
Jason Merrill
c6be04ad92 Make lambda conversion op and op() non-static.
* semantics.c (maybe_add_lambda_conv_op): Make non-static.
	Also add the thunk function returned by the conversion op.
	Mark the conversion deleted if the op() is variadic.
	* decl2.c (mark_used): Give helpful message about deleted conversion.
	* parser.c (cp_parser_lambda_declarator_opt): Don't make op() static.
	* semantics.c (finish_this_expr): Adjust.
	* mangle.c (write_closure_type_name): Adjust.
	* decl.c (grok_op_properties): Don't allow it.
	* call.c (build_user_type_conversion_1): No static conversion ops.
	(build_op_call): Or op().

	* decl2.c (change_return_type): Fix 'this' quals.

From-SVN: r157681
2010-03-23 18:29:53 -04:00
Mike Stump
5b5cfcb3b8 re PR target/33120 (Data not put in BSS section on Mac OS)
PR target/33120
	* config/darwin.h (ASM_OUTPUT_ALIGNED_BSS): Add.
	* config/darwin.c (darwin_output_aligned_bss): Add.
	* config/darwin-protos.h: Add darwin_output_aligned_bss.

testsuite:
	* g++.dg/ext/instantiate2.C: Update for .zerofill as it doesn't
	follow the usual conventions for symbol definitions.
	* gcc.target/i386/darwin-zerofill.c: Add.

From-SVN: r157677
2010-03-23 20:02:57 +00:00
Vladimir Makarov
478ab26ded re PR rtl-optimization/43413 (Powerpc generates worse code for -mvsx on gromacs even though there are no VSX instructions used)
2010-03-23  Vladimir Makarov  <vmakarov@redhat.com>

	PR rtl-optimization/43413
	* ira-color.c (setup_allocno_available_regs_num): Count prohibited
	hard regs too.

From-SVN: r157676
2010-03-23 19:18:42 +00:00
Joseph Myers
b42f0d7e1f configure.ac (tic6x-*-*): New case.
* configure.ac (tic6x-*-*): New case.
	* configure: Regenerate.

From-SVN: r157675
2010-03-23 16:04:30 +00:00
Joseph Myers
4be9a9400b * symcat.h (CONCAT5, CONCAT6, XCONCAT5, XCONCAT6): Define.
From-SVN: r157674
2010-03-23 15:58:01 +00:00
Paolo Carlini
54add74038 testsuite_tr1.h (NType, [...]): Add.
2010-03-23  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/util/testsuite_tr1.h (NType, TType, SLType, PODType): Add.
	* testsuite/20_util/is_trivial/value.cc: Adjust.
	* testsuite/20_util/is_standard_layout/value.cc: Likewise.
	* testsuite/20_util/is_pod/value.cc: Likewise.

From-SVN: r157673
2010-03-23 15:20:29 +00:00
Paolo Carlini
e0e3300cb1 value.cc: New.
2010-03-23  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/20_util/is_trivial/value.cc: New.
	* testsuite/20_util/is_standard_layout/value.cc: Likewise.
	* testsuite/20_util/is_pod/value.cc: Extend.

From-SVN: r157671
2010-03-23 15:03:50 +00:00
Kai Tietz
d85b51449b mh-mingw: Revert accidentally checking r156315.
2010-03-23  Kai Tietz  <kai.tietz@onevision.com>

        * mh-mingw: Revert accidentally checking r156315.

From-SVN: r157669
2010-03-23 15:48:08 +01:00
Paolo Carlini
7c8420560b stl_algobase.h (lower_bound(_ForwardIterator, _ForwardIterator, const _Tp&, _Compare)): Move...
2010-03-23  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/stl_algobase.h (lower_bound(_ForwardIterator,
	_ForwardIterator, const _Tp&, _Compare)): Move...
	* include/bits/stl_algo.h: ... here.

From-SVN: r157668
2010-03-23 14:32:35 +00:00
Joseph Myers
0d1152b152 config.sub: Update to version 2010-03-22.
* config.sub: Update to version 2010-03-22.
	* config.guess: Update to version 2009-12-30.

From-SVN: r157667
2010-03-23 14:26:40 +00:00
H.J. Lu
1ab71299a5 Fix stdlib.h for mingw.
2010-03-23  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/40722
	* mkfixinc.sh: Fix stdlib.h for mingw.

From-SVN: r157665
2010-03-23 06:24:37 -07:00
Eric Botcazou
6644642ef7 Fix long lines
From-SVN: r157664
2010-03-23 12:13:00 +00:00
Dave Korn
c3ef5633d9 Fixed incorrect formatting of previous ChangeLog entry. Obvious.
From-SVN: r157663
2010-03-23 05:39:39 +00:00
Dave Korn
1922295935 re PR libobjc/30445 (Fix for FIXME in gcc-4_2-branch/libobjc/Makefile.in)
PR libobjc/30445
	* configure.ac (extra_ldflags_libobjc): Define appropriately for
	Cygwin and MinGW hosts.
	* Makefile.am (libobjc_s.a): Remove dead pre-libtool target.
	(libobjc.dll): Likewise.
	* configure: Regenerate.

From-SVN: r157662
2010-03-23 05:05:35 +00:00
Mike Stump
d79238bcd6 Fix indentation.
From-SVN: r157661
2010-03-23 01:38:14 +00:00
James E. Wilson
67b476d1b8 re PR target/43348 (ICE in final_scan_insn, at final.c:2604)
PR target/43348
* ia64.md (call_nogp, call_value_nogp, sibcall_nogp, call_gp,
call_value_gp,sibcall_gp): Use 's' constraint not 'i'.

From-SVN: r157660
2010-03-22 18:22:28 -07:00
GCC Administrator
6aabea284f Daily bump.
From-SVN: r157658
2010-03-23 00:16:49 +00:00
H.J. Lu
99eaa2e703 Add -mfma to ix86_target_string.
2010-03-22  H.J. Lu  <hongjiu.lu@intel.com>

	* config/i386/i386.c (ix86_target_string): Fix a typo in
	comments.  Add -mfma.

From-SVN: r157655
2010-03-22 16:17:09 -07:00
Mike Stump
212066e660 re PR target/23071 (Darwin alignment ignores "attribute packed" for first 'double' element of a struct)
PR target/23071
	* config/rs6000/rs6000.c (darwin_rs6000_special_round_type_align):
	Don't overly align based upon packed packed fields.

From-SVN: r157654
2010-03-22 23:13:10 +00:00
Jason Merrill
cc72bbaac7 re PR c++/43333 (__is_pod seems broken)
PR c++/43333
	* tree.c (pod_type_p): Use old meaning in C++98 mode.

From-SVN: r157652
2010-03-22 16:38:57 -04:00
Jason Merrill
189327376c re PR c++/43281 ([c++0x] ICE with invalid auto)
PR c++/43281
	* pt.c (contains_auto_r): New fn.
	(do_auto_deduction): Use it.
	(tsubst): Don't look at TREE_TYPE of a TEMPLATE_TYPE_PARM.

From-SVN: r157651
2010-03-22 16:38:46 -04:00
Jason Merrill
ce30e6fd06 c-pretty-print.c (pp_c_specifier_qualifier_list): Use () rather than [], and move before the element type.
* c-pretty-print.c (pp_c_specifier_qualifier_list) [VECTOR_TYPE]:
	Use () rather than [], and move before the element type.
	* cp-demangle.c (d_print_mod): Use () rather than [] for vectors.

From-SVN: r157650
2010-03-22 16:38:35 -04:00
Rainer Orth
3a1ef68af0 configfiles.texi (Configuration Files): Removed fixinc/Makefile*, intl/Makefile.*.
* doc/configfiles.texi (Configuration Files): Removed
	fixinc/Makefile*, intl/Makefile.*.
	* doc/makefile.texi: Fixed markup.
	Abstract from version control system used.
	(Makefile): Removed obsolete gcc/java/parse.y example.
	* doc/sourcebuild.texi: Likewise.
	(Top Level): Added config, gnattools, libdecnumber, libgcc,
	libgomp, libssp.
	Removed fastjar.
	(Miscellaneous Docs): Clarify location.
	Added COPYING3, COPYING3.LIB.
	(Front End Directory): Moved Make-lang.in entry to new
	subsubsection.

From-SVN: r157649
2010-03-22 20:33:33 +00:00
Rainer Orth
7f5441df09 re PR target/38085 (gcc -m64 -pg generates invalid assembler code on Solaris 10/x86)
gcc:
	PR target/38085
	* config/i386/i386.c (x86_function_profiler)
	[!NO_PROFILE_COUNTERS]: Fix typo.
	* config/i386/gmon-sol2.c (_mcleanup) [__x86_64__]: Use call
	instead of callq.

	libgcc:
	PR target/38085
	* config/i386/t-sol2 ($(T)gmon.o): Use CFLAGS instead of
	MULTILIB_CFLAGS.
	($(T)gcrt1.o): Likewise.
	($(T)crt1.o): Likewise.
	($(T)crti.o): Likewise.
	($(T)crtn.o): Likewise.

From-SVN: r157648
2010-03-22 20:12:34 +00:00
Janis Johnson
d4f3924a90 sourcebuild.texi (Test Directives): Split into six subsections...
2010-03-22  Janis Johnson  <janis187@us.ibm.com>
	    Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>

	* doc/sourcebuild.texi (Test Directives): Split into six
	subsections, with most of the current text in new subsections
	Directives, Selectors, and Final Actions.
	(Directives): Split list of test directives into multiple
	subsubsections.
	(Selectors): Describe use and syntax of selectors.
	(Effective-Target Keywords): Describe all existing keywords.
	(Add Options): Describe features for dg-add-options.
	(Require Support): Describe variants of dg-require-support.
	(Final Actions): Describe commands to use in dg-final.

Co-Authored-By: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>

From-SVN: r157646
2010-03-22 18:05:36 +00:00
Jan Kratochvil
fccff34135 Fix *.log tests output containing "===".
contrib/
	Fix *.log tests output containing "===".
	* dg-extract-results.sh (/\===/): Rename to ...
	(/^\t\t=== .* ===$/): ... this pattern.

From-SVN: r157645
2010-03-22 17:36:49 +00:00
Johannes Singler
0e50f3350e numeric (inner_product, [...]): Precede subsequent call with _GLIBCXX_STD_P:: to avoid ambiguity between...
2010-03-22  Johannes Singler  <singler@kit.edu>

        * include/parallel/numeric (inner_product, partial_sum):
        Precede subsequent call with _GLIBCXX_STD_P:: to avoid ambiguity
        between __gnu_parallel:: and std::
        * include/parallel/algobase.h (equal): Likewise.
        * include/parallel/algo.h (find_first_of, search_n, merge, nth_element,
        partial_sort, max_element, min_element): Likewise.
        * include/parallel/partial_sum.h (__parallel_partial_sum_linear):
        Qualify accumulate call with __gnu_parallel::.

From-SVN: r157643
2010-03-22 17:06:50 +00:00
Michael Matz
047550e9f6 re PR middle-end/43475 (ICE in form_sum, at reload.c:5348)
PR middle-end/43475
	* recog.c (validate_replace_rtx_group): Replace also in
	REG_EQUAL and REG_EQUIV notes.

testsuite/
	* gfortran.dg/pr43475.f90: New testcase.

From-SVN: r157640
2010-03-22 16:28:51 +00:00
Jakub Jelinek
80f046cced re PR libgomp/42942 (OpenMP omp_set_max_active_levels(0) isn't resetting value)
PR libgomp/42942
	* env.c (parse_unsigned_long): Add ALLOW_ZERO argument.
	(initialize_env): Adjust callers.
	(omp_set_max_active_levels): Set gomp_max_active_levels_var even
	when the argument is 0.

	* testsuite/libgomp.c/pr42942.c: New test.

From-SVN: r157635
2010-03-22 16:16:52 +01:00
Paolo Carlini
57fd5f9525 base.h (_PseudoSequence): Do not forward declare.
2010-03-22  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/parallel/base.h (_PseudoSequence): Do not forward declare.
	(_VoidFunctor): Remove, unused.
	(__median_of_three_iterators): Take __comp by value.
	(_PseudoSequenceIterator<>::operator++(int)): Do not const qualify
	the return type.
	(_PseudoSequenceIterator<>::operator!=): Fix return type to bool.

From-SVN: r157628
2010-03-22 13:55:11 +00:00
Richard Guenther
6d7971b832 re PR middle-end/43390 (ICE: integral result type precision does not match field size of BIT_FIELD_REF)
2010-03-22  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/43390
	* tree-vect-stmts.c (get_vectype_for_scalar_type): Make
	sure vector extracts are type correct.

	* gfortran.fortran-torture/execute/pr43390.f90: New testcase.

From-SVN: r157624
2010-03-22 12:39:04 +00:00
Richard Guenther
6af84c851d re PR middle-end/40106 (Weird interaction between optimize_insn_for_speed_p and -funsafe-math-optimizations)
2010-03-22  Richard Guenther  <rguenther@suse.de>

	PR middle-end/40106
	* builtins.c (expand_builtin_pow): Expand pow (x, 1.5) as
	x * sqrt (x) even when optimizing for size if the target
	has native support for sqrt.

From-SVN: r157623
2010-03-22 12:38:02 +00:00
Paolo Carlini
2305a1e82e base.h (_Less): Use std::less.
2010-03-22  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/parallel/base.h (_Less): Use std::less.
	(_Plus): Likewise use std::plus.
	(_Multiplies): Likewise use std::multiplies.
	* include/parallel/numeric: Adjust.

From-SVN: r157622
2010-03-22 12:18:46 +00:00
Jakub Jelinek
be36dd859d varasm.c (make_decl_rtl_for_debug): Also clear flag_mudflap for the duration of make_decl_rtl call.
* varasm.c (make_decl_rtl_for_debug): Also clear
	flag_mudflap for the duration of make_decl_rtl call.

From-SVN: r157621
2010-03-22 11:30:27 +01:00
Jakub Jelinek
539eb45985 re PR debug/43443 (We should yank ASM_OPERANDS locs from var-tracking preserved cselib VALUEs)
PR debug/43443
	* var-tracking.c (add_cselib_value_chains): Remove ASM_OPERANDS
	locs from preserved VALUEs.

From-SVN: r157620
2010-03-22 11:26:33 +01:00
Jerry DeLisle
260f179b8d re PR fortran/43409 (I/O: INQUIRE for SIZE does not work.)
2010-03-21  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/43409
	* io/io.h: Fix type of size in st_parameter_inquire structure.

From-SVN: r157618
2010-03-22 02:39:02 +00:00
John David Anglin
19c1be3917 re PR middle-end/42718 (FAIL: gcc.c-torture/compile/pr42559.c at -O1 and above)
PR middle-end/42718
	* pa.md (movmemsi): Set align to one if zero.
	(movmemdi): Likewise.

From-SVN: r157614
2010-03-22 01:00:30 +00:00
GCC Administrator
e0899a64f9 Daily bump.
From-SVN: r157613
2010-03-22 00:16:51 +00:00
Richard Earnshaw
f8b68ed3c3 re PR target/42321 (NEON/VFP registers from inline assembly clobber list are saved/restored incorrectly)
PR target/42321
	* arm.c (arm_output_epilogue): Correctly match VFP pop instructions
	with their corresponding prologue pushes.

From-SVN: r157609
2010-03-21 20:27:00 +00:00
Dave Korn
474b97ce0f re PR target/42811 (java.lang.ExceptionInInitializerError in ecj1)
PR target/42811
	* libjava/configure.ac (DLLTOOL): Call AC_CHECK_TOOL.
	(libgcj_sublib_core_extra_deps): New host-dependent configure var.
	(LIBGCJ_SUBLIB_CORE_EXTRA_DEPS): AC_SUBST it.
	* libjava/configure.host (libgcj_sublib_core_extra_deps): Define
	appropriately on Cygwin and MinGW.
	(libgcj_sublib_core_extra_deps): Add libgcj-noncore-dummy import
	stub library on Cygwin and MinGW.
	* libjava/Makefile.am (LIBJAVA_CORE_EXTRA): Import AC_SUBST'd
	LIBGCJ_SUBLIB_CORE_EXTRA_DEPS if building sublibs, else define empty.
	(libgcj_la_DEPENDENCIES): Use it.
	(DLL_VERSION): New makefile macro.
	(libgcj-noncore-dummy.dll.a): New build rule for dummy import stub
	library.
	(libgcj_noncore_la_LIBADD): Trim superfluous convenience libs.
	(AM_MAKEFLAGS): Add DLLTOOL recursive propagation.
	* libjava/libgcj-noncore-dummy.def: New file.
	* libjava/Makefile.in: Regenerate.
	* libjava/include/Makefile.in: Likewise.
	* libjava/testsuite/Makefile.in: Likewise.
	* libjava/configure: Likewise.
	* libjava/gcj/Makefile.in: Likewise.

From-SVN: r157606
2010-03-21 19:41:37 +00:00
Dave Korn
713812e244 PR target/42811 (prerequisite)
PR target/42811 (prerequisite)
	* jvmti.cc (_Jv_GetJVMTIEnv): Avoid use of uninitialised memory.

From-SVN: r157605
2010-03-21 19:36:49 +00:00
Dave Korn
045a52c82e PR target/42811 (prerequisite)
PR target/42811 (prerequisite)
	* include/private/gc_priv.h (struct roots) [CYGWIN32]: Don't
	declare r_next member on Cygwin as on other windows hosts.
	(LOG_RT_SIZE) [CYGWIN32]: Don't define likewise.
	(RT_SIZE) [CYGWIN32]: Likewise.
	(struct _GC_arrays) [CYGWIN32]: Do declare _heap_bases[] member
	likewise.
	(GC_heap_bases) [CYGWIN32]: Do define likewise.
	(struct _SYSTEM_INFO) [CYGWIN32]: Do forward-declare likewise.
	(GC_sysinfo) [CYGWIN32]: Do declare extern likewise.
	(GC_n_heap_bases) [CYGWIN32]: Likewise.
	(GC_is_tmp_root) [CYGWIN32]: Do prototype likewise.
	* include/private/gcconfig.h (GC_win32_get_mem) [CYGWIN32]: Likewise.
	(GET_MEM) [CYGWIN32]: Do define likewise.
	* boehm-gc/ptr_chck.c (GC_is_visible) [CYGWIN32]: Do handle dynamic
	registration likewise.
	* boehm-gc/os_dep.c (GC_setpagesize) [CYGWIN32]: Do define likewise.
	(GC_no_win32_dlls) [CYGWIN32]: Define as constant false, unlike
	other windows hosts.
	(GC_sysinfo) [CYGWIN32]: Define as on other windows hosts.
	(GC_n_heap_bases) [CYGWIN32]: Likewise.
	(GLOBAL_ALLOC_TEST) [CYGWIN32]: Likewise.
	(GC_win32_get_mem) [CYGWIN32]: Likewise, but wrapping GC_unix_get_mem
	rather than GlobalAlloc/VirtualAlloc.
	(GC_win32_free_heap) [CYGWIN32]: Likewise, but wrapping free instead
	of GlobalFree (even though the function body is optimised away).
	* boehm-gc/mark_rts.c (add_roots_to_index) [CYGWIN32]: Define as on
	other windows hosts.
	(GC_add_roots_inner) [CYGWIN32]: Avoid overlapping or adjacent
	intervals likewise.
	(GC_clear_roots) [CYGWIN32]: Clear GC_root_index[] likewise.
	(GC_rebuild_root_index) [CYGWIN32]: Define as on other windows hosts.
	(GC_remove_tmp_roots) [CYGWIN32]: Call it likewise.
	(GC_remove_roots) [CYGWIN32]: Don't define, as on other windows hosts.
	(GC_is_tmp_root) [CYGWIN32]: Define, as on other windows hosts.
	(GC_cond_register_dynamic_libraries) [CYGWIN32]: Handle temporary
	roots and dynamic registration likewise.
	* boehm-gc/dyn_load.c (GC_has_static_roots) [CYGWIN32]: Define as on
	other windows hosts.
	(GC_register_has_static_roots_callback) [CYGWIN32]: Likewise.
	(GC_cond_add_roots) [CYGWIN32]: Likewise.
	(GC_register_main_static_data) [CYGWIN32]: Define to always return
	false, as on MSWINCE
	(HAVE_REGISTER_MAIN_STATIC_DATA) [CYGWIN32]: Define as on other
	windows hosts.
	(GC_warn_fb) [CYGWIN32]: Likewise.
	(GC_disallow_ignore_fb) [CYGWIN32]: Likewise.
	(GC_ignore_fb_mb) [CYGWIN32]: Likewise.
	(GC_ignore_fb) [CYGWIN32]: Likewise.
	(is_frame_buffer) [CYGWIN32]: Likewise.
	(GC_dump_meminfo) [CYGWIN32]: Likewise.
	(GC_wnt) [CYGWIN32]: Define to constant true.
	(GC_register_dynamic_libraries) [CYGWIN32]: Define as on other
	windows hosts.

From-SVN: r157604
2010-03-21 19:34:19 +00:00
Kaveh R. Ghazi
242ba3086f ppc-sdata-1.c: Require nonpic.
* gcc.target/powerpc/ppc-sdata-1.c: Require nonpic.
	* gcc.target/powerpc/ppc-sdata-2.c: Likewise.

From-SVN: r157603
2010-03-21 19:25:00 +00:00