aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2003-12-12* gcc.c-torture/execute/wchar_t-1.x: Delete.Zack Weinberg2-6/+7
From-SVN: r74559
2003-12-12osf.h (TARGET_OS_CPP_BUILTINS): Define __STDC_VERSION__ to ISO C94 for C++.Rainer Orth5-5/+96
* config/alpha/osf.h (TARGET_OS_CPP_BUILTINS): Define __STDC_VERSION__ to ISO C94 for C++. * fixinc/inclhack.def (alpha_wchar): New fix. * fixinc/fixincl.x: Regenerate. * fixinc/tests/base/wchar.h: New file. From-SVN: r74558
2003-12-12Daily bump.GCC Administrator2-2/+2
From-SVN: r74554
2003-12-11basic_string.tcc (reserve): Allow shrink-to-fit.Neil Ferguson5-4/+12
2003-12-11 Neil Ferguson <nferguso@eso.org> Paolo Carlini <pcarlini@suse.de> * include/bits/basic_string.tcc (reserve): Allow shrink-to-fit. * testsuite/21_strings/basic_string/capacity/1.cc: Tweak. * testsuite/21_strings/basic_string/capacity/char/1.cc: Ditto. * testsuite/21_strings/basic_string/capacity/wchar_t/1.cc: Ditto. Co-Authored-By: Paolo Carlini <pcarlini@suse.de> From-SVN: r74551
2003-12-11libunwind related patch from David MosbergerDavid Mosberger7-74/+143
libunwind related patch from David Mosberger * unwind-libunwind.c (_Unwind_SetGR): Clear the NaT bit as required by C++ ABI for Itanium. * config/t-libunwind (LIB2ADDEH): Remove unwind-libunwind.c. * config/t-libunwind-no-eh: New file. * configure.in: Check libunwind for _Unwind_Resume() and if it's present, set libunwind_has_eh_support to "yes". * configure: Regenerate. * config.gcc (ia64*-*-linux*): If $libunwind_has_eh_support is set to yes, use t-libunwind, otherwise, use t-libunwind-no-eh. From-SVN: r74548
2003-12-11mips.c (mips_global_pointer): Force functions with a nonlocal goto to set up ↵Richard Sandiford2-0/+10
$gp. * config/mips/mips.c (mips_global_pointer): Force functions with a nonlocal goto to set up $gp. From-SVN: r74547
2003-12-11Fix for problem with unnecessary volatile mems.James E Wilson2-1/+17
PR target/13132 * function.c (gen_mem_addressof): When no decl, explicitly clear flag bits. From-SVN: r74543
2003-12-11[multiple changes]Arnaud Charlet13-86/+271
2003-12-11 Ed Falis <falis@gnat.com> * 5zinit.adb: Clean up. * 5zintman.adb (Notify_Exception): replaced case statement with a call to __gnat_map_signal, imported from init.c to support signal -> exception mappings that depend on the vxWorks version. * init.c: Created and exported __gnat_map_signal to support signal -> exception mapping that is dependent on the VxWorks version. Change mapping of SIGBUS from Program_Error to Storage_Error on VxWorks 2003-12-11 Vasiliy Fofanv <fofanov@act-europe.fr> * 5wosinte.ads: Link with -mthreads switch. 2003-12-11 Arnaud Charlet <charlet@act-europe.fr> * init.c (__gnat_install_handler [NetBSD]): Set __gnat_handler_installed, as done on all other platforms. Remove duplicated code. 2003-12-11 Jerome Guitton <guitton@act-europe.fr> * Makefile.in (rts-zfp, rts-ravenscar): Create libgnat.a. 2003-12-11 Thomas Quinot <quinot@act-europe.fr> * sinfo.ads: Fix inconsistent example code in comment. 2003-12-11 Robert Dewar <dewar@gnat.com> * a-tiinau.adb: Add a couple of comments * sem_ch3.adb: Minor reformatting * sem_prag.adb: Fix bad prototype of Same_Base_Type in body (code reading cleanup) Minor reformatting throughout 2003-12-11 Ed Schonberg <schonberg@gnat.com> * exp_ch7.adb (Establish_Transient_Scope): If the call is within the bounds of a loop, create a separate block in order to generate proper cleanup actions to prevent memory leaks. * sem_res.adb (Resolve_Call): After a call to Establish_Transient_Scope, the call may be rewritten and relocated, in which case no further processing is needed. * sem_util.adb: (Wrong_Type): Refine previous fix. Fixes ACATS regressions. PR ada/13353 * sem_prag.adb (Back_End_Cannot_Inline): A renaming_as_body can always be inlined. From-SVN: r74541
2003-12-11Format.java (serialVersionUID): Fixed value.Michael Koch2-2/+6
2003-12-11 Michael Koch <konqueror@gmx.de> * java/text/Format.java (serialVersionUID): Fixed value. From-SVN: r74540
2003-12-11EventDirContext.java: Jalopied.Michael Koch2-18/+26
2003-12-11 Michael Koch <konqueror@gmx.de> * javax/naming/event/EventDirContext.java: Jalopied. (addNamingListener): Fixed typo in method name. From-SVN: r74539
2003-12-11mangle.c (conv_type_names): Holds IDENTIFIER_NODEs only.Nathan Sidwell2-26/+37
* mangle.c (conv_type_names): Holds IDENTIFIER_NODEs only. (hash_type): Use TYPE_UID of the identifier's type. (compare_type): Adjust. (mangle_conv_op_name_for_type): Store identifier nodes only, use TYPE_UID has hash value. From-SVN: r74538
2003-12-11* gnu/java/nio/SocketChannelImpl.javaMohan Embar3-14/+63
(write): Removed diagnostic trace. * gnu/java/nio/natSelectorImplPosix.cc: Added includes for java.lang.Thread and java.io.InterruptedIOException. (helper_put_filedescriptors): Don't put invalid file descriptors in select set. (helper_get_filedescriptors): Clear invalid file descriptors from select set. (helper_reset): New method for clearing our file descriptor array. (implSelect): Correctly calculate timeout if specified and legal. Intercept and deal with any java.io.InterruptedIOException thrown by _Jv_select(). From-SVN: r74537
2003-12-11gnu_java_awt_peer_gtk_GtkEvents.c (awt_event_handler): Most coded moved to ↵Fernando Nasser25-485/+565
pre_event_handler, with the modifications mentioned below. 2003-12-08 Fernando Nasser <fnasser@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (awt_event_handler): Most coded moved to pre_event_handler, with the modifications mentioned below. (pre_event_handler): New function. Called on the Gtk "event" signal. Do not retrieve the jobject from the window property as it is already available as user data in the signal. Do not try and find the grab widget as it is already done by Gtk at this point. Do not search for Window ancestor as Gtk already sends the signal to it. Do not meddle with the activation state of peer widgets on each key press or release. Add CList to the special handling when looking for the focused widget. * jni/gtk-peer/gtkpeer.h: Add declaration for pre_event_handler. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (connectJObject): New function. (connectSignals): New function. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (connectHooks): Rename to... (connectSignals): New name. Get rid of NewGlobalRef call. Use g_signal_connect instead of deprecated gtk_signal_connect. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (connect_choice_item_selectable_hook): Use g_signal_connect instead of deprecated gtk_signal_connect. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState): Ditto. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject): New function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals): New function. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject): New function. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject): New function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals): New function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_old_create): Remove dead code. (item_select): Remove indirection. (item_unselect): Ditto. (connect_selectable_hook): Folded into connectSignals. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject): New function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals): New function. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c: Ditto. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks): Remove function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals): New function. * gnu/java/awt/peer/gtk/GtkComponentPeer.java: Declare and call connectJObject and connectSignals instead of connectHooks. * gnu/java/awt/peer/gtk/GtkButtonPeer.java: Declare connectJObject and connectSignals. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java: Declare connectSignals and not connectHooks. * gnu/java/awt/peer/gtk/GtkTextComponentPeer.java: Ditto. * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java: Declare connectJObject and not connectHooks. * gnu/java/awt/peer/gtk/GtkListPeer.java: Declare connectJObject and connectSignals instead of connectHooks. * gnu/java/awt/peer/gtk/GtkPanelPeer.java: Ditto. * gnu/java/awt/peer/gtk/GtkScrollbarPeer.java: Ditto. * gnu/java/awt/peer/gtk/GtkWindowPeer.java: Ditto. From-SVN: r74536
2003-12-11gcc_update (files_and_dependencies): Correct typo in the filename ↵Kelley Cook2-1/+6
gnat_ug_wnt.texi. 2003-12-10 Kelley Cook <kcook@gcc.gnu.org> * gcc_update (files_and_dependencies): Correct typo in the filename gnat_ug_wnt.texi. From-SVN: r74535
2003-12-11oops - fix typo in previous deltaNick Clifton1-1/+1
From-SVN: r74534
2003-12-11m32r.c: Convert to ISO-CNick Clifton5-339/+221
* config/m32r/m32r.c: Convert to ISO-C * doc/invoke.texi: Replace Mitsubishi with Renesas. * config/m32r/m32r.h: Ditto. * config/m32r/m32r.c: Ditto. * config/m32r/m32r.md: Ditto. From-SVN: r74533
2003-12-11re PR libstdc++/6243 (testsuite fails almost all tests due to no libintl in ↵Benjamin Kosnik2-11/+36
LD_LIBRARY_PATH during test.) 2003-12-10 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/6243 * testsuite/lib/libstdc++.exp (v3-init): Add original_ld_library_path, calculate ld_library path, set LD_LIBRARY_PATH to both. Based on libjava.exp. From-SVN: r74521
2003-12-11basic-block.h (BLOCK_HEAD, BLOCK_END): Remove.Steven Bosscher52-633/+662
2003-12-11 Steven Bosscher <steven@gcc.gnu.org> * basic-block.h (BLOCK_HEAD, BLOCK_END): Remove. (BLOCK_HEAD_TREE, BLOCK_END_TREE): Remove. (basic_block_def): Rename `head' to `head_' and `end' to `end_'. (BB_HEAD, BB_END): New accessor macros for the `head_' and `end_' fields of a basic block. * bb-reorder.c, bt-load.c, caller-save.c, cfg.c, cfganal.c, cfgbuild.c, cfgcleanup.c, cfglayout.c, cfgloop.c, cfgloopanal.c, cfgloopmanip.c, cfgrtl.c, combine.c, conflict.c, df.c, emit-rtl.c, final.c, flow.c, function.c, gcse.c, global.c, graph.c, haifa-sched.c, ifcvt.c, lcm.c, local-alloc.c, loop-unswitch.c, loop.c, postreload.c, predict.c, profile.c, ra-build.c, ra-debug.c, ra-rewrite.c, ra.c, recog.c, reg-stack.c, regclass.c, regmove.c, regrename.c, reload1.c, resource.c, sched-ebb.c, sched-rgn.c, sibcall.c, tracer.c, config/frv/frv.c, config/i386/i386.c, config/ia64/ia64.c: Use the BB_HEAD and BB_END macros instead of accessing the `head' and `end' fields of a basic block directly. * gengtype.c: Add missing piece from earlier patch. Dunno what I was thinking... From-SVN: r74520
2003-12-11Daily bump.GCC Administrator2-2/+2
From-SVN: r74518
2003-12-10Fix changelog entry again.Andrew Pinski1-2/+1
From-SVN: r74514
2003-12-10move changelog entry that should have been in testsuite's.Andrew Pinski2-10/+11
Also fix date on it. From-SVN: r74513
2003-12-10extend.texi (Vector Extensions): Document that bitwise operations also work ↵Geoffrey Keating2-5/+11
on vectors. * doc/extend.texi (Vector Extensions): Document that bitwise operations also work on vectors. From-SVN: r74511
2003-12-10re PR libstdc++/11612 (abi_check not finding correct libgcc_s.so.1)Benjamin Kosnik3-3/+17
2003-12-10 Benjamin Kosnik <bkoz@redhat.com> Alexandre Oliva <aoliva@redhat.com> PR libstdc++/11612 * testsuite/Makefile.am (GLIBCXX_DIR): New. (GLIBGCC_DIR): New. (CXXLINK): Use both with -R so libtool links the correct libs. Co-Authored-By: Alexandre Oliva <aoliva@redhat.com> From-SVN: r74508
2003-12-10re PR testsuite/10819 (testsuite creates CR+LF on compiler version lines in ↵Robert Schiele5-4/+13
test summary files) 2003-12-09 Robert Schiele <rschiele@uni-mannheim.de> PR other/10819 * lib/gcc.exp (default_gcc_version): Do not match NL/CR characters to fix Bug 10819. * lib/g++.exp (g++_version): Likewise. * lib/g77.exp (g77_version): Likewise. * lib/objc.exp (default_objc_version): Likewise. From-SVN: r74507
2003-12-10re PR libstdc++/13217 (basic_filebuf::underflow doesn't deal gracefully with ↵Paolo Carlini2-2/+13
read errors) 2003-12-10 Paolo Carlini <pcarlini@suse.de> PR libstdc++/13217 * include/bits/fstream.tcc (underflow): Deal gracefully with read errors: throw ios_base::failure. From-SVN: r74506
2003-12-10re PR libstdc++/10063 (stdio_filebuf broken)Benjamin Kosnik4-1/+120
2003-12-10 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/10063 * config/io/basic_file_stdio.cc (__basic_file::sys_open): Sync. * testsuite/ext/stdio_filebuf/char/10063-1.cc: New. * testsuite/ext/stdio_filebuf/char/10063-2.cc: New. From-SVN: r74505
2003-12-10* arm.md: New split patterns for optimizing bitfield accesses.Richard Earnshaw2-0/+169
From-SVN: r74503
2003-12-10README.Portability: Remove K+R section.Steven Bosscher3-211/+14
2003-12-10 Steven Bosscher <stevenb@suse.de> * README.Portability: Remove K+R section. * gengtype-lex.l: Teach about "void**" pointers and "void*" function types. From-SVN: r74501
2003-12-10re PR target/13354 (internal compiler error: in sparc_emit_set_const32)Eric Botcazou2-3/+16
PR target/13354 * config/sparc/sparc.c (sparc_output_mi_thunk): Load DELTA manually if one can do that with only one instruction. From-SVN: r74499
2003-12-10* cp-tree.h (DECL_CONV_FN_P): Check that DECL_NAME is non-NULL.Mark Mitchell2-1/+5
From-SVN: r74496
2003-12-10config.gcc (arm-linux): Include linux.h in tm_file so that ↵Nick Clifton1-0/+6
LINUX_TARGET_OS_CPP_BUILTINS is defined. * config.gcc (arm-linux): Include linux.h in tm_file so that LINUX_TARGET_OS_CPP_BUILTINS is defined. * config/arm/linux-elf.h (LIB_SPEC): Protect the definition. From-SVN: r74494
2003-12-10locale_facets.tcc (num_put::do_put(void*)): Remove the try/catch, not necessary.Paolo Carlini2-11/+9
2003-12-10 Paolo Carlini <pcarlini@suse.de> * include/bits/locale_facets.tcc (num_put::do_put(void*)): Remove the try/catch, not necessary. From-SVN: r74493
2003-12-10cls_align_pointer.c: Cast pointers to size_t instead of int.Richard Henderson2-4/+9
* testsuite/libffi.call/cls_align_pointer.c: Cast pointers to size_t instead of int. From-SVN: r74492
2003-12-10* gcc.c-torture/execute/wchar_t-1.c: Convert to utf-8.Richard Henderson2-4/+6
From-SVN: r74491
2003-12-10* gcc.dg/intermod-1.c: Adjust assembler scan pattern for alpha.Richard Henderson2-1/+5
From-SVN: r74490
2003-12-1012438.cc: Tweak memory limit and iterations to avoid spurious failures on ↵Paolo Carlini2-2/+8
some 64 bit... 2003-12-10 Paolo Carlini <pcarlini@suse.de> * testsuite/22_locale/locale/cons/12438.cc: Tweak memory limit and iterations to avoid spurious failures on some 64 bit machines. From-SVN: r74489
2003-12-09Fix comment problem reported by Doug Evans.James E Wilson2-7/+11
* rtl.def (CODE_LABEL, NOTE): Correct operand numbers in comments. From-SVN: r74488
2003-12-10re PR c/13134 (Visibility attribute is ignored)Matt Austern21-1/+229
PR c/13134 * c--decl.c (duplicate_decls): Copy visibility flag when appropriate. * cp/decl.c (duplicate_decls): Copy visibility flag when appropriate. * testsuite/lib/gcc-dg.exp (dg-require-visibility): Define. * testsuite/lib/target-supports (check_visibility_available): Define. * testsuite/gcc.dg/visibility-1.c: New test. * testsuite/gcc.dg/visibility-2.c: Likewise. * testsuite/gcc.dg/visibility-3.c: Likewise. * testsuite/gcc.dg/visibility-4.c: Likewise. * testsuite/gcc.dg/visibility-5.c: Likewise. * testsuite/gcc.dg/visibility-6.c: Likewise. * testsuite/g++.dg/ext/visibility-1.C: Likewise. * testsuite/g++.dg/ext/visibility-2.C: Likewise. * testsuite/g++.dg/ext/visibility-3.C: Likewise. * testsuite/g++.dg/ext/visibility-4.C: Likewise. * testsuite/g++.dg/ext/visibility-5.C: Likewise. * testsuite/g++.dg/ext/visibility-6.C: Likewise. From-SVN: r74487
2003-12-10linker-map.gnu: Remove private ios_base members from export list.Benjamin Kosnik14-65/+94
2003-12-09 Benjamin Kosnik <bkoz@redhat.com> * config/linker-map.gnu: Remove private ios_base members from export list. * config/cpu/alpha/atomicity.h: Consistently format. * config/cpu/cris/atomicity.h: Same. * config/cpu/generic/atomicity.h: Same. * config/cpu/hppa/atomicity.h: Same. * config/cpu/i386/atomicity.h: Same. * config/cpu/i486/atomicity.h: Same. * config/cpu/ia64/atomicity.h: Same. * config/cpu/m68k/atomicity.h: Same. * config/cpu/mips/atomicity.h: Same. * config/cpu/powerpc/atomicity.h: Same. * config/cpu/s390/atomicity.h: Same. * config/cpu/sparc/atomicity.h: Same. From-SVN: r74486
2003-12-10Daily bump.GCC Administrator2-2/+2
From-SVN: r74481
2003-12-10re PR libstdc++/13296 (unnecessary libunwind support in libstdc++-v3)Benjamin Kosnik14-103/+19
2003-12-09 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/13296 * acinclude.m4 (GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS): Remove. * aclocal.m4: Regenerate. * configure.ac: Remove call to GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS. * conigure: Regenerate. * src/Makefile.am (libstdc___la_LDFLAGS): Remove LIBUNWIND_FLAGS. * src/Makefile.in: Regenerate. * docs/html/17_intro/configury.html: Modify. From-SVN: r74479
2003-12-09demangle.h (struct implementation_details): Keep in comments the names of ↵Paolo Carlini2-1/+7
the unused parameters. 2003-12-09 Paolo Carlini <pcaelini@suse.de> * include/bits/demangle.h (struct implementation_details): Keep in comments the names of the unused parameters. From-SVN: r74478
2003-12-09demangle.h (struct implementation_details): Fix unused parameters warning.Paolo Carlini2-2/+7
2003-12-09 Paolo Carlini <pcaelini@suse.de> * include/bits/demangle.h (struct implementation_details): Fix unused parameters warning. From-SVN: r74477
2003-12-09locale_facets.tcc (num_get::_M_extract_int): Slightly streamline the code ↵Paolo Carlini2-9/+13
dealing with overflows and the parsing of the sign. 2003-12-09 Paolo Carlini <pcarlini@suse.de> * include/bits/locale_facets.tcc (num_get::_M_extract_int): Slightly streamline the code dealing with overflows and the parsing of the sign. From-SVN: r74476
2003-12-09Makefile.am (nat_headers_install): New variable with header files to install ↵Michael Koch3-3/+28
automatically. 2003-12-09 Michael Koch <konqueror@gmx.de> * Makefile.am (nat_headers_install): New variable with header files to install automatically. (install-data-local): Install all headers listed in nat_headers_install. Install innert nat headers explicitely. * Makefile.in: Regenerated. From-SVN: r74475
2003-12-09init.c (build_new_1): Deal with an OVERLOAD set when looking up for ↵Giovanni Bajo3-5/+23
_Jv_AllocObject. * init.c (build_new_1): Deal with an OVERLOAD set when looking up for _Jv_AllocObject. * except.c (build_throw): Likewise for _Jv_Throw. From-SVN: r74474
2003-12-09m32r.h: Add support for m32r2 processor.Kazuhiro Inaoka7-13/+44
* config/m32r/m32r.h: Add support for m32r2 processor. Including a new command line option -m32r2 to select it. * config/m32r/m32r.c: Add support for the new processor variant. * config/m32r/m32r.md: Likewise. * config/m32r/t-m32r: Add m32r2 multilibs. * doc/invoke.texi: Document the new command line switch. From-SVN: r74473
2003-12-09Calendar.java, [...]: Import used classes explicitely.Michael Koch4-3/+17
2003-12-09 Michael Koch <konqueror@gmx.de> * java/util/Calendar.java, java/util/IdentityHashMap.java, java/util/prefs/Preferences.java: Import used classes explicitely. From-SVN: r74471
2003-12-092003-12-09 Michael Koch <konqueror@gmx.de>Michael Koch4-33/+42
* java/net/DatagramSocket.java (close): Directly return if socket is closed. * java/net/ServerSocket.java (close): Directly return if socket is closed. * java/net/Socket.java (close): Directly return if socket is closed. From-SVN: r74470
2003-12-092003-12-09 Michael Koch <konqueror@gmx.de>Michael Koch2-1/+9
* gnu/java/nio/SelectorImpl.java (implSelect): Throws IOException. (select): Likewise. From-SVN: r74468