From 961d2c1c92637ca9cbeab7e6c1d1edd0a8cd58b7 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@bigpond.net.au>
Date: Fri, 28 Feb 2003 04:46:04 +0000
Subject: [PATCH] 	* emultempl/elf32.em
 (gld${EMULATION_NAME}_get_script): Add combreloc 	support when scripts
 read from files.

---
 ld/ChangeLog          |  5 +++++
 ld/emultempl/elf32.em | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6b2ee9e08e..6c702941ca 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,10 @@
 2003-02-28  Alan Modra  <amodra@bigpond.net.au>
 
+	* emultempl/elf32.em (gld${EMULATION_NAME}_get_script): Add combreloc
+	support when scripts read from files.
+
+2003-02-28  Alan Modra  <amodra@bigpond.net.au>
+
 	* ldemul.c (ldemul_parse_args): Return FALSE by default.
 	* ldemul.h (struct ld_emulation_xfer_struct): Update parse_args
 	comment.
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index cfe6407f49..28bb8d8f8a 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1503,10 +1503,33 @@ cat >>e${EMULATION_NAME}.c <<EOF
     return "ldscripts/${EMULATION_NAME}.xr";
   else if (!config.text_read_only)
     return "ldscripts/${EMULATION_NAME}.xbn";
+EOF
+if cmp -s ldscripts/${EMULATION_NAME}.x ldscripts/${EMULATION_NAME}.xn; then :
+else
+cat >>e${EMULATION_NAME}.c <<EOF
   else if (!config.magic_demand_paged)
     return "ldscripts/${EMULATION_NAME}.xn";
+EOF
+fi
+if test -n "$GENERATE_SHLIB_SCRIPT" ; then
+if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then
+cat >>e${EMULATION_NAME}.c <<EOF
+  else if (link_info.shared && link_info.combreloc)
+    return "ldscripts/${EMULATION_NAME}.xsc";
+EOF
+fi
+cat >>e${EMULATION_NAME}.c <<EOF
   else if (link_info.shared)
     return "ldscripts/${EMULATION_NAME}.xs";
+EOF
+fi
+if test -n "$GENERATE_COMBRELOC_SCRIPT" ; then
+cat >>e${EMULATION_NAME}.c <<EOF
+  else if (link_info.combreloc)
+    return "ldscripts/${EMULATION_NAME}.xc";
+EOF
+fi
+cat >>e${EMULATION_NAME}.c <<EOF
   else
     return "ldscripts/${EMULATION_NAME}.x";
 }
-- 
2.11.0