From 61e224f32b2e697d34f595c9fb0563df77f870f0 Mon Sep 17 00:00:00 2001
From: Stuart Menefy <stuart.menefy@st.com>
Date: Thu, 7 Dec 2006 17:48:52 +0900
Subject: [PATCH] --- yaml --- r: 44311 b: refs/heads/master c:
 ff4e2ca7c64cd87ec72fa0d238c1b34493133910 h: refs/heads/master i:   44309:
 59b9359b98e48c2ecb93a477197bd14e944b6bd4   44307:
 5018330d0b1a4d69888eae14a33ee44d4ce7b483   44303:
 5a73e3a64e420a34bb2f38c774d2ff83d9ae11da v: v3

---
 [refs]                          |  2 +-
 trunk/arch/sh/kernel/sh_ksyms.c | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 86d26d0ca238..1676d6ab24b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6250e37292b9679b82a3edc28f330a32eed9ae4
+refs/heads/master: ff4e2ca7c64cd87ec72fa0d238c1b34493133910
diff --git a/trunk/arch/sh/kernel/sh_ksyms.c b/trunk/arch/sh/kernel/sh_ksyms.c
index ceee79143401..e6106239a0fe 100644
--- a/trunk/arch/sh/kernel/sh_ksyms.c
+++ b/trunk/arch/sh/kernel/sh_ksyms.c
@@ -70,13 +70,26 @@ DECLARE_EXPORT(__sdivsi3);
 DECLARE_EXPORT(__ashrdi3);
 DECLARE_EXPORT(__ashldi3);
 DECLARE_EXPORT(__lshrdi3);
-DECLARE_EXPORT(__movstr);
 DECLARE_EXPORT(__movstrSI16);
+#if __GNUC__ == 4
+DECLARE_EXPORT(__movmem);
+#else
+DECLARE_EXPORT(__movstr);
+#endif
 
 #ifdef CONFIG_CPU_SH4
+#if __GNUC__ == 4
+DECLARE_EXPORT(__movmem_i4_even);
+DECLARE_EXPORT(__movmem_i4_odd);
+DECLARE_EXPORT(__movmemSI12_i4);
+DECLARE_EXPORT(__sdivsi3_i4i);
+DECLARE_EXPORT(__udiv_qrnnd_16);
+DECLARE_EXPORT(__udivsi3_i4i);
+#else /* GCC 3.x */
 DECLARE_EXPORT(__movstr_i4_even);
 DECLARE_EXPORT(__movstr_i4_odd);
 DECLARE_EXPORT(__movstrSI12_i4);
+#endif /* __GNUC__ == 4 */
 #endif
 
 #if defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)