2006-06-13  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* configure: Regenerate.
	* Makefile.in: Regenerate.
	* configure.ac (--enable-plugin): New option.
	(ac_configure_args): Add --enable-tool-wrappers.
	(ac_configure_args): Add --disable-plugin unless --enable-plugin
	was specified.
	* gcj/Makefile.in: Regenerate.
	* sources.am (gnu_java_net_source_files): Add
	classpath/gnu/java/net/IndexListParser.java.
	(property_files): Remove
	classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties,
	classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties.
	Add
	classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties,
	classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties,
	classpath/resource/gnu/classpath/tools/getopt/Messages.properties,
	classpath/resource/gnu/classpath/tools/jar/messages.properties,
	classpath/resource/gnu/classpath/tools/jarsigner/messages.properties,
	classpath/resource/gnu/classpath/tools/keytool/messages.properties,
	classpath/resource/gnu/classpath/tools/native2ascii/messages.properties,
	classpath/resource/gnu/classpath/tools/serialver/messages.properties.
	* classpath/Makefile.in: Regenerate.
	* classpath/native/jni/gtk-peer/cairographics2d.h,
	classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,
	classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c,
	classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
	classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,
	classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,
	classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,
	classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:
	Merge from GNU Classpath.
	* classpath/native/Makefile.in: Regenerate.
	* classpath/native/jawt/Makefile.in: Regenerate.
	* classpath/native/jawt/Makefile.am: Install libjawt.so in GCJ's
	versioned library directory.
	* classpath/native/Makefile.am: Add plugin directory if
	--enable-plugin was specified.
	* classpath/native/plugin/Makefile.in: Regenerate.  *
	classpath/native/plugin/Makefile.am: Install libgcjwebplugin.so in
	GCJ's versioned library directory.
	* classpath/resource/gnu/classpath/tools/native2ascii/messages.properties:
	New file.
	* classpath/resource/gnu/classpath/tools/getopt/Messages.properties:
	Likewise.
	* classpath/resource/gnu/classpath/tools/jarsigner/messages.properties:
	Likewise.
	* classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties:
	Remove file.
	* classpath/resource/gnu/classpath/tools/keytool/messages.properties:
	New file.
	* classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties:
	Remove file.
	* classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties:
	New file.
	* classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties:
	Likewise.
	* classpath/resource/gnu/classpath/tools/jar/messages.properties:
	Likewise.
	* classpath/resource/gnu/classpath/tools/serialver/messages.properties:
	Likewise.
	* classpath/gnu/java/net/IndexListParser.java:
	Likewise.
	* classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java,
	classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,
	classpath/gnu/java/awt/peer/gtk/CairoSurface.java,
	classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,
	classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
	classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,
	classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java,
	classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,
	classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java,
	classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java,
	classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java,
	classpath/gnu/java/awt/java2d/PolyEdge.java,
	classpath/gnu/java/awt/java2d/AbstractGraphics2D.java: Merge from
	GNU Classpath.
	* classpath/tools/toolwrapper.c: Replace tools.zip reference with
	libgcj-tools-4.2.0.jar.
	* classpath/tools/Makefile.in: Regenerate.
	* classpath/tools/Makefile.am: Rename tools.zip to
	libgcj-tools-4.2.0.jar.  Install libgcj-tools-4.2.0.jar in
	$(datadir)/java.
	* classpath/javax/swing/JTabbedPane.java,
	classpath/javax/swing/text/DefaultStyledDocument.java,
	classpath/javax/swing/text/html/HTMLDocument.java,
	classpath/javax/swing/text/GapContent.java,
	classpath/javax/swing/JComponent.java,
	classpath/javax/swing/RepaintManager.java,
	classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java,
	classpath/javax/swing/plaf/basic/BasicScrollBarUI.java,
	classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,
	classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java,
	classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,
	classpath/javax/swing/plaf/metal/MetalButtonUI.java,
	classpath/java/text/Bidi.java,
	classpath/java/awt/image/BufferedImage.java,
	classpath/java/awt/datatransfer/DataFlavor.java,
	classpath/java/awt/geom/AffineTransform.java,
	classpath/java/awt/dnd/DropTargetDropEvent.java,
	classpath/java/awt/dnd/DropTargetContext.java,
	classpath/java/awt/font/TextLayout.java,
	classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,
	classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,
	classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h,
	classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h,
	classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h,
	classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h: Merge from
	GNU Classpath.
	* classpath/include/gnu_java_awt_peer_gtk_GdkGraphics.h,
	classpath/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h,
	classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c,
	classpath/native/jni/gtk-peer/gtkcairopeer.h,
	classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c:
	Remove files.
	* classpath/Makefile.am (SUBDIRS, DIST_SUBDIRS): Include tools
	directory.
	* include/Makefile.in: Regenerate.
	* testsuite/Makefile.in: Regenerate.

