Mercurial > hg > xemacs-beta

changeset 846:7b263c3f9ec9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-05-16 15:24:20 by stephent] ppc nocombreloc fix <878z6krubv.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Thu, 16 May 2002 15:24:21 +0000
parents 77624ff6e2da
children 74899b430f18
files ChangeLog configure.in
diffstat 2 files changed, 21 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu May 16 15:11:23 2002 +0000
+++ b/ChangeLog	Thu May 16 15:24:21 2002 +0000
@@ -1,3 +1,8 @@
+2002-02-28  Malcolm Purvis  <malcolmpurvis@optushome.com.au>
+
+	* configure.in: Protect nocomboreloc linker arguments to avoid
+	problem on the ppc.
+
 2002-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* PROBLEMS: Describe "Hannibal Lecter" crash on Linux.  Reorder
--- a/configure.in	Thu May 16 15:11:23 2002 +0000
+++ b/configure.in	Thu May 16 15:24:21 2002 +0000
@@ -2015,6 +2015,21 @@
 AC_MSG_RESULT(no)
 fi
 
+dnl GNU ld now defaults to combreloc, which screws up unexec, but not pdump.
+dnl Note that it's OK if the GNU style long option causes non-GNU ld to barf
+dnl a usage message, that's often good enough.  Please report it, though.
+dnl #### Should make this Solaris-friendly.
+dnl Link with -z nocombreloc for now.
+if test "$pdump" != "yes"; then
+  AC_MSG_CHECKING(for \"-z nocombreloc\" linker flag)
+  case "`ld --help 2>&1`" in
+    *-z\ nocombreloc* ) AC_MSG_RESULT(yes)
+      XE_PREPEND(-z nocombreloc, ld_switch_site) ;;
+    *) AC_MSG_RESULT(no) ;;
+  esac
+fi
+
+
 dnl Inform compiler that certain flags are meant for the linker
 dnl XE_PROTECT_LINKER_FLAGS(shell_var)
 define([XE_PROTECT_LINKER_FLAGS], [
@@ -2032,6 +2047,7 @@
 fi])dnl
 XE_PROTECT_LINKER_FLAGS(ld_switch_system)
 XE_PROTECT_LINKER_FLAGS(ld_switch_machine)
+XE_PROTECT_LINKER_FLAGS(ld_switch_site)
 XE_PROTECT_LINKER_FLAGS(LDFLAGS)
 XE_PROTECT_LINKER_FLAGS(ld_call_shared)
 
@@ -2546,20 +2562,6 @@
   fi
 fi
 
-dnl GNU ld now defaults to combreloc, which screws up unexec, but not pdump.
-dnl Note that it's OK if the GNU style long option causes non-GNU ld to barf
-dnl a usage message, that's often good enough.  Please report it, though.
-dnl #### Should make this Solaris-friendly.
-dnl Link with -z nocombreloc for now.
-if test "$pdump" != "yes"; then
-  AC_MSG_CHECKING(for \"-z nocombreloc\" linker flag)
-  case "`ld --help 2>&1`" in
-    *-z\ nocombreloc* ) AC_MSG_RESULT(yes)
-      XE_PREPEND(-z nocombreloc, ld_switch_site) ;;
-    *) AC_MSG_RESULT(no) ;;
-  esac
-fi
-
 dnl ----------------------
 dnl Choose a window system
 dnl ----------------------