diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d321a6ff7..03db5e1e0 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-28  Dhananjay Deshpande  <dhananjayd@kpitcummins.com> 
+
+	* newlib/libc/machine/h8300/memcpy.S: Use .h8300hn and .h8300sn for 
+	normal mode
+	* newlib/libc/machine/h8300/memset.S: Likewise
+	* newlib/lib/machine/h8300/reg_memcpy.S: Likewise
+	* newlib/lib/machine/h8300/reg_memset.S: Likewise
+	* newlib/lib/machine/h8300/setjmp.S: Likewise
+	* newlib/lib/machine/h8300/strcmp.S: Likewise
+	* newlib/lib/sys/h8300hms/crt0.S: Likewise
+
 2003-05-13  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/ctype/ctype_.c: Remove checks for deprecated __CYGWIN32__.
diff --git a/newlib/libc/machine/h8300/memcpy.S b/newlib/libc/machine/h8300/memcpy.S
index 3465ce558..759ce30dd 100644
--- a/newlib/libc/machine/h8300/memcpy.S
+++ b/newlib/libc/machine/h8300/memcpy.S
@@ -1,11 +1,19 @@
 #include "defines.h"
 
 #ifdef __H8300H__
+#ifdef __NORMAL_MODE__
+	.h8300hn
+#else
 	.h8300h
 #endif
+#endif
 
 #ifdef __H8300S__
+#ifdef __NORMAL_MODE__
+	.h8300sn
+#else
 	.h8300s
+#endif
 #endif
 
 	.global _memcpy
diff --git a/newlib/libc/machine/h8300/memset.S b/newlib/libc/machine/h8300/memset.S
index c12f17b4e..a056a1047 100644
--- a/newlib/libc/machine/h8300/memset.S
+++ b/newlib/libc/machine/h8300/memset.S
@@ -1,12 +1,20 @@
 #include "defines.h"
 
 #ifdef __H8300H__
+#ifdef __NORMAL_MODE__
+	.h8300hn
+#else
 	.h8300h
 #endif
+#endif
 
 #ifdef __H8300S__
+#ifdef __NORMAL_MODE__
+	.h8300sn
+#else
 	.h8300s
 #endif
+#endif
 
 
 ; A0P pointer to cursor
diff --git a/newlib/libc/machine/h8300/reg_memcpy.S b/newlib/libc/machine/h8300/reg_memcpy.S
index 772a43c27..61893694d 100644
--- a/newlib/libc/machine/h8300/reg_memcpy.S
+++ b/newlib/libc/machine/h8300/reg_memcpy.S
@@ -1,12 +1,20 @@
 #include "defines.h"
 
 #ifdef __H8300H__
+#ifdef __NORMAL_MODE__
+	.h8300hn
+#else
 	.h8300h
 #endif
+#endif
 
 #ifdef __H8300S__
+#ifdef __NORMAL_MODE__
+	.h8300sn
+#else
 	.h8300s
 #endif
+#endif
 
 
 	; dst A0
diff --git a/newlib/libc/machine/h8300/reg_memset.S b/newlib/libc/machine/h8300/reg_memset.S
index 8e58c5ee8..e490e7b6d 100644
--- a/newlib/libc/machine/h8300/reg_memset.S
+++ b/newlib/libc/machine/h8300/reg_memset.S
@@ -1,12 +1,20 @@
 #include "defines.h"
 
 #ifdef __H8300H__
+#ifdef __NORMAL_MODE__
+	.h8300hn
+#else
 	.h8300h
 #endif
+#endif
 
 #ifdef __H8300S__
+#ifdef __NORMAL_MODE__
+	.h8300sn
+#else
 	.h8300s
 #endif
+#endif
 
 
 	; dst A0
diff --git a/newlib/libc/machine/h8300/setjmp.S b/newlib/libc/machine/h8300/setjmp.S
index 5c44973c0..c51c986e3 100644
--- a/newlib/libc/machine/h8300/setjmp.S
+++ b/newlib/libc/machine/h8300/setjmp.S
@@ -1,11 +1,19 @@
 	.file "setjmp.S"
 
 #ifdef __H8300H__
+#ifdef __NORMAL_MODE__
+	.h8300hn
+#else
 	.h8300h
 #endif
+#endif
 
 #ifdef __H8300S__
+#ifdef __NORMAL_MODE__
+	.h8300sn
+#else
 	.h8300s
+#endif
 #endif
 
 	.section .text
diff --git a/newlib/libc/machine/h8300/strcmp.S b/newlib/libc/machine/h8300/strcmp.S
index 8dec7c0b9..f735fb89c 100644
--- a/newlib/libc/machine/h8300/strcmp.S
+++ b/newlib/libc/machine/h8300/strcmp.S
@@ -1,11 +1,19 @@
 #include "defines.h"
 
 #ifdef __H8300H__
+#ifdef __NORMAL_MODE__
+	.h8300hn
+#else
 	.h8300h
 #endif
+#endif
 
 #ifdef __H8300S__
+#ifdef __NORMAL_MODE__
+	.h8300sn
+#else
 	.h8300s
+#endif
 #endif
 
 	.section .text
diff --git a/newlib/libc/sys/h8300hms/crt0.S b/newlib/libc/sys/h8300hms/crt0.S
index a2137ad3a..257896449 100644
--- a/newlib/libc/sys/h8300hms/crt0.S
+++ b/newlib/libc/sys/h8300hms/crt0.S
@@ -36,7 +36,11 @@ _stack:	.word 	1
 
 #ifdef __H8300H__
 
+#ifdef __NORMAL_MODE__
+	.h8300hn
+#else
 	.h8300h
+#endif
 	.section .text
 	.global	_start
 _start:
@@ -70,8 +74,11 @@ _stack:	.long 	1
 #endif
 
 #ifdef __H8300S__
-
+#ifdef __NORMAL_MODE__
+	.h8300sn
+#else
 	.h8300s
+#endif
 	.section .text
 	.global	_start
 _start: