Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finish moving common arm32 bits out into arm/arm32.

This commit is contained in:
chris 2001-07-28 15:08:10 +00:00
parent c1832e4050
commit 4a126d9937
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arch/arm32/arm32/genassym.cf → sys/arch/arm/arm32/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.8 2001/03/04 14:32:12 bjh21 Exp $ # $NetBSD: genassym.cf,v 1.1 2001/07/28 15:08:11 chris Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California. # Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved. # All rights reserved.

2
sys/arch/arm32/arm32/locore.S → sys/arch/arm/arm32/locore.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.40 2001/06/11 22:08:42 chris Exp $ */ /* $NetBSD: locore.S,v 1.1 2001/07/28 15:08:11 chris Exp $ */
/* /*
* Copyright (C) 1994-1997 Mark Brinicombe * Copyright (C) 1994-1997 Mark Brinicombe

15
sys/arch/arm/conf/Makefile.arm
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.arm,v 1.5 2001/07/28 13:24:24 chris Exp $ # $NetBSD: Makefile.arm,v 1.6 2001/07/28 15:08:10 chris Exp $
# Makefile for NetBSD # Makefile for NetBSD
# #
@ -31,6 +31,7 @@ TSORT?= tsort -q
COPTS?= -O2 COPTS?= -O2
ARM32= $S/arch/arm32 ARM32= $S/arch/arm32
ARM= $S/arch/arm
THISARM= $S/arch/${TARGET_MACHINE} THISARM= $S/arch/${TARGET_MACHINE}
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
@ -121,9 +122,9 @@ LINKFLAGS+= -X
%LOAD %LOAD
assym.h: $S/kern/genassym.sh ${ARM32}/arm32/genassym.cf assym.h: $S/kern/genassym.sh ${ARM}/arm32/genassym.cf
sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \ sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
< ${ARM32}/arm32/genassym.cf > assym.h.tmp && \ < ${ARM}/arm32/genassym.cf > assym.h.tmp && \
mv -f assym.h.tmp assym.h mv -f assym.h.tmp assym.h
param.c: $S/conf/param.c param.c: $S/conf/param.c
@ -169,18 +170,18 @@ links:
sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
sh makelinks && rm -f dontlink sh makelinks && rm -f dontlink
SRCS= ${ARM32}/arm32/locore.S param.c ioconf.c ${CFILES} ${SFILES} \ SRCS= ${ARM}/arm32/locore.S param.c ioconf.c ${CFILES} ${SFILES} \
${EXTRA_CFILES} ${EXTRA_SFILES} ${SYSTEM_FIRST_SFILE} ${EXTRA_CFILES} ${EXTRA_SFILES} ${SYSTEM_FIRST_SFILE}
depend: .depend depend: .depend
.depend: ${SRCS} assym.h param.c .depend: ${SRCS} assym.h param.c
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${SYSTEM_FIRST_SFILE} \ ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${SYSTEM_FIRST_SFILE} \
${ARM32}/arm32/locore.S ${EXTRA_SFILES} ${ARM}/arm32/locore.S ${EXTRA_SFILES}
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} \ ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} \
${EXTRA_CFILES} ${EXTRA_CFILES}
test -z "${SFILES}" || ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} test -z "${SFILES}" || ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
${CPPFLAGS} < ${ARM32}/arm32/genassym.cf ${CPPFLAGS} < ${ARM}/arm32/genassym.cf
@sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend @sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
@rm -f assym.dep @rm -f assym.dep
@ -220,7 +221,7 @@ ${SYSTEM_FIRST_OBJ}: ${SYSTEM_FIRST_SFILE} assym.h
${NORMAL_S} ${NORMAL_S}
.endif .endif
locore.o: ${ARM32}/arm32/locore.S assym.h locore.o: ${ARM}/arm32/locore.S assym.h
${NORMAL_S} ${NORMAL_S}
# The install target can be redefined by putting a # The install target can be redefined by putting a