- WARNSfy
- make sure machine and ${MACHIN_ARCH} symlinks are always created - several tweaks to allow build without installed DESTDIR
This commit is contained in:
parent
7704306fc5
commit
5af0a1dff0
|
@ -1,20 +1,27 @@
|
|||
# $NetBSD: Makefile.booters,v 1.4 2005/12/11 12:19:44 christos Exp $
|
||||
# $NetBSD: Makefile.booters,v 1.5 2009/01/12 07:56:31 tsutsui Exp $
|
||||
|
||||
S?= ${.CURDIR}/../../../..
|
||||
|
||||
.PHONY: machine-links
|
||||
|
||||
CFLAGS+= -ffreestanding
|
||||
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
|
||||
CFLAGS+= -Wno-pointer-sign
|
||||
CFLAGS+= -Werror
|
||||
|
||||
machine-links:
|
||||
.if !make(obj) && !make(clean) && !make(cleandir)
|
||||
.NOPATH: machine ${MACHINE_ARCH}
|
||||
.BEGIN: machine ${MACHINE_ARCH}
|
||||
|
||||
machine::
|
||||
-rm -f machine && \
|
||||
ln -s $S/arch/${MACHINE}/include machine
|
||||
|
||||
m68k::
|
||||
-rm -f ${MACHINE_ARCH} && \
|
||||
ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
|
||||
.endif
|
||||
|
||||
CLEANFILES+= machine ${MACHINE_ARCH}
|
||||
|
||||
beforedepend: machine-links
|
||||
|
||||
# XXX SHOULD NOT NEED TO DEFINE THESE!
|
||||
LIBCRT0=
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.15 2008/10/19 22:05:21 apb Exp $
|
||||
# $NetBSD: Makefile,v 1.16 2009/01/12 07:56:31 tsutsui Exp $
|
||||
|
||||
NOMAN= # defined
|
||||
|
||||
|
@ -51,7 +51,7 @@ LDLIBS= -L${LIBSA} -lsa -L${LIBIOCS} -liocs
|
|||
|
||||
.include "../Makefile.booters"
|
||||
|
||||
realall: machine-links ${PROG}
|
||||
realall: ${PROG}
|
||||
${PROG}: ${OBJS} ${LIBSA}/libsa.a ${LIBIOCS}/libiocs.a
|
||||
${_MKTARGET_LINK}
|
||||
${LD} ${LINKFLAGS} -o ${PROG}.sym ${OBJS} ${LDLIBS}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: readufs.c,v 1.8 2007/03/04 06:01:07 christos Exp $ */
|
||||
/* $NetBSD: readufs.c,v 1.9 2009/01/12 07:56:31 tsutsui Exp $ */
|
||||
/* from Id: readufs.c,v 1.8 2003/04/08 09:19:32 itohy Exp */
|
||||
|
||||
/*
|
||||
|
@ -16,7 +16,7 @@
|
|||
#define fs ufs_info
|
||||
|
||||
static void raw_read_queue __P((void *buf, daddr_t blkpos, size_t bytelen));
|
||||
static int ufs_read_indirect __P((daddr_t blk, int level, void **buf,
|
||||
static int ufs_read_indirect __P((daddr_t blk, int level, uint8_t **buf,
|
||||
unsigned *poff, size_t count));
|
||||
|
||||
#ifdef DEBUG_WITH_STDIO
|
||||
|
@ -92,7 +92,7 @@ ufs_read(di, buf, off, count)
|
|||
{
|
||||
struct ufs_info *ufsinfo = &fs;
|
||||
size_t bsize = ufsinfo->bsize;
|
||||
void *b = buf;
|
||||
uint8_t *b = buf;
|
||||
int i;
|
||||
size_t disize, nread;
|
||||
daddr_t pos;
|
||||
|
@ -157,7 +157,7 @@ static int
|
|||
ufs_read_indirect(blk, level, buf, poff, count)
|
||||
daddr_t blk;
|
||||
int level;
|
||||
void **buf;
|
||||
uint8_t **buf;
|
||||
unsigned *poff; /* position in block */
|
||||
size_t count;
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.15 2008/10/25 22:27:38 apb Exp $
|
||||
# $NetBSD: Makefile,v 1.16 2009/01/12 07:56:31 tsutsui Exp $
|
||||
|
||||
NOMAN= # defined
|
||||
|
||||
|
@ -33,7 +33,7 @@ vers.c: ${VERSIONFILE}
|
|||
|
||||
CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
|
||||
CPPFLAGS+= -DBOOT=\"$(BOOT)\" -DBOOT_VERS=\"$(VERSION)\"
|
||||
CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS}
|
||||
CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS} -I${S} -I. -D_STANDALONE
|
||||
AFLAGS= ${CFLAGS:M-[ID]*}
|
||||
AFLAGS+= -Wa,-mc68000
|
||||
.if ${OBJECT_FMT} == "ELF"
|
||||
|
@ -44,6 +44,9 @@ LINKFLAGS= -n -Bstatic -Ttext ${TEXT} -M
|
|||
OBJCOPY?= objcopy
|
||||
.endif
|
||||
|
||||
.include "${.CURDIR}/../Makefile.booters"
|
||||
.include "${S}/../common/lib/libc/Makefile.inc"
|
||||
|
||||
CLEANFILES+= ${PROG}.x $(PROG).map
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.8 2008/10/19 22:05:22 apb Exp $
|
||||
# $NetBSD: Makefile,v 1.9 2009/01/12 07:56:31 tsutsui Exp $
|
||||
|
||||
LIB= dos
|
||||
|
||||
|
@ -6,7 +6,9 @@ NOLINT=# defined
|
|||
NOPROFILE=# defined
|
||||
NOPIC=# defined
|
||||
|
||||
CPPFLAGS+= -I${.CURDIR}
|
||||
.include "../Makefile.booters"
|
||||
|
||||
CPPFLAGS+= -I${.CURDIR} -I.
|
||||
|
||||
SRCS= dos_rename.S
|
||||
SRCS+= dos_cerror.S dos_procerr.S dos_errno.c dos_strerror.S
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.9 2008/10/19 22:05:22 apb Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2009/01/12 07:56:31 tsutsui Exp $
|
||||
|
||||
LIB= iocs
|
||||
|
||||
|
@ -6,6 +6,10 @@ NOLINT=# defined
|
|||
NOPROFILE=# defined
|
||||
NOPIC=# defined
|
||||
|
||||
.include "../Makefile.booters"
|
||||
|
||||
CPPFLAGS+= -I.
|
||||
|
||||
ASM= b_keyinp.o b_keysns.o b_sftsns.o bitsns.o skeyset.o tvctrl.o \
|
||||
ledmod.o tgusemd.o defchr.o crtmod.o contrast.o hsvtorgb.o tpalet.o \
|
||||
tpalet2.o tcolor.o fntget.o textget.o textput.o clipput.o scroll.o \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.23 2008/11/28 08:15:51 he Exp $
|
||||
# $NetBSD: Makefile,v 1.24 2009/01/12 07:56:31 tsutsui Exp $
|
||||
|
||||
S= ${.CURDIR}/../../../..
|
||||
LIBSADIR= $S/lib/libsa
|
||||
|
@ -34,8 +34,9 @@ NOPROFILE= # defined
|
|||
NOPIC= # defined
|
||||
NOLINT= # defined
|
||||
|
||||
CPPFLAGS+= -I${.OBJDIR} -I${LIBSADIR} -I$S -I${LIBZDIR} -D_STANDALONE
|
||||
CPPFLAGS+= -I${.OBJDIR} -I${LIBSADIR} -I$S -I${LIBZDIR} -I${LIBZDIST}
|
||||
CPPFLAGS+= -I${.CURDIR}/../libiocs -I${.CURDIR}/../common
|
||||
CPPFLAGS+= -D_STANDALONE
|
||||
CPPFLAGS+= -DHEAP_VARIABLE -D__INTERNAL_LIBSA_CREAD
|
||||
CPPFLAGS+= -DHAVE_CHANGEDISK_HOOK
|
||||
CPPFLAGS+= -DUSTAR_SECT_PER_CYL=16
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: chdsk.c,v 1.1 2001/09/28 15:19:33 minoura Exp $ */
|
||||
/* $NetBSD: chdsk.c,v 1.2 2009/01/12 07:56:31 tsutsui Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 MINOURA Makoto.
|
||||
|
@ -26,6 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <lib/libsa/stand.h>
|
||||
#include <lib/libkern/libkern.h>
|
||||
|
||||
#include "libx68k.h"
|
||||
#include "iocs.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.14 2006/06/29 03:46:43 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.15 2009/01/12 07:56:31 tsutsui Exp $
|
||||
|
||||
BOOT= mboot
|
||||
VERSION= 0.1
|
||||
|
@ -29,7 +29,7 @@ LINKFLAGS= -N -static -Ttext ${TEXT}
|
|||
|
||||
.include "../Makefile.booters"
|
||||
|
||||
realall: machine-links ${PROG}
|
||||
realall: ${PROG}
|
||||
${BOOT}: ${OBJS}
|
||||
${_MKTARGET_LINK}
|
||||
${LD} ${LINKFLAGS} -o ${BOOT}.x ${OBJS} ${LDLIBS}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mboot.c,v 1.6 2008/04/28 20:23:40 martin Exp $ */
|
||||
/* $NetBSD: mboot.c,v 1.7 2009/01/12 07:56:31 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 The NetBSD Foundation, Inc.
|
||||
|
@ -32,6 +32,8 @@
|
|||
#include <sys/types.h>
|
||||
#include <machine/disklabel.h>
|
||||
|
||||
int bootmain(int);
|
||||
|
||||
struct iocs_readcap {
|
||||
unsigned long block;
|
||||
unsigned long size;
|
||||
|
|
Loading…
Reference in New Issue