* scripttempl/armbpabi.sc (ENTRY): Do not define when performing a

        relocatable link.
        * scripttempl/elf32cr16.sc: Likewise.
        * scripttempl/elf32cr16c.sc: Likewise.
        * scripttempl/elf32crx.sc: Likewise.
        * scripttempl/elf32sh-symbian.sc: Likewise.
        * scripttempl/elf_chaos.sc: Likewise.
        * scripttempl/elfd10v.sc: Likewise.
        * scripttempl/elfi370.sc: Likewise.
        * scripttempl/elfm68hc11.sc: Likewise.
        * scripttempl/elfm68hc12.sc: Likewise.
        * scripttempl/ip2k.sc: Likewise.
        * scripttempl/iq2000.sc: Likewise.
        * scripttempl/mep.sc: Likewise.
        * scripttempl/v850.sc: Likewise.
        * scripttempl/xstormy16.sc: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0351411706ebc76cbc32de22c55e5960413736ad..7ba5fb42494f36fea342aeaeab59ecf188a41b7b 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,22 @@
+2008-02-18  Nick Clifton  <nickc@redhat.com>
+
+       * scripttempl/armbpabi.sc (ENTRY): Do not define when performing a
+       relocatable link.
+       * scripttempl/elf32cr16.sc: Likewise.
+       * scripttempl/elf32cr16c.sc: Likewise.
+       * scripttempl/elf32crx.sc: Likewise.
+       * scripttempl/elf32sh-symbian.sc: Likewise.
+       * scripttempl/elf_chaos.sc: Likewise.
+       * scripttempl/elfd10v.sc: Likewise.
+       * scripttempl/elfi370.sc: Likewise.
+       * scripttempl/elfm68hc11.sc: Likewise.
+       * scripttempl/elfm68hc12.sc: Likewise.
+       * scripttempl/ip2k.sc: Likewise.
+       * scripttempl/iq2000.sc: Likewise.
+       * scripttempl/mep.sc: Likewise.
+       * scripttempl/v850.sc: Likewise.
+       * scripttempl/xstormy16.sc: Likewise.
+
 2008-02-16  Alan Modra  <amodra@bigpond.net.au>
 
        PR ld/5761

