4 files changed, 12 insertions, 8 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 4c3ff91..1dae020 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-20  Sandra Loosemore  <sandra@codesourcery.com>
+	    Chung-Lin Tang  <cltang@codesourcery.com>
+
+	* config/nios2/t-nios2 (CRTSTUFF_T_CFLAGS): Add -mno-gpopt.
+	* config/nios2/crti.S: Remove .file directive.
+	* config/nios2/crtn.S: Likewise.
+
 2014-02-18  Kai Tietz  <ktietz@redhat.com>
 	Jonathan Schleifer  <js@webkeks.org>
 
diff --git a/libgcc/config/nios2/crti.S b/libgcc/config/nios2/crti.S
index 9f5d523..f21346c 100644
--- a/libgcc/config/nios2/crti.S
+++ b/libgcc/config/nios2/crti.S
@@ -36,8 +36,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 
    See crt0.s for the code that calls init and fini.  */
 
-	.file	"crti.asm"
-
 	.section	".init"
 	.align 2
 	.global	_init
diff --git a/libgcc/config/nios2/crtn.S b/libgcc/config/nios2/crtn.S
index a66b449..54c9cb6 100644
--- a/libgcc/config/nios2/crtn.S
+++ b/libgcc/config/nios2/crtn.S
@@ -23,12 +23,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 
 
 /* This file just makes sure that the .fini and .init sections do in
-fact return.  Users may put any desired instructions in those sections.
-This file is the last thing linked into any executable.
-*/	
-	.file	"crtn.asm"
-
-
+   fact return.  Users may put any desired instructions in those sections.
+   This file is the last thing linked into any executable.  */	
 
 	.section	".init"
 	ldw	ra, 44(sp)
diff --git a/libgcc/config/nios2/t-nios2 b/libgcc/config/nios2/t-nios2
index 320dedf..7a81a7f 100644
--- a/libgcc/config/nios2/t-nios2
+++ b/libgcc/config/nios2/t-nios2
@@ -3,3 +3,6 @@ LIB2ADD += $(srcdir)/config/nios2/lib2-divmod.c \
 	   $(srcdir)/config/nios2/lib2-divtable.c \
 	   $(srcdir)/config/nios2/lib2-mul.c \
 	   $(srcdir)/config/nios2/tramp.c
+
+# Disable use of GP-relative addressing in startup code.
+CRTSTUFF_T_CFLAGS += -mno-gpopt