diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f268a9973..82bebfdb0 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,13 @@
+2003-06-24  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* libc/machine/h8300/setarch.h: New.
+	* libc/machine/h8300/memcpy.S: Use it.
+	* libc/machine/h8300/memset.S: Likewise.
+	* libc/machine/h8300/reg_memcpy.S: Likewise.
+	* libc/machine/h8300/reg_memset.S: Likewise.
+	* libc/machine/h8300/setjmp.S: Likewise.
+	* libc/machine/h8300/strcmp.S: Likewise.
+
 2003-06-24  Richard Sandiford  <rsandifo@redhat.com>
 
 	* libc/sys/h8300hms/crt0.S (_start): Fix register sizes in call
diff --git a/newlib/libc/machine/h8300/memcpy.S b/newlib/libc/machine/h8300/memcpy.S
index 759ce30dd..21738e783 100644
--- a/newlib/libc/machine/h8300/memcpy.S
+++ b/newlib/libc/machine/h8300/memcpy.S
@@ -1,21 +1,7 @@
+#include "setarch.h"
+
 #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
 _memcpy:
 ;	MOVP	@(2/4,r7),A0P	; dst
diff --git a/newlib/libc/machine/h8300/memset.S b/newlib/libc/machine/h8300/memset.S
index a056a1047..ccd3fb766 100644
--- a/newlib/libc/machine/h8300/memset.S
+++ b/newlib/libc/machine/h8300/memset.S
@@ -1,22 +1,7 @@
+#include "setarch.h"
+
 #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
 ; A1P thing to copy
 	.global	_memset
diff --git a/newlib/libc/machine/h8300/reg_memcpy.S b/newlib/libc/machine/h8300/reg_memcpy.S
index 61893694d..ea4aff0f6 100644
--- a/newlib/libc/machine/h8300/reg_memcpy.S
+++ b/newlib/libc/machine/h8300/reg_memcpy.S
@@ -1,22 +1,7 @@
+#include "setarch.h"
+
 #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
 	; src A1
 	; len A2
diff --git a/newlib/libc/machine/h8300/reg_memset.S b/newlib/libc/machine/h8300/reg_memset.S
index e490e7b6d..79cccab38 100644
--- a/newlib/libc/machine/h8300/reg_memset.S
+++ b/newlib/libc/machine/h8300/reg_memset.S
@@ -1,22 +1,7 @@
+#include "setarch.h"
+
 #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
 	; src A1
 	; len A2
diff --git a/newlib/libc/machine/h8300/setarch.h b/newlib/libc/machine/h8300/setarch.h
new file mode 100644
index 000000000..b670e1773
--- /dev/null
+++ b/newlib/libc/machine/h8300/setarch.h
@@ -0,0 +1,14 @@
+#ifdef __H8300H__
+#ifdef __NORMAL_MODE__
+	.h8300hn
+#else
+	.h8300h
+#endif
+#endif
+#ifdef __H8300S__
+#ifdef __NORMAL_MODE__
+	.h8300sn
+#else
+	.h8300s
+#endif
+#endif
diff --git a/newlib/libc/machine/h8300/setjmp.S b/newlib/libc/machine/h8300/setjmp.S
index c51c986e3..c6661a926 100644
--- a/newlib/libc/machine/h8300/setjmp.S
+++ b/newlib/libc/machine/h8300/setjmp.S
@@ -1,21 +1,7 @@
+#include "setarch.h"
+
 	.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
 	.align	2
 	.global	_setjmp
diff --git a/newlib/libc/machine/h8300/strcmp.S b/newlib/libc/machine/h8300/strcmp.S
index f735fb89c..4433af523 100644
--- a/newlib/libc/machine/h8300/strcmp.S
+++ b/newlib/libc/machine/h8300/strcmp.S
@@ -1,21 +1,7 @@
+#include "setarch.h"
+
 #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
 	.align 2
 	.global _strcmp