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.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f268a997345902eb8a2f8dfe9f09a2e9c5a24e11..82bebfdb0b3a8e698f4e3fc67a3602b92338c35f 100644 (file)
--- 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 759ce30dddb9fc8157300c1b2f1aaaad63b027d2..21738e7831ee5e1d4ee477a6fc830af2421a6867 100644 (file)
--- a/newlib/libc/machine/h8300/memcpy.S
+++ b/newlib/libc/machine/h8300/memcpy.S
@@ -1,20 +1,6 @@
-#include "defines.h"
+#include "setarch.h"
 
-#ifdef __H8300H__
-#ifdef __NORMAL_MODE__
-       .h8300hn
-#else
-       .h8300h
-#endif
-#endif
-
-#ifdef __H8300S__
-#ifdef __NORMAL_MODE__
-       .h8300sn
-#else
-       .h8300s
-#endif
-#endif
+#include "defines.h"
 
        .global _memcpy
 _memcpy:

diff --git a/newlib/libc/machine/h8300/memset.S b/newlib/libc/machine/h8300/memset.S
index a056a1047781bf8372b3e488f31ee51b2c56a046..ccd3fb7664ddd05416b6924a45323567ea1882c4 100644 (file)
--- a/newlib/libc/machine/h8300/memset.S
+++ b/newlib/libc/machine/h8300/memset.S
@@ -1,21 +1,6 @@
-#include "defines.h"
-
-#ifdef __H8300H__
-#ifdef __NORMAL_MODE__
-       .h8300hn
-#else
-       .h8300h
-#endif
-#endif
-
-#ifdef __H8300S__
-#ifdef __NORMAL_MODE__
-       .h8300sn
-#else
-       .h8300s
-#endif
-#endif
+#include "setarch.h"
 
+#include "defines.h"
 
 ; A0P pointer to cursor
 ; A1P thing to copy

diff --git a/newlib/libc/machine/h8300/reg_memcpy.S b/newlib/libc/machine/h8300/reg_memcpy.S
index 61893694dde69676202f72feda172f59538705d9..ea4aff0f6474c586cf1810ce21c45eabca090548 100644 (file)
--- a/newlib/libc/machine/h8300/reg_memcpy.S
+++ b/newlib/libc/machine/h8300/reg_memcpy.S
@@ -1,21 +1,6 @@
-#include "defines.h"
-
-#ifdef __H8300H__
-#ifdef __NORMAL_MODE__
-       .h8300hn
-#else
-       .h8300h
-#endif
-#endif
-
-#ifdef __H8300S__
-#ifdef __NORMAL_MODE__
-       .h8300sn
-#else
-       .h8300s
-#endif
-#endif
+#include "setarch.h"
 
+#include "defines.h"
 
        ; dst A0
        ; src A1

diff --git a/newlib/libc/machine/h8300/reg_memset.S b/newlib/libc/machine/h8300/reg_memset.S
index e490e7b6db71097009a2a4a21b39a99a8f2b1c84..79cccab38e1ce6d43a739564df3eec15484c819d 100644 (file)
--- a/newlib/libc/machine/h8300/reg_memset.S
+++ b/newlib/libc/machine/h8300/reg_memset.S
@@ -1,21 +1,6 @@
-#include "defines.h"
-
-#ifdef __H8300H__
-#ifdef __NORMAL_MODE__
-       .h8300hn
-#else
-       .h8300h
-#endif
-#endif
-
-#ifdef __H8300S__
-#ifdef __NORMAL_MODE__
-       .h8300sn
-#else
-       .h8300s
-#endif
-#endif
+#include "setarch.h"
 
+#include "defines.h"
 
        ; dst A0
        ; src A1

diff --git a/newlib/libc/machine/h8300/setarch.h b/newlib/libc/machine/h8300/setarch.h
new file mode 100644 (file)
index 0000000..b670e17
--- /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 c51c986e3b32e8b65f9181d8be2ca2eab6236089..c6661a926c77fd1bf0ac818c0ee01057e482afdb 100644 (file)
--- a/newlib/libc/machine/h8300/setjmp.S
+++ b/newlib/libc/machine/h8300/setjmp.S
@@ -1,20 +1,6 @@
-       .file "setjmp.S"
-
-#ifdef __H8300H__
-#ifdef __NORMAL_MODE__
-       .h8300hn
-#else
-       .h8300h
-#endif
-#endif
+#include "setarch.h"
 
-#ifdef __H8300S__
-#ifdef __NORMAL_MODE__
-       .h8300sn
-#else
-       .h8300s
-#endif
-#endif
+       .file "setjmp.S"
 
        .section .text
        .align  2

diff --git a/newlib/libc/machine/h8300/strcmp.S b/newlib/libc/machine/h8300/strcmp.S
index f735fb89c6f5e703eb2da0725b16c2f2777ef285..4433af5236198ad7c0cb5a0b0edfe69c60777b89 100644 (file)
--- a/newlib/libc/machine/h8300/strcmp.S
+++ b/newlib/libc/machine/h8300/strcmp.S
@@ -1,20 +1,6 @@
-#include "defines.h"
-
-#ifdef __H8300H__
-#ifdef __NORMAL_MODE__
-       .h8300hn
-#else
-       .h8300h
-#endif
-#endif
+#include "setarch.h"
 
-#ifdef __H8300S__
-#ifdef __NORMAL_MODE__
-       .h8300sn
-#else
-       .h8300s
-#endif
-#endif
+#include "defines.h"
 
        .section .text
        .align 2