sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use MACHINE_ARCH instead of ARCH

Browse source
This commit is contained in:
Thomas Veerman 2012-06-06 11:27:00 +00:00
parent f93afa00e9
commit f09c2e014f
8 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/Makefile
View file

@ -35,7 +35,7 @@ SUBDIR= add_route arp ash at awk \
xargs yacc yes zdump zmodem pkgin_cd \ xargs yacc yes zdump zmodem pkgin_cd \
mktemp worldstone updateboot update_bootcfg mktemp worldstone updateboot update_bootcfg
.if ${ARCH} == "i386" .if ${MACHINE_ARCH} == "i386"
SUBDIR+= atnormalize dosread fdisk loadfont \ SUBDIR+= atnormalize dosread fdisk loadfont \
autopart part partition playwave \ autopart part partition playwave \
recwave repartition screendump recwave repartition screendump

2
drivers/memory/Makefile
View file

@ -25,7 +25,7 @@ touch-genfiles:
# but bsd.own.mk has to be upgraded for that. # but bsd.own.mk has to be upgraded for that.
.mfs.o: .mfs.o:
${_MKTARGET_CREATE} ${_MKTARGET_CREATE}
${OBJCOPY} -Ibinary -B${ARCH} -Oelf32-${ARCH}-minix $< $@ ${OBJCOPY} -Ibinary -B${MACHINE_ARCH} -Oelf32-${MACHINE_ARCH}-minix $< $@
${RAMDISK_PATH}/image: .PHONY ${RAMDISK_PATH}/image: .PHONY
${MAKE} -C ${RAMDISK_PATH} image ${MAKE} -C ${RAMDISK_PATH} image

6
kernel/Makefile
View file

@ -3,7 +3,7 @@
PROG= kernel PROG= kernel
.include "arch/${ARCH}/Makefile.inc" .include "arch/${MACHINE_ARCH}/Makefile.inc"
SRCS+= clock.c cpulocals.c interrupt.c main.c proc.c start.c system.c \ SRCS+= clock.c cpulocals.c interrupt.c main.c proc.c start.c system.c \
table.c utility.c table.c utility.c
@ -14,7 +14,7 @@ LDADD+= -ltimers -lsys -lexec
CFLAGS += -D__kernel__ CFLAGS += -D__kernel__
CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE
LDFLAGS+= -T ${.CURDIR}/arch/${ARCH}/kernel.lds LDFLAGS+= -T ${.CURDIR}/arch/${MACHINE_ARCH}/kernel.lds
LDFLAGS+= -nostdlib -L${DESTDIR}/${LIBDIR} LDFLAGS+= -nostdlib -L${DESTDIR}/${LIBDIR}
LDADD+= -lminlib LDADD+= -lminlib
DPADD+= ${LIBMINLIB} DPADD+= ${LIBMINLIB}
@ -25,7 +25,7 @@ LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Gener
DPADD+= ${LIBC} DPADD+= ${LIBC}
.endif .endif
CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH}/include -I${NETBSDSRCDIR} CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}/include -I${NETBSDSRCDIR}
BINDIR= /usr/sbin BINDIR= /usr/sbin
MAN= MAN=

2
kernel/arch/i386/Makefile.inc
View file

@ -2,7 +2,7 @@
# Makefile for arch-dependent kernel code # Makefile for arch-dependent kernel code
.include <bsd.own.mk> .include <bsd.own.mk>
HERE=${.CURDIR}/arch/${ARCH} HERE=${.CURDIR}/arch/${MACHINE_ARCH}
.PATH: ${HERE} .PATH: ${HERE}
SRCS+= mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \ SRCS+= mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \
do_iopenable.c do_readbios.c do_sdevio.c exception.c i8259.c io_inb.S \ do_iopenable.c do_readbios.c do_sdevio.c exception.c i8259.c io_inb.S \

2
lib/libc/arch/i386/sys-minix/Makefile.inc
View file

@ -1,5 +1,5 @@
# rts sources # rts sources
.PATH: ${.CURDIR}/arch/${ARCH}/sys-minix .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/sys-minix
SRCS+= \ SRCS+= \
__sigreturn.S \ __sigreturn.S \

1
lib/libcompat_minix/Makefile
View file

@ -2,7 +2,6 @@
LIB= compat_minix LIB= compat_minix
CPPFLAGS+= -D_MINIX_COMPAT CPPFLAGS+= -D_MINIX_COMPAT
MACHINE_ARCH= ${ARCH}
USE_SHLIBDIR= yes USE_SHLIBDIR= yes
.PATH: ${.CURDIR} .PATH: ${.CURDIR}

4
servers/vm/Makefile
View file

@ -13,8 +13,8 @@ MAN=
BINDIR?= /usr/sbin BINDIR?= /usr/sbin
CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${ARCH} CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
CPPFLAGS+= -I${NETBSDSRCDIR} CPPFLAGS+= -I${NETBSDSRCDIR}
.include "arch/${ARCH}/Makefile.inc" .include "arch/${MACHINE_ARCH}/Makefile.inc"
.include <minix.bootprog.mk> .include <minix.bootprog.mk>

2
servers/vm/arch/i386/Makefile.inc
View file

@ -1,5 +1,5 @@
.include <bsd.own.mk> .include <bsd.own.mk>
#Arch-specific sources #Arch-specific sources
.PATH: ${.CURDIR}/arch/${ARCH} .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
SRCS+= vm.c pagetable.c #util.S SRCS+= vm.c pagetable.c #util.S