From b9ee0bb0786b270726aad94d40ed602b807ba576 Mon Sep 17 00:00:00 2001
From: Sandra Loosemore <sandra@codesourcery.com>
Date: Wed, 14 May 2014 23:24:37 +0000
Subject: [PATCH] 2014-05-14  Sandra Loosemore  <sandra@codesourcery.com>

	Sync from GCC mainline.

	* configure.ac (target_makefile_frag): Set for nios2-*-elf*.
	* configure: Regenerated.

	config/
	* mt-nios2-elf: New file.
---
 ChangeLog           | 5 +++++
 config/ChangeLog    | 4 ++++
 config/mt-nios2-elf | 5 +++++
 configure           | 3 +++
 configure.ac        | 3 +++
 5 files changed, 20 insertions(+)
 create mode 100644 config/mt-nios2-elf

diff --git a/ChangeLog b/ChangeLog
index 33dab6c57..caec2b127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-14  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* configure.ac (target_makefile_frag): Set for nios2-*-elf*.
+	* configure: Regenerated.
+
 2014-04-04  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* COPYING.NEWLIB: Add to current TI license to
diff --git a/config/ChangeLog b/config/ChangeLog
index e3f6f4566..18388d20e 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-14  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* mt-nios2-elf: New file.
+
 2013-09-29  Iain Sandoe  <iain@codesourcery.com>
 
 	* mh-darwin (BOOT_CFLAGS): Only add -mdynamic-no-pic for m32 hosts.
diff --git a/config/mt-nios2-elf b/config/mt-nios2-elf
new file mode 100644
index 000000000..1dee7c643
--- /dev/null
+++ b/config/mt-nios2-elf
@@ -0,0 +1,5 @@
+# We build library code with -mno-gpopt so that it can be linked with
+# larger executables with small-data sections that exceed the 16-bit
+# offset range for GP-relative addressing.
+CFLAGS_FOR_TARGET += -mno-gpopt
+CXXFLAGS_FOR_TARGET += -mno-gpopt
diff --git a/configure b/configure
index d62285c90..a67eb96c0 100755
--- a/configure
+++ b/configure
@@ -6987,6 +6987,9 @@ case "${target}" in
   mips*-*-*linux* | mips*-*-gnu*)
     target_makefile_frag="config/mt-mips-gnu"
     ;;
+  nios2-*-elf*)
+    target_makefile_frag="config/mt-nios2-elf"
+    ;;
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
     target_makefile_frag="config/mt-gnu"
     ;;
diff --git a/configure.ac b/configure.ac
index 4c2365250..87d51509c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2370,6 +2370,9 @@ case "${target}" in
   mips*-*-*linux* | mips*-*-gnu*)
     target_makefile_frag="config/mt-mips-gnu"
     ;;
+  nios2-*-elf*)
+    target_makefile_frag="config/mt-nios2-elf"
+    ;;
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
     target_makefile_frag="config/mt-gnu"
     ;;