[src/trunk]: src/sys/arch split MACHINE_ARCH sh3e[lb]. userland build still ...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/51e669433490
branches:  trunk
changeset: 501563:51e669433490
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Jan 04 07:03:21 2001 +0000

description:
split MACHINE_ARCH sh3e[lb].  userland build still needs checking.

diffstat:

 sys/arch/dreamcast/conf/Makefile.dreamcast.inc |   4 ++--
 sys/arch/dreamcast/include/param.h             |   7 +++----
 sys/arch/evbsh3/conf/Makefile.evbsh3.inc       |   5 ++---
 sys/arch/evbsh3/conf/std.evbsh3.eb             |   3 ++-
 sys/arch/evbsh3/conf/std.evbsh3.el             |   3 ++-
 sys/arch/evbsh3/include/param.h                |  13 +++++++++----
 sys/arch/mmeye/conf/Makefile.mmeye.inc         |   4 ++--
 sys/arch/mmeye/include/param.h                 |   7 +++----
 sys/arch/sh3/include/param.h                   |   4 +++-
 9 files changed, 28 insertions(+), 22 deletions(-)

diffs (153 lines):

diff -r 1de4f8be8fa6 -r 51e669433490 sys/arch/dreamcast/conf/Makefile.dreamcast.inc
--- a/sys/arch/dreamcast/conf/Makefile.dreamcast.inc    Thu Jan 04 06:53:45 2001 +0000
+++ b/sys/arch/dreamcast/conf/Makefile.dreamcast.inc    Thu Jan 04 07:03:21 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.dreamcast.inc,v 1.2 2001/01/03 18:15:47 itojun Exp $
+#      $NetBSD: Makefile.dreamcast.inc,v 1.3 2001/01/04 07:03:22 itojun Exp $
 
 MACHINE=dreamcast
-MACHINE_ARCH=sh3
+MACHINE_ARCH=sh3el
diff -r 1de4f8be8fa6 -r 51e669433490 sys/arch/dreamcast/include/param.h
--- a/sys/arch/dreamcast/include/param.h        Thu Jan 04 06:53:45 2001 +0000
+++ b/sys/arch/dreamcast/include/param.h        Thu Jan 04 07:03:21 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.2 2001/01/03 18:14:47 itojun Exp $ */
+/*     $NetBSD: param.h,v 1.3 2001/01/04 07:03:22 itojun Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -53,9 +53,8 @@
 #endif
 #endif
 
-/* will be changed to sh3el */
-#define        _MACHINE_ARCH   sh3
-#define        MACHINE_ARCH    "sh3"
+#define        _MACHINE_ARCH   sh3el
+#define        MACHINE_ARCH    "sh3el"
 
 #define        _MACHINE        dreamcast
 #define        MACHINE         "dreamcast"
diff -r 1de4f8be8fa6 -r 51e669433490 sys/arch/evbsh3/conf/Makefile.evbsh3.inc
--- a/sys/arch/evbsh3/conf/Makefile.evbsh3.inc  Thu Jan 04 06:53:45 2001 +0000
+++ b/sys/arch/evbsh3/conf/Makefile.evbsh3.inc  Thu Jan 04 07:03:21 2001 +0000
@@ -1,4 +1,3 @@
-#      $NetBSD: Makefile.evbsh3.inc,v 1.2 2001/01/03 18:15:47 itojun Exp $
+#      $NetBSD: Makefile.evbsh3.inc,v 1.3 2001/01/04 07:03:22 itojun Exp $
 
-MACHINE=ebsh3eb
-MACHINE_ARCH=sh3
+MACHINE=ebsh3
diff -r 1de4f8be8fa6 -r 51e669433490 sys/arch/evbsh3/conf/std.evbsh3.eb
--- a/sys/arch/evbsh3/conf/std.evbsh3.eb        Thu Jan 04 06:53:45 2001 +0000
+++ b/sys/arch/evbsh3/conf/std.evbsh3.eb        Thu Jan 04 07:03:21 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.evbsh3.eb,v 1.1 2001/01/03 23:49:22 itojun Exp $
+# $NetBSD: std.evbsh3.eb,v 1.2 2001/01/04 07:03:22 itojun Exp $
 #
 # standard, required NetBSD/evbsh3 'options'
  
@@ -8,3 +8,4 @@
 
 makeoptions    ENDIAN="-EB"
 makeoptions    LDSCRIPTBASE="sh.x"     # for big endian
