diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c12e4a646a..3fe67d0f8bb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-02  Kaz Kojima  <kkojima@gcc.gnu.org>
+
+	* config/sh/linux.h (SUBTARGET_LINK_SPEC): Don't set rpath.
+	(LIB_SPEC): Set -lpthread always when -pthread set.  Set -lieee
+	when -mieee-fp set and -shared not set.
+	(SH_FALLBACK_FRAME_FLOAT_STATE): Don't define for SH5.
+
 2003-08-02  Neil Booth  <neil@daikokuya.co.uk>
 
 	* cppfiles.c (struct _cpp_file): Rename once_only_next to
diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
index 78a40e5e3b5..edc7fa6e2c7 100644
--- a/gcc/config/sh/linux.h
+++ b/gcc/config/sh/linux.h
@@ -73,15 +73,16 @@ do { \
   "%{shared:-shared} \
    %{!static: \
      %{rdynamic:-export-dynamic} \
-     %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
-     %{!rpath:-rpath /lib}} \
+     %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
    %{static:-static}"
 
 #undef LIB_SPEC
 #define LIB_SPEC \
-  "%{shared: -lc} \
+  "%{pthread:-lpthread} \
+   %{shared: -lc} \
    %{!static:-rpath-link %R/lib:%R/usr/lib} \
-   %{!shared: %{pthread:-lthread} \
+   %{!shared: \
+     %{mieee-fp:-lieee} \
      %{profile:-lc_p} %{!profile: -lc}}"
 
 #if defined(HAVE_LD_EH_FRAME_HDR)
@@ -170,11 +171,11 @@ do { \
 #define SH_DWARF_FRAME_FPSCR	24
 #endif /* defined (__SH5__) */
 
-#if defined (__SH5__) && __SH5__ != 32
+#if defined (__SH5__)
 /* MD_FALLBACK_FRAME_STATE_FOR is not yet defined for SHMEDIA.  */
-#else /* defined (__SH5__) && __SH5__ != 32 */
+#else /* defined (__SH5__) */
 
-#if defined (__SH3E__) || defined (__SH4__) || defined (__SH5__)
+#if defined (__SH3E__) || defined (__SH4__)
 #define SH_FALLBACK_FRAME_FLOAT_STATE(SC, FS, CFA)			\
   do {									\
     int i_, r_;								\
@@ -274,5 +275,5 @@ do { \
     goto SUCCESS;							\
   } while (0)
 
-#endif /* defined (__SH5__) && __SH5__ != 32 */
+#endif /* defined (__SH5__) */
 #endif /* IN_LIBGCC2 */