From 29dbeb4e51e5e2e1956edc494f4ef946a6dd2a64 Mon Sep 17 00:00:00 2001
From: Ivan Kuten <ivan.kuten@promwad.com>
Date: Fri, 9 Nov 2007 10:07:15 +0000
Subject: update elf2flt nios2 support, thanks atle

---
 toolchain/elf2flt/elf2flt.nios2.conditional | 31 ++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'toolchain/elf2flt/elf2flt.nios2.conditional')

diff --git a/toolchain/elf2flt/elf2flt.nios2.conditional b/toolchain/elf2flt/elf2flt.nios2.conditional
index 8442f9385..ca99cb3a1 100644
--- a/toolchain/elf2flt/elf2flt.nios2.conditional
+++ b/toolchain/elf2flt/elf2flt.nios2.conditional
@@ -1,5 +1,5 @@
 --- elf2flt/elf2flt.ld
-++ elf2flt/elf2flt.ld
++++ elf2flt/elf2flt.ld
 @@ -62,6 +62,10 @@
  		*(.eh_frame)
  		*(.gcc_except_table)
@@ -11,3 +11,32 @@
  		/* Microblaze has .sdata and .sbss (small bss).  They must
  		   be contiguous, so please don't move any of this. JW */
  		_ssrw = . ;			
+@@ -72,7 +72,7 @@
+ 		_ssrw = . ;			
+ 		*(.sdata) 
+ 		*(.sdata.*)
+-		*(.sbss)			/* Don't move this! */
++		*(.sbss .gnu.linkonce.sb*)		/* Don't move this! */
+ 		_essrw = . ;
+ 
+ 		_ssrw_size = _essrw - _ssrw;
+--- elf2flt/ld-elf2flt.in
++++ elf2flt/ld-elf2flt.in
+@@ -132,7 +132,7 @@
+ 			esac
+ 			ARG1="$ARG1 -defsym $GOT_OFFSET=`expr ${SHARED_ID} '*' -4 - 4`"
+ 		fi
+-		if [ "@emit_relocs@" = "yes" ]
++		if [ "no" = "yes" ]
+ 		then
+ 			SEDOP="$SEDOP -e s/^SINGLE_LINK://"
+ 		else
+@@ -155,7 +155,7 @@
+ 			LDSCRIPT="$NEWLDSCRIPT"
+ 		fi
+ 
+-		if [ "@emit_relocs@" = "yes" ]
++		if [ "no" = "yes" ]
+ 		then
+ 		 $LINKER $EMUL $SDIRS -T $LDSCRIPT -q -o "$OFILE.gdb" $ARG1             ||exit $?
+ 		 RFILE="$OFILE.gdb"
-- 
cgit v1.2.3