From-SVN: r114633

From-SVN: r114632

	* configure.host (hppa*-*): Set 'enable_hash_synchronization_default'
	to no.

From-SVN: r114630

From-SVN: r114628

2006-06-13  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.am: Add html and install-html stubs.
	* Makefile.in: Regenerate.
	* aclocal.m4: Regenerate.

From-SVN: r114624

* config-ml.in: Alter CCASFLAGS to include special
multilib options the same as is done for CFLAGS.

From-SVN: r114622

gcc/

2006-06-13  Carlos O'Donell  <carlos@codesourcery.com>

	* Makefile.in: Define HTMLS_BUILD, HTMLS_INSTALL,
	html__strip_dir, html__mkdir_p. Enhance install-html target.
	* configure.ac: AC_SUBST datarootdir, docdir and htmldir. 
	* configure: Regenerate.

From-SVN: r114620

Check for Objective-C++ in deciding certain COND_EXPR
folding.
OKed by Geoff Keating.

From-SVN: r114619

        PR target/28014:

        gcc:
        * config/sh/t-sh (LIB1ASMFUNCS): Add _udiv_qrnnd16
        * config/sh/sh.c (print_operand): Add !SHMEDIA functionality to 'M'.
        * config/sh/lib1funcs.h (SL, SL1): Define.
        * config/sh/lib1funcs.asm (__udiv_qrnnd16): New hidden function.
        * longlong.h (__sh__): Define umul_ppmm, udiv_qrnnd and sub_ddmmss.
        * config/sh/t-sh ($(T)unwind-dw2-Os-4-200.o): New rule.
        (OBJS_Os_4_200): New variable.
        ($(T)libgcc-Os-4-200.a): Use it.
        * sh.md (udivsi3): For TARGET_DIVIDE_CALL_TABLE, avoid function call
        when dividing 1 and/or by 0.

        gcc/testsuite:
        * g++.dg/eh/div.C: New test.

From-SVN: r114616

configure.ac (HAS_MCONTEXT_T_UNDERSCORES): Include <sys/signal.h> before <ucontext.h> to define sigset_t required by...


	* configure.ac (HAS_MCONTEXT_T_UNDERSCORES): Include <sys/signal.h>
	before <ucontext.h> to define sigset_t required by <sys/ucontext.h>.
	* configure: Regenerate.

From-SVN: r114614

2006-06-09  Andrew Haley  <aph@redhat.com>

        PR java/1305
        PR java/27908
        * builtins.c (initialize_builtins): Add __sync_synchronize().
        * class.c (add_field): Mark volatile fields.
        * java-gimplify.c (java_gimplify_expr): Call new functions to
        handle self-modifying exprs and COMPONENT_REFs.
        (java_gimplify_component_ref): New.
        (java_gimplify_modify_expr): Add handling for volatiles.

From-SVN: r114609

	* config/bfin/bfin.c (bfin_reorg_loops): Only call recog_memoized ()
	for real instruction.

From-SVN: r114608

	PR middle-end/27793
	* cp-tree.h (cxx_int_tree_map): New struct.
	(struct language_function): Add extern_decl_map field.
	* name-lookup.c (pushdecl_maybe_friend): Add x -> t mapping
	to cp_function_chain->extern_decl_map hash table instead of
	copying over DECL_UID.
	* cp-gimplify.c (cxx_int_tree_map_eq, cxx_int_tree_map_hash): New
	functions.
	(cp_genericize_r): Remap DECL_EXTERN local decls using
	cp_function_chain->extern_decl_map hash table.
	* decl.c (finish_function): Clear extern_decl_map.

	PR c++/26757
	PR c++/27894
	* g++.dg/tree-ssa/pr26757.C: New test.
	* g++.dg/tree-ssa/pr27894.C: New test.

