diff -uprN newlib.old/libc/machine/h8300/memcpy.S newlib/libc/machine/h8300/memcpy.S
--- newlib.old/libc/machine/h8300/memcpy.S	Fri May  9 09:52:27 2003
+++ newlib/libc/machine/h8300/memcpy.S	Fri May  9 10:15:52 2003
@@ -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 -uprN newlib.old/libc/machine/h8300/memset.S newlib/libc/machine/h8300/memset.S
--- newlib.old/libc/machine/h8300/memset.S	Fri May  9 09:52:27 2003
+++ newlib/libc/machine/h8300/memset.S	Fri May  9 10:15:52 2003
@@ -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
 
 
diff -uprN newlib.old/libc/machine/h8300/reg_memcpy.S newlib/libc/machine/h8300/reg_memcpy.S
--- newlib.old/libc/machine/h8300/reg_memcpy.S	Fri May  9 09:52:27 2003
+++ newlib/libc/machine/h8300/reg_memcpy.S	Fri May  9 10:15:52 2003
@@ -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
 
 
diff -uprN newlib.old/libc/machine/h8300/reg_memset.S newlib/libc/machine/h8300/reg_memset.S
--- newlib.old/libc/machine/h8300/reg_memset.S	Fri May  9 09:52:27 2003
+++ newlib/libc/machine/h8300/reg_memset.S	Fri May  9 10:15:52 2003
@@ -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
 
 
diff -uprN newlib.old/libc/machine/h8300/setjmp.S newlib/libc/machine/h8300/setjmp.S
--- newlib.old/libc/machine/h8300/setjmp.S	Fri May  9 09:52:27 2003
+++ newlib/libc/machine/h8300/setjmp.S	Fri May  9 10:15:17 2003
@@ -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 -uprN newlib.old/libc/machine/h8300/strcmp.S newlib/libc/machine/h8300/strcmp.S
--- newlib.old/libc/machine/h8300/strcmp.S	Fri May  9 09:52:27 2003
+++ newlib/libc/machine/h8300/strcmp.S	Fri May  9 10:15:52 2003
@@ -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 -uprN newlib.old/libc/sys/h8300hms/crt0.S newlib/libc/sys/h8300hms/crt0.S
--- newlib.old/libc/sys/h8300hms/crt0.S	Fri May  9 09:52:27 2003
+++ newlib/libc/sys/h8300hms/crt0.S	Fri May  9 10:15:52 2003
@@ -30,7 +30,11 @@ _stack:	.word 	1
 
 #ifdef __H8300H__
 
+#ifdef __NORMAL_MODE__
+	.h8300hn
+#else
 	.h8300h
+#endif
 	.section .text
 	.global	_start
 _start:
@@ -58,8 +62,11 @@ _stack:	.long 	1
 #endif
 
 #ifdef __H8300S__
-
+#ifdef __NORMAL_MODE__
+	.h8300sn
+#else
 	.h8300s
+#endif
 	.section .text
 	.global	_start
 _start: