Remove spurious conflict indicators.

[deliverable/binutils-gdb.git] / ld / scripttempl / mips.sc

diff --git a/ld/scripttempl/mips.sc b/ld/scripttempl/mips.sc
index 0926db5b300ed73e1fd07414f5e3c06dae4bdd02..f53558aba4b81edf319ea5bd1844e712c761375c 100644 (file)
--- a/ld/scripttempl/mips.sc
+++ b/ld/scripttempl/mips.sc
@@ -3,18 +3,29 @@
 # These variables may be overridden by the emulation file.  The
 # defaults are appropriate for a DECstation running Ultrix.
 test -z "$ENTRY" && ENTRY=__start
-test -z "$TEXT_START_ADDR" && TEXT_START_ADDR="0x400000 + SIZEOF_HEADERS"
-test -z "$DATA_ADDR" && DATA_ADDR=0x10000000
-test -z "$BSS_VAR" && BSS_VAR=
+
+if [ -z "$EMBEDDED" ]; then
+  test -z "$TEXT_START_ADDR" && TEXT_START_ADDR="0x400000 + SIZEOF_HEADERS"
+else
+  test -z "$TEXT_START_ADDR" && TEXT_START_ADDR="0x400000"
+fi
+if test "x$LD_FLAG" = "xn" -o "x$LD_FLAG" = "xN"; then
+  DATA_ADDR=.
+else
+  test -z "$DATA_ADDR" && DATA_ADDR=0x10000000
+fi
 cat <<EOF
-OUTPUT_FORMAT("${OUTPUT_FORMAT}")
+OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
+             "${LITTLE_OUTPUT_FORMAT}")
 ${LIB_SEARCH_DIRS}
 
-ENTRY(${ENTRY})
+${RELOCATING+ENTRY (${ENTRY})}
 
 SECTIONS
 {
-  .text ${RELOCATING+ ${TEXT_START_ADDR}} : {
+  ${RELOCATING+. = ${TEXT_START_ADDR};}
+  .text : {
+    ${RELOCATING+ _ftext = . };
     *(.init)
     ${RELOCATING+ eprol  =  .};
     *(.text)
@@ -22,31 +33,33 @@ SECTIONS
     ${RELOCATING+ etext  =  .};
     ${RELOCATING+ _etext  =  .};
   }
-  .rdata ${RELOCATING+ ${DATA_ADDR}} : {
+  ${RELOCATING+. = ${DATA_ADDR};}
+  .rdata : {
     *(.rdata)
   }
-  .data ${RELOCATING+ .} : {
+  ${RELOCATING+ _fdata = ALIGN(16);}
+  .data : {
     *(.data)
     ${CONSTRUCTING+CONSTRUCTORS}
   }
-  ${RELOCATING+ _gp = . + 0x8000;}
-  .lit8 ${RELOCATING+ .} : {
+  ${RELOCATING+ _gp = ALIGN(16) + 0x8000;}
+  .lit8 : {
     *(.lit8)
   }
-  .lit4 ${RELOCATING+ .} : {
+  .lit4 : {
     *(.lit4)
   }
-  .sdata ${RELOCATING+ .} : {
+  .sdata : {
     *(.sdata)
   }
   ${RELOCATING+ edata  =  .;}
   ${RELOCATING+ _edata  =  .;}
-  ${RELOCATING+ ${BSS_VAR}}
-  .sbss ${RELOCATING+ .} : {
+  ${RELOCATING+ _fbss = .;}
+  .sbss : {
     *(.sbss)
     *(.scommon)
   }
-  .bss ${RELOCATING+ .} : {
+  .bss : {
     *(.bss)
     *(COMMON)
   }