# HG changeset patch
# User Jeff Sparkes <jsparkes@gmail.com>
# Date 1304424801 14400
# Node ID 01900734203a8d625bb4ec113fd0daad8131d7bb
# Parent  4b5b7dcc19d6e2077014fa031ab4989d26a21219# Parent  eb4eeec50f25a08d1fad380325a23f299b6281ba
Auto merge.

diff -r 4b5b7dcc19d6 -r 01900734203a src/ChangeLog
--- a/src/ChangeLog	Mon May 02 08:51:19 2011 -0400
+++ b/src/ChangeLog	Tue May 03 08:13:21 2011 -0400
@@ -1,3 +1,8 @@
+2011-05-03  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* dumper.c (pdump_file_try): Remove static qualifier.
+	Thanks to Hans de Graaff of Gentoo and Marcus Crestani.
+
 2011-05-01  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* lread.c (parse_integer):
diff -r 4b5b7dcc19d6 -r 01900734203a src/dumper.c
--- a/src/dumper.c	Mon May 02 08:51:19 2011 -0400
+++ b/src/dumper.c	Tue May 03 08:13:21 2011 -0400
@@ -2593,8 +2593,9 @@
 
 #endif /* !WIN32_NATIVE */
 
-
-static int
+/* This used to be static, but there seems to be a bug in the GCC 4.1.2
+   optimizer that clobbers exe_path. */
+int
 pdump_file_try (Wexttext *exe_path)
 {
   Wexttext *w = exe_path + wext_strlen (exe_path);