aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>1999-06-29 02:45:00 +0000
committerNick Clifton <nickc@redhat.com>1999-06-29 02:45:00 +0000
commita0290afa962321b2aee197dedfdefbb11b98ed98 (patch)
tree235ef097d767ab56ad57edb0f2d53e1be04fb9b7
parent4eb4387d5ecd923a812005e15399fa0a2d5c1842 (diff)
downloadgdb-a0290afa962321b2aee197dedfdefbb11b98ed98.zip
gdb-a0290afa962321b2aee197dedfdefbb11b98ed98.tar.gz
gdb-a0290afa962321b2aee197dedfdefbb11b98ed98.tar.bz2
Patch from: Jim Pick <jim@jimpick.com>
Added code so that .xs linker scripts are called so that ARM shared libraries are built correctly. CVS: ----------------------------------------------------------------------
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/emultempl/armelf.em6
2 files changed, 11 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index f6962ca..1e5914d 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-28 Jim Pick <jim@jimpick.com>
+
+ * emultempl/armelf.em: Added code so that .xs linker scripts are
+ called so that ARM shared libraries are built correctly.
+
1999-06-22 Mark Mitchell <mark@codesourcery.com>
* ldmain.c (main): Initialize link_info.init_function and
diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 6e3cfa6..88d7e27 100644
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -1215,6 +1215,10 @@ echo ' ; else if (!config.text_read_only) return' >> e${EMULATION_NAME}
sed $sc ldscripts/${EMULATION_NAME}.xbn >> e${EMULATION_NAME}.c
echo ' ; else if (!config.magic_demand_paged) return' >> e${EMULATION_NAME}.c
sed $sc ldscripts/${EMULATION_NAME}.xn >> e${EMULATION_NAME}.c
+if test -n "$GENERATE_SHLIB_SCRIPT" ; then
+ echo ' ; else if (link_info.shared) return' >> e${EMULATION_NAME}.c
+ sed $sc ldscripts/${EMULATION_NAME}.xs >> e${EMULATION_NAME}.c
+fi
echo ' ; else return' >> e${EMULATION_NAME}.c
sed $sc ldscripts/${EMULATION_NAME}.x >> e${EMULATION_NAME}.c
echo '; }' >> e${EMULATION_NAME}.c
@@ -1234,6 +1238,8 @@ cat >>e${EMULATION_NAME}.c <<EOF
return "ldscripts/${EMULATION_NAME}.xbn";
else if (!config.magic_demand_paged)
return "ldscripts/${EMULATION_NAME}.xn";
+ else if (link_info.shared)
+ return "ldscripts/${EMULATION_NAME}.xs";
else
return "ldscripts/${EMULATION_NAME}.x";
}