From-SVN: r114607

2006-06-13  Maxim Kuvyrkov  <mkuvyrkov@ispras.ru>

	PR middle-end/26807
	* haifa-sched.c (check_cfg): Handle special case.

From-SVN: r114606

	PR debug/26754
	* gimplify.c (declare_tmp_vars): Rename into declare_vars.
	Add debug_info parameter.  Chain the vars to the BLOCK instead
	of the BIND_EXPR if debug info are requested for them.
	(pop_gimplify_context): Adjust for above change.
	(gimple_add_tmp_var): Likewise.
	* tree-gimple.h (declare_tmp_vars): Rename into declare_vars.
	Add bool parameter.
	* tree-nested.c (convert_nonlocal_reference): Adjust for above change.
	(convert_local_reference): Likewise.
	(get_local_debug_decl): Set DECL_IGNORED_P on the original variable.
	(finalize_nesting_tree_1): Request that debug info be emitted
	for debug_var_chain.

From-SVN: r114605

2006-06-13  Maxim Kuvyrkov  <mkuvyrkov@ispras.ru>

	* haifa-sched.c (unlink_other_notes, unlink_line_notes): Fix the patch
	for PR target/27863.

2006-06-13  Maxim Kuvyrkov  <mkuvyrkov@ispras.ru>

	* gcc.c-torture/compile/20060609-1.c: New test.
	
	PR target/27863
	* gcc.c-torture/compile/pr27863.c: New test.

From-SVN: r114604

Alexandre Oliva <aoliva@redhat.com>

	* (ZW_GNU_GETTEXT_SISTER_DIR): Add optional
	argument for where to search for NLS config file.

Co-Authored-By: Alexandre Oliva <aoliva@redhat.com>

From-SVN: r114603

2006-06-13  Richard Guenther  <rguenther@suse.de>

	PR middle-end/27536
	* except.c (output_ttype): Expand type with EXPAND_INITIALIZER.

From-SVN: r114601

2006-06-13  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/27830
	* tree-inline.c (copy_body_r): For copying the operand
	of an ADDR_EXPR make sure to fold &* afterwards.

	* g++.dg/tree-ssa/pr27830.C: New testcase.

From-SVN: r114600

	* configure.in: Don't enable libgomp on hpux10.
	* configure: Rebuilt.

From-SVN: r114599

	PR ada/27944
	* s-taprop-hpux-dce.adb: Delete redundant 'with System.Parameters'.

From-SVN: r114598

* lib/target-supports-dg.exp (check-flags): Include TOOL_OPTIONS in
the list of compiler flags; this causes those flags to be checked
for things like dg-skip-if.

From-SVN: r114597

From-SVN: r114595

2006-06-12  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/26970
	* config/locale/gnu/c_locale.h (__convert_from_v<>): Change to
	variadic function, instead of template function.
	* config/locale/generic/c_locale.h (__convert_from_v<>): Likewise.
	* include/bits/locale_facets.tcc (num_put<>::_M_insert_float):
	Adjust.
	(money_put<>::do_put(long double)): Likewise.
	* src/locale-misc-inst.cc: Remove.
	* src/Makefile.am: Adjust.
	* src/Makefile.in: Regenerate.

From-SVN: r114591

	PR c++/27601
	* semantics.c (finish_offsetof): Handle pseudo-destructors.

	* g++.dg/ext/offsetof1.C: Add test for pseudo-destructors.

From-SVN: r114588

	* g++.dg/parse/ctor6.C, g++.dg/parse/defarg11.C,
	g++.dg/template/friend42.C, g++.dg/template/spec30.C: New.

Co-Authored-By: Kazu Hirata <kazu@codesourcery.com>

