From 1e7e3274f481ad90e81d0617fa1745b92b23d060 Mon Sep 17 00:00:00 2001 From: itojun Date: Thu, 4 Jan 2001 07:03:21 +0000 Subject: [PATCH] split MACHINE_ARCH sh3e[lb]. userland build still needs checking. --- 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(-) diff --git a/sys/arch/dreamcast/conf/Makefile.dreamcast.inc b/sys/arch/dreamcast/conf/Makefile.dreamcast.inc index 279466924322..e6efe3f631b5 100644 --- a/sys/arch/dreamcast/conf/Makefile.dreamcast.inc +++ b/sys/arch/dreamcast/conf/Makefile.dreamcast.inc @@ -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 --git a/sys/arch/dreamcast/include/param.h b/sys/arch/dreamcast/include/param.h index ecd01389d693..313425338484 100644 --- a/sys/arch/dreamcast/include/param.h +++ b/sys/arch/dreamcast/include/param.h @@ -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 --git a/sys/arch/evbsh3/conf/Makefile.evbsh3.inc b/sys/arch/evbsh3/conf/Makefile.evbsh3.inc index cabbd2f7ec60..e9e1255d378b 100644 --- a/sys/arch/evbsh3/conf/Makefile.evbsh3.inc +++ b/sys/arch/evbsh3/conf/Makefile.evbsh3.inc @@ -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 --git a/sys/arch/evbsh3/conf/std.evbsh3.eb b/sys/arch/evbsh3/conf/std.evbsh3.eb index dcdb4928db98..3e6b26904f26 100644 --- a/sys/arch/evbsh3/conf/std.evbsh3.eb +++ b/sys/arch/evbsh3/conf/std.evbsh3.eb @@ -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 @@ options EXEC_SCRIPT # exec #! scripts makeoptions ENDIAN="-EB" makeoptions LDSCRIPTBASE="sh.x" # for big endian +makeoptions MACHINE_ARCH=sh3eb diff --git a/sys/arch/evbsh3/conf/std.evbsh3.el b/sys/arch/evbsh3/conf/std.evbsh3.el index a11ffaa99efd..4c1de2579ac7 100644 --- a/sys/arch/evbsh3/conf/std.evbsh3.el +++ b/sys/arch/evbsh3/conf/std.evbsh3.el @@ -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 @@ options EXEC_SCRIPT # exec #! scripts makeoptions ENDIAN="-EL" makeoptions LDSCRIPTBASE="shl.x" # for little endian +makeoptions MACHINE_ARCH=sh3el diff --git a/sys/arch/evbsh3/include/param.h b/sys/arch/evbsh3/include/param.h index c68ef131a4d6..e2530fba8d55 100644 --- a/sys/arch/evbsh3/include/param.h +++ b/sys/arch/evbsh3/include/param.h @@ -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 --git a/sys/arch/mmeye/conf/Makefile.mmeye.inc b/sys/arch/mmeye/conf/Makefile.mmeye.inc index 268fc511c280..eb588d8024f6 100644 --- a/sys/arch/mmeye/conf/Makefile.mmeye.inc +++ b/sys/arch/mmeye/conf/Makefile.mmeye.inc @@ -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 --git a/sys/arch/mmeye/include/param.h b/sys/arch/mmeye/include/param.h index e5d910cfa02a..0bbe85a55ebe 100644 --- a/sys/arch/mmeye/include/param.h +++ b/sys/arch/mmeye/include/param.h @@ -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 --git a/sys/arch/sh3/include/param.h b/sys/arch/sh3/include/param.h index fe5811d37237..24819c26bf11 100644 --- a/sys/arch/sh3/include/param.h +++ b/sys/arch/sh3/include/param.h @@ -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