summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* * gnu/gcj/runtime/natFinalizerThread.cc: New file.tromey2001-10-1012-39/+210
| | | | | | | | | | | | | | | | | | | | | | | * java/lang/natRuntime.cc: Include FinalizerThread.h. (runFinalization): Call finalizerReady. * nogc.cc (_Jv_GCInitializeFinalizers): New function. * prims.cc: Include VirtualMachineError.h, FinalizerThread.h. (_Jv_CreateJavaVM): Start the finalizer thread. * no-threads.cc: Include InternalError.h. (_Jv_ThreadStart): Throw InternalError. (_Jv_ThreadInitData): Don't throw error if this is not the first thread. * Makefile.in: Rebuilt. * Makefile.am (ordinary_java_source_files): Added FinalizerThread.java. (nat_source_files): Added natFinalizerThread.cc. * include/jvm.h (_Jv_GCInitializeFinalizers): Declare. * boehm.cc (_Jv_GCInitializeFinalizers): New function. * gnu/gcj/runtime/FirstThread.java (run): Start finalizer thread. * gnu/gcj/runtime/FinalizerThread.java: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46163 138bc75d-0d04-0410-961f-82ee72b054a4
* * decl.c: (validate_size): Do check size of object of integral typebosch2001-10-102-1/+6
| | | | | | | if it is a packed array type. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46162 138bc75d-0d04-0410-961f-82ee72b054a4
* * config/i386/cygwin.h: Avoid adding include files if -nostdinc is used.cgf2001-10-104-21/+51
| | | | | | | | | | | | | | | * config/i386/mingw32.h (WIN32_NO_ABSOLUTE_INST_DIRS): New define. (Thanks to Chris Faylor for suggesting macro name). (CPP_PREDEFINES): Define __MINGW32__ but don't set value; add more WIN32 defines. (STANDARD_INCLUDE_DIR): Remove i386- from directory name. (STANDARD_INCLUDE_COMPONENT): Change to MINGW. (MATH_LIBRARY): Undef before definition. (OUTPUT_QUOTED_STRING): Likewise. * config/i386/cygwin.h: Use WIN32_NO_ABSOLUTE_INST_DIRS. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46161 138bc75d-0d04-0410-961f-82ee72b054a4
* * decl.c: (gnat_to_gnu_entity, case object): Also materializebosch2001-10-102-4/+11
| | | | | | | VAR_DECL for constant if not Is_Public but -O0. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46160 138bc75d-0d04-0410-961f-82ee72b054a4
* * misc.c (struct lang_hooks): Add new initializer to match GCC change.bosch2001-10-102-1/+6
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46159 138bc75d-0d04-0410-961f-82ee72b054a4
* * unwind-dw2-fde.c (fde_compare_t): Change return type to int.rth2001-10-102-7/+26
| | | | | | | | | (fde_unencoded_compare): Likewise. Don't use subtraction to get a tristate comparison value. (fde_single_encoding_compare, fde_mixed_encoding_compare): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46157 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-10 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>sirl2001-10-102-0/+9
| | | | | | | | | PR c++/4512 * unroll.c (loop_iterations): Ignore insns generated by loop unrolling. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46153 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-10 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>sirl2001-10-102-0/+14
| | | | | | | * gcc.c-torture/compile/20011010-1.c: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46151 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-10 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>sirl2001-10-103-117/+5
| | | | | | | | * config.gcc (mips*-*-gnu*): Delete support. * config/mips/gnu.h: Remove. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46150 138bc75d-0d04-0410-961f-82ee72b054a4
* * MAINTAINERS (Various maintainers: Ada front end):bosch2001-10-102-0/+6
| | | | | | | Added Robert Dewar. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46149 138bc75d-0d04-0410-961f-82ee72b054a4
* Oops, committed early version of the testcase.sirl2001-10-101-1/+2
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46148 138bc75d-0d04-0410-961f-82ee72b054a4
* * xnmake.adb (XNmake): Fix handling of -s/-b options. No longerbosch2001-10-102-6/+10
| | | | | | | use '/' as switch character, allowing for absolute file names. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46146 138bc75d-0d04-0410-961f-82ee72b054a4
* * calls.c: Fix formatting.kazu2001-10-1035-66/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * c-decl.c: Likewise. * cfgcleanup.c: Likewise. * combine.c: Likewise. * cppfiles.c: Likewise. * cpplib.c: Likewise. * cppmacro.c: Likewise. * crtstuff.c: Likewise. * cse.c: Likewise. * dwarf2out.c: Likewise. * expmed.c: Likewise. * expr.c: Likewise. * fold-const.c: Likewise. * function.c: Likewise. * gcse.c: Likewise. * genattrtab.c: Likewise. * ggc-page.c: Likewise. * integrate.c: Likewise. * libgcc2.c: Likewise. * loop.c: Likewise. * optabs.c: Likewise. * profile.c: Likewise. * protoize.c: Likewise. * real.c: Likewise. * recog.c: Likewise. * reload1.c: Likewise. * reload.c: Likewise. * reorg.c: Likewise. * resource.c: Likewise. * sched-rgn.c: Likewise. * sdbout.c: Likewise. * stmt.c: Likewise. * toplev.c: Likewise. * varasm.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46145 138bc75d-0d04-0410-961f-82ee72b054a4
* Daily bump.gccadmin2001-10-106-6/+6
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46143 138bc75d-0d04-0410-961f-82ee72b054a4
* * langhooks.c: Include rtl.h, insn-config.h and integrate.h.aoliva2001-10-103-1/+9
| | | | | | | * Makefile.in (langhooks.o): Add dependencies. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46142 138bc75d-0d04-0410-961f-82ee72b054a4
* * rs6000.c (rs6000_emit_load_toc_table): Don'twehle2001-10-102-2/+8
| | | | | | | | strdup the toc label. (create_TOC_reference): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46141 138bc75d-0d04-0410-961f-82ee72b054a4
* * config.gcc (i[34567]86-*-mingw32*): Make msvcrt-dependentdj2001-10-102-3/+8
| | | | | | | version default. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46139 138bc75d-0d04-0410-961f-82ee72b054a4
* * config/i386/i386.c (ix86_attribute_table): Correctdj2001-10-102-3/+8
| | | | | | | min_len, max_len fields for dllimport, dllexport and shared. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46137 138bc75d-0d04-0410-961f-82ee72b054a4
* * bcmp.c, setenv.c: Use "nonzero" instead of "non-zero".jsm282001-10-095-8/+14
| | | | | | | | * strtod.c: Use "ISO C" instead of "ANSI C". * functions.texi: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46136 138bc75d-0d04-0410-961f-82ee72b054a4
* * doc/c-tree.texi, doc/cppinternals.texi, doc/extend.texi,jsm282001-10-098-47/+53
| | | | | | | | doc/install.texi, doc/md.texi, doc/rtl.texi, doc/tm.texi: Consistently use "nonzero" instead of "non-zero". git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46134 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-09 Alexandre Petit-Bianco <apbianco@redhat.com>apbianco2001-10-092-4/+27
| | | | | | | | | | | | | | | | | | | | * parse.y (patch_cast): Call patch_string on the first operand of the incoming node, update it if necessary. Fixes java/4510. 2001-10-05 Alexandre Petit-Bianco <apbianco@redhat.com> * parse.y (register_incomplete_type): Set JDEP_SUPER to be given a NULL enclosing context if appropriate. Fixes java/4466. 2001-09-17 Alexandre Petit-Bianco <apbianco@redhat.com> * parse.y (patch_method_invocation): Inner class creation context check not enforced within constructors. Fixes PR java/1873. ( http://gcc.gnu.org/ml/gcc-patches/2001-10/msg00397.html ) git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46133 138bc75d-0d04-0410-961f-82ee72b054a4
* * strtod.c (_strtod_r): Logic to check for missing digitsbothner2001-10-092-8/+12
| | | | | | | after exponent had 'else' attached to wrong 'if'. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46132 138bc75d-0d04-0410-961f-82ee72b054a4
* * acconfig.h: Fix comment formatting.kazu2001-10-0913-22/+37
| | | | | | | | | | | | | | | | | * c-dump.h: Likewise. * c-tree.h: Likewise. * conditions.h: Likewise. * expr.h: Likewise. * function.h: Likewise. * gthr.h: Likewise. * hwint.h: Likewise. * integrate.h: Likewise. * intl.h: Likewise. * loop.h: Likewise. * optabs.h: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46131 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-09 Phil Edwards <pme@gcc.gnu.org>pme2001-10-095-14/+110
| | | | | | | | | | | * docs/html/17_intro/howto.html: Tweak markup and value type. * docs/html/27_io/howto.html: Tweak markup, describe setbuf() for nonzero arguments, add new note on threading. * docs/html/faq/index.html: Update. * docs/html/faq/index.txt: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46130 138bc75d-0d04-0410-961f-82ee72b054a4
* * java/net/SocketImpl.java: Merge with Classpathmark2001-10-092-20/+174
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46129 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-09 Phil Edwards <pme@gcc.gnu.org>pme2001-10-0921-415/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | * docs/html/configopts.html: More HTML->XHTML and lowercasing of tags. * docs/html/documentation.html: Likewise. * docs/html/explanations.html: Likewise. * docs/html/install.html: Likewise. * docs/html/17_intro/howto.html: Likewise. * docs/html/17_intro/license.html: Likewise. Tighten up language. * docs/html/18_support/howto.html: Likewise. * docs/html/19_diagnostics/howto.html: Likewise. * docs/html/20_util/howto.html: Likewise. * docs/html/21_strings/howto.html: Likewise. * docs/html/22_locale/howto.html: Likewise. * docs/html/23_containers/howto.html: Likewise. * docs/html/24_iterators/howto.html: Likewise. * docs/html/25_algorithms/howto.html: Likewise. * docs/html/26_numerics/howto.html: Likewise. * docs/html/27_io/howto.html: Likewise. * docs/html/ext/howto.html: Likewise. * docs/html/ext/sgiexts.html: Likewise. * docs/html/faq/index.html: Likewise. Not so many absolute links. * docs/html/faq/index.txt: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46128 138bc75d-0d04-0410-961f-82ee72b054a4
* * java/net/DatagramSocketImpl.java: Merge with Classpathmark2001-10-092-15/+152
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46127 138bc75d-0d04-0410-961f-82ee72b054a4
* fix datesjason2001-10-091-5/+3
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46126 138bc75d-0d04-0410-961f-82ee72b054a4
* reorganizejason2001-10-094-1/+28
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46125 138bc75d-0d04-0410-961f-82ee72b054a4
* * spew.c (end_input): No longer static.jason2001-10-091-0/+6
| | | | | | | | * cp-tree.h: Declare it. * parse.y (datadef): Add "error END_OF_SAVED_INPUT" expansion. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46124 138bc75d-0d04-0410-961f-82ee72b054a4
* * call.c (standard_conversion): Add bad conversion betweenjason2001-10-095-35/+77
| | | | | | | | | | | | | | | integers and pointers. (convert_like_real): Don't use convert_for_initialization for bad conversions; complain here and use cp_convert. (build_over_call): Don't handle bad conversions specially. (perform_implicit_conversion): Allow bad conversions. (can_convert_arg_bad): New fn. * cp-tree.h: Declare it. * typeck.c (convert_for_assignment): Use it. (ptr_reasonably_similar): Any target type is similar to void. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46123 138bc75d-0d04-0410-961f-82ee72b054a4
* * c-common.h: Fix comment formatting.kazu2001-10-0921-76/+99
| | | | | | | | | | | | | | | | | | | | | | | | | * c-dump.c: Likewise. * cfg.c: Likewise. * diagnostic.h: Likewise. * except.c: Likewise. * gcc.h: Likewise. * gcov-io.h: Likewise. * genattrtab.c: Likewise. * output.h: Likewise. * predict.h: Likewise. * reload1.c: Likewise. * reload.h: Likewise. * resource.h: Likewise. * scan.h: Likewise. * system.h: Likewise. * tree.h: Likewise. * tree-inline.c: Likewise. * tsystem.h: Likewise. * varasm.c: Likewise. * xcoffout.h: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46122 138bc75d-0d04-0410-961f-82ee72b054a4
* * doc/gcc.texi: Document preference for "nonzero" over "non-zero".jsm282001-10-092-0/+5
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46119 138bc75d-0d04-0410-961f-82ee72b054a4
* * config/alpha/freebsd.h, config/alpha/lib1funcs.asm,jsm282001-10-0931-45/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | config/i386/i386elf.h, config/i386/netbsd-elf.h, config/i386/netware.h, config/mcore/gfloat.h, config/mcore/mcore.c, config/mcore/mcore.h, config/mcore/mcore.md, config/netware.h, gccbug.in: Update FSF address. ada: * 4gintnam.ads, Make-lang.in, Makefile.in, config-lang.in: Update FSF address. testsuite: * consistency.vlad/vlad.exp, g++.old-deja/g++.mike/p784.C, g++.old-deja/old-deja.exp, g77.f-torture/compile/compile.exp, g77.f-torture/execute/execute.exp, g77.f-torture/noncompile/noncompile.exp, gcc.c-torture/compile/compile.exp, gcc.c-torture/execute/execute.exp, gcc.c-torture/execute/ieee/ieee.exp, gcc.c-torture/execute/memcheck/memcheck.exp, gcc.c-torture/unsorted/unsorted.exp, gcc.misc-tests/linkage.exp, objc/execute/execute.exp: Update FSF address. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46118 138bc75d-0d04-0410-961f-82ee72b054a4
* Daily bump.gccadmin2001-10-096-6/+6
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46116 138bc75d-0d04-0410-961f-82ee72b054a4
* * gcc.dg/cpp/cmdlne-C.c: Update.neil2001-10-093-0/+32
| | | | | | | * gcc.dg/cpp/cmdlne-C2.c: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46115 138bc75d-0d04-0410-961f-82ee72b054a4
* * c-common.c: Fix comment typos.kazu2001-10-0929-42/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cfgrtl.c: Likewise. * collect2.c: Likewise. * cpplex.c: Likewise. * doloop.c: Likewise. * dwarf2out.c: Likewise. * dwarfout.c: Likewise. * expr.c: Likewise. * fold-const.c: Likewise. * gcc.c: Likewise. * gcov.c: Likewise. * gcse.c: Likewise. * global.c: Likewise. * ifcvt.c: Likewise. * loop.c: Likewise. * optabs.c: Likewise. * protoize.c: Likewise. * regclass.c: Likewise. * reorg.c: Likewise. * rtl.h: Likewise. * stmt.c: Likewise. * tree.h: Likewise. * doc/cpp.texi: Likewise. * doc/c-tree.texi: Likewise. * doc/extend.texi: Likewise. * doc/invoke.texi: Likewise. * doc/objc.texi: Likewise. * doc/tm.texi: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46114 138bc75d-0d04-0410-961f-82ee72b054a4
* * parse.y (find_as_inner_class): Don't disregard the enclosing scopebryce2001-10-092-12/+6
| | | | | | | when name qualifier matches a package name. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46113 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-09 John Hornkvist <john@toastedmarshmallow.com>bryce2001-10-099-123/+695
| | | | | | | | | | | | | | | Implement Darwin PowerPC ABI. * configure.in: Handle powerpc-*-darwin*. * Makefile.am: Set source files for POWERPC_DARWIN. * configure: Rebuilt. * Makefile.in: Rebuilt. * include/ffi.h.in: Define FFI_DARWIN and FFI_DEFAULT_ABI for POWERPC_DARWIN. * src/powerpc/darwin.S: New file. * src/powerpc/ffi_darwin.c: New file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46112 138bc75d-0d04-0410-961f-82ee72b054a4
* * varasm.c (set_named_section_flags): Initialize "declared".rth2001-10-092-1/+6
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46111 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-08 Geert Bosch <bosch@gnat.com>bosch2001-10-082-14/+29
| | | | | | | | * Makefile.in (treeprs.ads, einfo.h, sinfo.h, nmake.adb, nmake.ads): Automatically build utilities when files need to be regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46110 138bc75d-0d04-0410-961f-82ee72b054a4
* * xsnames.adb: New utility for updating snames.ads and snames.adbbosch2001-10-082-0/+183
| | | | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46109 138bc75d-0d04-0410-961f-82ee72b054a4
* * varasm.c (struct in_named_entry): Add declared.robertl2001-10-083-0/+40
| | | | | | | | | (named_section_first_declaration): New function. (default_elf_asm_named_section): Use it. * output.h (named_section_first_declaration): New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46108 138bc75d-0d04-0410-961f-82ee72b054a4
* * i386.md (movsi_xor): Export.rth2001-10-082-6/+43
| | | | | | | | (setcc peep2): Use it when available; add an alternative to match zero_extendhisi2_and. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46107 138bc75d-0d04-0410-961f-82ee72b054a4
* * romp-protos.h (romp_initialize_trampoline): New function.ghazi2001-10-084-31/+34
| | | | | | | | | * romp.c (romp_initialize_trampoline): Likewise. * romp.h (INITIALIZE_TRAMPOLINE): Define in terms of romp_initialize_trampoline. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46104 138bc75d-0d04-0410-961f-82ee72b054a4
* * m68k/3b1.h (ASM_OUTPUT_SOURCE_LINE): Don't reference `last_linenum'.ghazi2001-10-085-4/+11
| | | | | | | | | * m68k/auxas.h (ASM_OUTPUT_SOURCE_LINE): Likewise. * m68k/crds.h (ASM_OUTPUT_SOURCE_LINE): Likewise. * m68k/mot3300.h (ASM_OUTPUT_SOURCE_LINE): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46100 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-08 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>sirl2001-10-082-0/+25
| | | | | | | * unroll.c (loop_iterations): Extend check for multiple back edges. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46099 138bc75d-0d04-0410-961f-82ee72b054a4
* * java/net/URLDecoder.java: Remerge with Classpathmark2001-10-083-70/+232
| | | | | | | * java/net/URLEncoder.java: Merge with Classpath git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46098 138bc75d-0d04-0410-961f-82ee72b054a4
* 2001-10-08 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>sirl2001-10-082-0/+102
| | | | | | | * gcc.c-torture/execute/20011008-3.c: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46097 138bc75d-0d04-0410-961f-82ee72b054a4
* * langhooks.h: New file.aoliva2001-10-089-140/+352
| | | | | | | | | | | | | | | | | | | | | | | * Makefile.in (OBJS): Added langhooks.o. (c-lang.o): Depend on langhooks.h. (c-common.o): Don't depend on tree-inline.h. (tree-inline.o): Depend on toplev.h. (langhooks.o): New rule. * c-common.c: Don't include tree-inline.h. (c_mark_lang_decl): Mark argument c as unused. (c_common_lang_init): Don't initialize hooks here. * c-lang.c: Include langhooks.h, then override some macros. (lang_hooks): Initialize with macros in langhooks.h. (c_init): Don't initialize hooks here. * toplev.c (struct lang_hooks_for_tree_inlining): New struct. (struct lang_hooks): Add tree_inlining. Refer to langhooks.h. * tree-inline.c: Include toplev.h. Don't define hook variables. * tree-inline.h: Don't define hook types nor declare hook variables. Move macros to... * langhooks.c: ... new file, as functions. Adjust all callers. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46096 138bc75d-0d04-0410-961f-82ee72b054a4