+makeoptions    MACHINE_ARCH=sh3eb
diff -r 1de4f8be8fa6 -r 51e669433490 sys/arch/evbsh3/conf/std.evbsh3.el
--- a/sys/arch/evbsh3/conf/std.evbsh3.el        Thu Jan 04 06:53:45 2001 +0000
+++ b/sys/arch/evbsh3/conf/std.evbsh3.el        Thu Jan 04 07:03:21 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.evbsh3.el,v 1.1 2001/01/03 23:49:22 itojun Exp $
+# $NetBSD: std.evbsh3.el,v 1.2 2001/01/04 07:03:23 itojun Exp $
 #
 # standard, required NetBSD/evbsh3 'options'
  
@@ -8,3 +8,4 @@
 
 makeoptions    ENDIAN="-EL"
 makeoptions    LDSCRIPTBASE="shl.x"    # for little endian
+makeoptions    MACHINE_ARCH=sh3el
diff -r 1de4f8be8fa6 -r 51e669433490 sys/arch/evbsh3/include/param.h
--- a/sys/arch/evbsh3/include/param.h   Thu Jan 04 06:53:45 2001 +0000
+++ b/sys/arch/evbsh3/include/param.h   Thu Jan 04 07:03:21 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.6 2001/01/03 18:14:46 itojun Exp $ */
+/*     $NetBSD: param.h,v 1.7 2001/01/04 07:03:23 itojun Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -53,9 +53,14 @@
 #endif
 #endif
 
-/* will be changed to sh3eb/el */
-#define        _MACHINE_ARCH   sh3
-#define        MACHINE_ARCH    "sh3"
+/* XXX relying upon gcc symbol here... */
+#ifdef __LITTLE_ENDIAN__
+#define        _MACHINE_ARCH   sh3el
+#define        MACHINE_ARCH    "sh3el"
+#else
+#define        _MACHINE_ARCH   sh3eb
+#define        MACHINE_ARCH    "sh3eb"
+#endif
 
 #define        _MACHINE        evbsh3
 #define        MACHINE         "evbsh3"
diff -r 1de4f8be8fa6 -r 51e669433490 sys/arch/mmeye/conf/Makefile.mmeye.inc
--- a/sys/arch/mmeye/conf/Makefile.mmeye.inc    Thu Jan 04 06:53:45 2001 +0000
+++ b/sys/arch/mmeye/conf/Makefile.mmeye.inc    Thu Jan 04 07:03:21 2001 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile.mmeye.inc,v 1.2 2001/01/03 18:15:47 itojun Exp $
+#      $NetBSD: Makefile.mmeye.inc,v 1.3 2001/01/04 07:03:22 itojun Exp $
 
 MACHINE=mmeye
-MACHINE_ARCH=sh3
+MACHINE_ARCH=sh3eb
 
 TEXTADDR=8c010000 
 .if ${OBJECT_FMT} == "ELF"
diff -r 1de4f8be8fa6 -r 51e669433490 sys/arch/mmeye/include/param.h
--- a/sys/arch/mmeye/include/param.h    Thu Jan 04 06:53:45 2001 +0000
+++ b/sys/arch/mmeye/include/param.h    Thu Jan 04 07:03:21 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.6 2001/01/03 18:14:45 itojun Exp $ */
+/*     $NetBSD: param.h,v 1.7 2001/01/04 07:03:22 itojun Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -50,9 +50,8 @@
 #endif
 #endif
 
-/* will be changed to sh3eb */
-#define        _MACHINE_ARCH   sh3
-#define        MACHINE_ARCH    "sh3"
+#define        _MACHINE_ARCH   sh3eb
+#define        MACHINE_ARCH    "sh3eb"
 
 #define        _MACHINE        mmeye
 #define        MACHINE         "mmeye"
diff -r 1de4f8be8fa6 -r 51e669433490 sys/arch/sh3/include/param.h
--- a/sys/arch/sh3/include/param.h      Thu Jan 04 06:53:45 2001 +0000
+++ b/sys/arch/sh3/include/param.h      Thu Jan 04 07:03:21 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.4 2000/06/30 17:55:17 itojun Exp $ */
+/*     $NetBSD: param.h,v 1.5 2001/01/04 07:03:21 itojun Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -50,11 +50,13 @@
 #endif
 #endif
 
+#if 0 /* machine/param.h should define it */
 #define        _MACHINE        sh3
 #define        MACHINE         "sh3"
 #define        _MACHINE_ARCH   sh3
 #define        MACHINE_ARCH    "sh3"
 #define        MID_MACHINE     MID_SH3
+#endif
 
 /*
  * Round p (pointer or byte index) up to a correctly-aligned value