* libc/sys/h8300hms/setarch.h: New file.

* libc/sys/h8300hms/close.S, libc/sys/h8300hms/fstat.S,
	libc/sys/h8300hms/lseek.S, libc/sys/h8300hms/open.S,
	libc/sys/h8300hms/read.S, libc/sys/h8300hms/stat.S,
	libc/sys/h8300hms/write.S, libc/sys/h8300hms/crt0.S: Use it.

newlib/ChangeLog

@@ -1,3 +1,11 @@
+2003-06-10  Richard Sandiford  <rsandifo@redhat.com>
+
+	* libc/sys/h8300hms/setarch.h: New file.
+	* libc/sys/h8300hms/close.S, libc/sys/h8300hms/fstat.S,
+	libc/sys/h8300hms/lseek.S, libc/sys/h8300hms/open.S,
+	libc/sys/h8300hms/read.S, libc/sys/h8300hms/stat.S,
+	libc/sys/h8300hms/write.S, libc/sys/h8300hms/crt0.S: Use it.
+
 2003-06-06  Jeff Johnston  <jjohnstn@redhat.com>
 
         * libc/argz/argz_add.c: Change to use _DEFUN macro for function

newlib/libc/sys/h8300hms/close.S

@@ -1,12 +1,7 @@
 ;int close(int fd);
 ;Integer arguments have to be zero extended.
 
-#if defined(__H8300H__)
+#include "setarch.h"
-	.h8300h
-#endif
-#if defined(__H8300S__)
-	.h8300s
-#endif
 
 	.section .text
 	.align 2

newlib/libc/sys/h8300hms/crt0.S

@@ -1,5 +1,7 @@
 ; h8/300 and h8/300h start up file.
 
+#include "setarch.h"
+
 #ifdef __H8300__
 
 	.section .text
@@ -36,11 +38,6 @@ _stack:	.word 	1
 
 #ifdef __H8300H__
 
-#ifdef __NORMAL_MODE__
-	.h8300hn
-#else
-	.h8300h
-#endif
 	.section .text
 	.global	_start
 _start:
@@ -74,11 +71,7 @@ _stack:	.long 	1
 #endif
 
 #ifdef __H8300S__
-#ifdef __NORMAL_MODE__
+
-	.h8300sn
-#else
-	.h8300s
-#endif
 	.section .text
 	.global	_start
 _start:

newlib/libc/sys/h8300hms/fstat.S

@@ -1,12 +1,7 @@
 ;int fstat(int filedes, struct stat *buf);
 ;Integer arguments have to be zero extended.
 
-#if defined(__H8300H__)
+#include "setarch.h"
-	.h8300h
-#endif
-#if defined(__H8300S__)
-	.h8300s
-#endif
 
 	.section .text
 	.align 2

newlib/libc/sys/h8300hms/lseek.S

@@ -1,12 +1,7 @@
 ;off_t lseek(int fildes, off_t offset, int whence);
 ;Integer arguments have to be zero extended.
 
-#if defined(__H8300H__)
+#include "setarch.h"
-	.h8300h
-#endif
-#if defined(__H8300S__)
-	.h8300s
-#endif
 
 	.section .text
 	.align 2

newlib/libc/sys/h8300hms/open.S

@@ -3,12 +3,7 @@
 ;The second argument is taken from the stack,
 ;hence it is not zero extended here.
 
-#if defined(__H8300H__)
+#include "setarch.h"
-	.h8300h
-#endif
-#if defined(__H8300S__)
-	.h8300s
-#endif
 
 	.section .text
 	.align 2

newlib/libc/sys/h8300hms/read.S

@@ -1,12 +1,7 @@
 ;ssize_t read(int fd, void *buf, size_t count);
 ;Integer arguments have to be zero extended.
 
-#if defined(__H8300H__)
+#include "setarch.h"
-	.h8300h
-#endif
-#if defined(__H8300S__)
-	.h8300s
-#endif
 
 	.section .text
 	.align 2

newlib/libc/sys/h8300hms/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

newlib/libc/sys/h8300hms/stat.S

@@ -1,11 +1,6 @@
 ;int stat(const char *file_name, struct stat *buf);
 
-#if defined(__H8300H__)
+#include "setarch.h"
-	.h8300h
-#endif
-#if defined(__H8300S__)
-	.h8300s
-#endif
 
 	.section .text
 	.align 2

newlib/libc/sys/h8300hms/write.S

@@ -1,13 +1,7 @@
 ;ssize_t write(int fd, const void *buf, size_t count);
 ;Integer arguments have to be zero extended.
 
-#if defined(__H8300H__)
+#include "setarch.h"
-	.h8300h
-#endif
-
-#if defined(__H8300S__)
-	.h8300s
-#endif
 
 	.section .text
 	.align 2