From-SVN: r114585

	PR c++/27933
	* name-lookup.c (lookup_qualified_name): Always return error_mark_node
	if lookup fails.

	* g++.dg/lookup/using15.C: New test.

From-SVN: r114580

	PR c++/27951
	* decl2.c (finish_anon_union): Return early if build_anon_union_vars
	fails.

	* g++.dg/other/anon4.C: New test.

From-SVN: r114577

gimplify.c (gimplify_expr): Treat VIEW_CONVERT_EXPR like other lvalues in the fb_none case with side-effects.

	* gimplify.c (gimplify_expr): Treat VIEW_CONVERT_EXPR like other
	lvalues in the fb_none case with side-effects.

From-SVN: r114576

	PR c++/21210
	* typeck2.c (build_functional_cast): Use cp_convert to construct
	non-aggregate initializers instead of the user-level build_c_cast.

	* g++.dg/init/complex1.C: New test case.

From-SVN: r114573

2006-06-12  Andrew Haley  <aph@redhat.com>

        * testsuite/libjava.lang/PR27908.out: Delete.
        * testsuite/libjava.lang/PR27908.java: Delete.

From-SVN: r114572

	* tree-flow.h: Remove the prototype for
	compute_phi_arg_on_exit.
	* tree-ssa-loop-ivopts.c (protect_loop_closed_ssa_form_use,
	protect_loop_closed_ssa_form, compute_phi_arg_on_exit):
	Remove.

From-SVN: r114569

2006-06-12  Andrew Haley  <aph@redhat.com>

        * testsuite/libjava.lang/PR27908.out: New.
        * testsuite/libjava.lang/PR27908.java: New.

From-SVN: r114568

builtins.c (expand_builtin_return_addr): Only use frame_pointer_rtx when count == 0 and we are expanding...

gcc/
	* builtins.c (expand_builtin_return_addr): Only use
	frame_pointer_rtx when count == 0 and we are expanding
	__builtin_return_address.

From-SVN: r114567

mips.c (mips_file_start): Create special section ".gcc_compiled_longXX" for o64 ABI as well as EABI.

2006-06-12  Fred Fish  <fnf@specifix.com>

	* config/mips/mips.c (mips_file_start): Create special section
	".gcc_compiled_longXX" for o64 ABI as well as EABI.

From-SVN: r114566

2006-06-12  David Ayers  <d.ayers@inode.at>

	PR bootstrap/27963
	PR target/19970
	* configure.in:	Remove target-boehm-gc from noconfigdirs where 
	${libgcj} is specified.
	* configure: Regenerate.

From-SVN: r114563

2006-06-11  Eric Christopher  <echristo@apple.com>

        PR middle-end/27948
        * stor-layout.c (place_field): Remove check for
        remaining_in_alignment when aligning at the end of a run.

2006-06-11  Eric Christopher  <echristo@apple.com>

	PR middle-end/27948
        * gcc.dg/bf-ms-layout.c: Run on darwin.
        * gcc.dg/bf-no-ms-layout: Ditto.
        * gcc.dg/attr-ms_struct-2.c: New.
        * gcc.dg/bf-ms-layout-2.c: Ditto.

From-SVN: r114562

2006-06-11  Eric Christopher  <echristo@apple.com>

        PR 27542
        * doc/extend.texi (Structure-Packing Pragmas): Document ms_struct
        pragma.

From-SVN: r114561

	PR target/27858
	Revert incorrect fix for PR target/27158
	2006-05-08  Roger Sayle  <roger@eyesopen.com>
	* reload.c (find_reloads_toplev): Only return the simplified SUBREG
	of a reg_equiv_constant if the result is a legitimate constant.

From-SVN: r114559

	PR target/27158
	* config/rs6000/rs6000.c (const_vector_elt_as_int): New function to
	extract a CONST_VECTOR element and interpret it as an integer.
	(vspltis_constant): Use const_vector_elt_as_int instead of the
	macro CONST_VECTOR_ELT in order to handle FP vector modes.
	* config/rs6000/predicates.md (easy_vector_const): Consider
	floating point ALTIVEC_VECTOR_MODEs via easy_altivec_constant.

From-SVN: r114558