diff --git a/ld/scripttempl/armbpabi.sc b/ld/scripttempl/armbpabi.sc
index 38a856482da7d5c9a553ea10e6665f36efea662f..abcb69f3ba3b09f41576f0170a175b1ac19ccdc2 100644 (file)
--- a/ld/scripttempl/armbpabi.sc
+++ b/ld/scripttempl/armbpabi.sc
@@ -124,7 +124,7 @@ cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${OUTPUT_ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+/* Do we need any of these for elf?

diff --git a/ld/scripttempl/elf32cr16.sc b/ld/scripttempl/elf32cr16.sc
index 2e62fa2f5c76c04f67cb5ada4cb5d052f5bfa3c0..69b66e5a9e3d41ea4bb8ff7db9230e161aac76d3 100644 (file)
--- a/ld/scripttempl/elf32cr16.sc
+++ b/ld/scripttempl/elf32cr16.sc
@@ -17,8 +17,8 @@ cat <<EOF
 
 OUTPUT_FORMAT("${OUTPUT_FORMAT}")
 OUTPUT_ARCH(${ARCH})
-EXTERN(${ENTRY})
-ENTRY(${ENTRY})
+${RELOCATING+EXTERN(${ENTRY})}
+${RELOCATING+ENTRY(${ENTRY})}
 
 /* Define memory regions.  */
 MEMORY

diff --git a/ld/scripttempl/elf32cr16c.sc b/ld/scripttempl/elf32cr16c.sc
index b02edfdcde11fe555cd55a9f5881c43714ea5d4c..70cbb599bf7fa25efc8833cdaa77759fe25f6999 100644 (file)
--- a/ld/scripttempl/elf32cr16c.sc
+++ b/ld/scripttempl/elf32cr16c.sc
@@ -12,9 +12,8 @@ cat <<EOF
    (which is not called explicitly) is in an archive (which is
    the usual case).  */
 
-EXTERN(${ENTRY})
-
-ENTRY(${ENTRY})
+${RELOCATING+EXTERN(${ENTRY})}
+${RELOCATING+ENTRY(${ENTRY})}
 
 MEMORY
 {

diff --git a/ld/scripttempl/elf32crx.sc b/ld/scripttempl/elf32crx.sc
index 430418744f913f399664947f51c5d9278a278535..c3d6751f949dfab26f4f1e5b0aa6d7459de8da8e 100644 (file)
--- a/ld/scripttempl/elf32crx.sc
+++ b/ld/scripttempl/elf32crx.sc
@@ -17,8 +17,8 @@ cat <<EOF
 
 OUTPUT_FORMAT("${OUTPUT_FORMAT}")
 OUTPUT_ARCH(${ARCH})
-EXTERN(${ENTRY})
-ENTRY(${ENTRY})
+${RELOCATING+EXTERN(${ENTRY})}
+${RELOCATING+ENTRY(${ENTRY})}
 
 /* Define memory regions.  */
 MEMORY

diff --git a/ld/scripttempl/elf32sh-symbian.sc b/ld/scripttempl/elf32sh-symbian.sc
index 8e115b9c3d09c494c11307bc1f811319eb630671..b86a5b69f62a62559e9cfae612ff35219d5afe06 100644 (file)
--- a/ld/scripttempl/elf32sh-symbian.sc
+++ b/ld/scripttempl/elf32sh-symbian.sc
@@ -138,7 +138,7 @@ cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${OUTPUT_ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+/* Do we need any of these for elf?

diff --git a/ld/scripttempl/elf_chaos.sc b/ld/scripttempl/elf_chaos.sc
index 2725cf5081a1ffcd09553e693cdd12f94b0d97ad..379c7394ed0e3db440a11fb3443eac9e3b6e2848 100644 (file)
--- a/ld/scripttempl/elf_chaos.sc
+++ b/ld/scripttempl/elf_chaos.sc
@@ -151,7 +151,7 @@ cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${OUTPUT_ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+/* Do we need any of these for elf?

diff --git a/ld/scripttempl/elfd10v.sc b/ld/scripttempl/elfd10v.sc
index a4c907b44a8fff6c5a21b012a0e3d83cb8a6c445..c5f9631c5fa9a2c6d0397f563dafded011373e25 100644 (file)
--- a/ld/scripttempl/elfd10v.sc
+++ b/ld/scripttempl/elfd10v.sc
@@ -58,7 +58,7 @@ cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${OUTPUT_ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+/* Do we need any of these for elf?

diff --git a/ld/scripttempl/elfi370.sc b/ld/scripttempl/elfi370.sc
index 06cb3bacf057672911b44cf9063194d448d69f03..140021ae3aa9ae3eba28f7bab1002c3d6c0b68a7 100644 (file)
--- a/ld/scripttempl/elfi370.sc
+++ b/ld/scripttempl/elfi370.sc
@@ -35,7 +35,7 @@ cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+/* Do we need any of these for elf?

diff --git a/ld/scripttempl/elfm68hc11.sc b/ld/scripttempl/elfm68hc11.sc
index f4977f67ac403d797e771896712a3ef301b97f35..a6f2cce853a41c89bc42ca6e14a2b9d67a033c43 100644 (file)
--- a/ld/scripttempl/elfm68hc11.sc
+++ b/ld/scripttempl/elfm68hc11.sc
@@ -164,7 +164,7 @@ ${RELOCATING-/* Linker script for 68HC11 object file (ld -r).  */}
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${OUTPUT_ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+${EXECUTABLE_SYMBOLS}}

diff --git a/ld/scripttempl/elfm68hc12.sc b/ld/scripttempl/elfm68hc12.sc
index f222343097ce2355de0deff78214814ac4569b28..0774eb2135ee771da77a7aa04aae7b24c46f73fb 100644 (file)
--- a/ld/scripttempl/elfm68hc12.sc
+++ b/ld/scripttempl/elfm68hc12.sc
@@ -164,7 +164,7 @@ ${RELOCATING-/* Linker script for 68HC12 object file (ld -r).  */}
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${OUTPUT_ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+${EXECUTABLE_SYMBOLS}}

diff --git a/ld/scripttempl/ip2k.sc b/ld/scripttempl/ip2k.sc
index d7826cafcaac71614e4c5cb7447f06eb71861c01..a54c310753cee293414ab1e4cf356237efb0c76e 100644 (file)
--- a/ld/scripttempl/ip2k.sc
+++ b/ld/scripttempl/ip2k.sc
@@ -1,7 +1,7 @@
 cat << EOF
 OUTPUT_FORMAT("elf32-ip2k", "elf32-ip2k", "elf32-ip2k")
 OUTPUT_ARCH(ip2k)
-ENTRY(_start)
+${RELOCATING+ENTRY(_start)}
 SEARCH_DIR(.);
 
 /* IP2022 default linker script.  */

diff --git a/ld/scripttempl/iq2000.sc b/ld/scripttempl/iq2000.sc
index b1e0cf4bfaca647c3dc7298b18d83d416073752a..e571a58ce9de0d8d8fc8d2d4af004daeb5a0d7fc 100644 (file)
--- a/ld/scripttempl/iq2000.sc
+++ b/ld/scripttempl/iq2000.sc
@@ -119,7 +119,7 @@ cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${OUTPUT_ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+/* Do we need any of these for elf?

diff --git a/ld/scripttempl/mep.sc b/ld/scripttempl/mep.sc
index 9062d5800476f6f60fef503dfb920a252104c299..a29ebcaad4780309de61d1b454726314bb58d34d 100644 (file)
--- a/ld/scripttempl/mep.sc
+++ b/ld/scripttempl/mep.sc
@@ -201,7 +201,7 @@ cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${OUTPUT_ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+/* Do we need any of these for elf?

diff --git a/ld/scripttempl/v850.sc b/ld/scripttempl/v850.sc
index 18ba03a20b6cc7cd0834cb76dce497cdf302295b..7359975a482e644d3dfba0c6f0c6b16daa3d3894 100644 (file)
--- a/ld/scripttempl/v850.sc
+++ b/ld/scripttempl/v850.sc
@@ -2,7 +2,7 @@ cat << EOF
 OUTPUT_FORMAT("elf32-v850", "elf32-v850",
              "elf32-v850")
 OUTPUT_ARCH(v850)
-ENTRY(_start)
+${RELOCATING+ENTRY(_start)}
 SEARCH_DIR(.);
 EXTERN(__ctbp __ep __gp);
 SECTIONS

diff --git a/ld/scripttempl/xstormy16.sc b/ld/scripttempl/xstormy16.sc
index 9008f5ce8e06b5a1122fbf53971b758095e81b09..73d08b811726d5edbd03ba4e5b1a18e36019d0a7 100644 (file)
--- a/ld/scripttempl/xstormy16.sc
+++ b/ld/scripttempl/xstormy16.sc
@@ -96,7 +96,7 @@ cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
              "${LITTLE_OUTPUT_FORMAT}")
 OUTPUT_ARCH(${OUTPUT_ARCH})
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY(${ENTRY})}
 
 ${RELOCATING+${LIB_SEARCH_DIRS}}
 ${RELOCATING+${EXECUTABLE_SYMBOLS}}