From ea2002ba74c91a555992984a01398529e4c2ed17 Mon Sep 17 00:00:00 2001
From: Christian Bruel <christian.bruel@st.com>
Date: Fri, 31 Jul 2009 14:51:10 +0200
Subject: [PATCH] enable SH libgloss build

From-SVN: r150314
---
 ChangeLog      | 5 +++++
 configure      | 7 ++++++-
 configure.ac   | 7 ++++++-
 gcc/ChangeLog  | 4 ++++
 gcc/config.gcc | 2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50a2ec58942..daac975f804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-31  Christian Bruel  <christian.bruel@st.com>
+
+	* configure.ac (sh*-*-elf): Don't add target-libgloss to noconfigdirs.
+	* configure: Regenerate.
+	
 2009-07-28  Rask Ingemann Lambertsen <ccc94453@vip.cybercity.dk>
 
 	* MAINTAINERS (Write After Approval): Update my e-mail address.
diff --git a/configure b/configure
index 8ba3c9cfe83..7bebf1e591d 100755
--- a/configure
+++ b/configure
@@ -2650,7 +2650,12 @@ case "${target}" in
       i[3456789]86-*-msdosdjgpp*) ;; # don't add gprof back in
       *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
     esac
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    case "${target}" in
+      sh*-*-elf)
+         noconfigdirs="$noconfigdirs ${libgcj}" ;;
+      *)
+         noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;;
+    esac
     ;;
   sparclet-*-aout* | sparc86x-*-*)
     libgloss_dir=sparc
diff --git a/configure.ac b/configure.ac
index 22cd976bbbd..30721eb9883 100644
--- a/configure.ac
+++ b/configure.ac
@@ -874,7 +874,12 @@ case "${target}" in
       i[[3456789]]86-*-msdosdjgpp*) ;; # don't add gprof back in
       *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
     esac
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    case "${target}" in
+      sh*-*-elf)
+         noconfigdirs="$noconfigdirs ${libgcj}" ;;
+      *)
+         noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;;
+    esac
     ;;
   sparclet-*-aout* | sparc86x-*-*)
     libgloss_dir=sparc
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7e55aaea7ee..309bc29a83c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-31  Christian Bruel  <christian.bruel@st.com>	
+
+	* gcc/config.gcc (sh*-*-elf): test with_libgloss.
+	
 2009-07-31  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
 
 	* config/arm/arm.c (arm_arm_address_cost): Fix typo. 
diff --git a/gcc/config.gcc b/gcc/config.gcc
index ea24e1670c6..3d68b710d1b 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2096,7 +2096,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
 	sh*-*-linux*)	tmake_file="${tmake_file} sh/t-linux"
 			tm_file="${tm_file} linux.h glibc-stdint.h sh/linux.h" ;;
 	sh*-*-netbsd*)	tm_file="${tm_file} netbsd.h netbsd-elf.h sh/netbsd-elf.h" ;;
-	sh*-superh-elf)	if test x$with_libgloss != xno; then
+	sh*-*-elf)	if test x$with_libgloss != xno; then
 				with_libgloss=yes
 				tm_file="${tm_file} sh/newlib.h"
 			fi