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

*.o files don't need special handling at all now. Makefile.kern.inc knows

Browse Source 
*.o input files don't need to get compiled, but need to get linked.
This commit is contained in:
uebayasi 2015-09-04 06:01:40 +00:00
parent 5b92bb3c7a
commit ca8d7a3596
3 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/config/defs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: defs.h,v 1.90 2015/09/03 14:23:52 uebayasi Exp $ */
/* $NetBSD: defs.h,v 1.91 2015/09/04 06:01:40 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@ -511,7 +511,6 @@ struct numconst {
void initfiles(void);
void checkfiles(void);
int fixfiles(void); /* finalize */
int fixobjects(void);
int fixdevsw(void);
void addfile(const char *, struct condexpr *, u_char, const char *);
int expr_eval(struct condexpr *, int (*)(const char *, void *), void *);

34
usr.bin/config/files.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: files.c,v 1.31 2015/09/04 05:13:32 uebayasi Exp $ */
/* $NetBSD: files.c,v 1.32 2015/09/04 06:01:40 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
__RCSID("$NetBSD: files.c,v 1.31 2015/09/04 05:13:32 uebayasi Exp $");
__RCSID("$NetBSD: files.c,v 1.32 2015/09/04 06:01:40 uebayasi Exp $");
#include <sys/param.h>
#include <errno.h>
@ -346,36 +346,6 @@ fixfiles(void)
return (err);
}
/*
* We have finished reading everything. Tack the objects down: calculate
* selection.
*/
int
fixobjects(void)
{
struct files *fi;
struct nvlist *flathead, **flatp;
int err, sel;
err = 0;
TAILQ_FOREACH(fi, &allofiles, fi_snext) {
/* Optional: see if it is to be included. */
if (fi->fi_optx != NULL) {
flathead = NULL;
flatp = &flathead;
sel = expr_eval(fi->fi_optx,
fi->fi_flags & FI_NEEDSFLAG ? fixfsel :
fixsel,
&flatp);
fi->fi_optf = flathead;
if (!sel)
continue;
}
fi->fi_flags |= FI_SEL;
}
return (err);
}
/*
* We have finished reading everything. Tack the devsws down: calculate

11
usr.bin/config/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.88 2015/09/03 13:53:36 uebayasi Exp $ */
/* $NetBSD: main.c,v 1.89 2015/09/04 06:01:40 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
__RCSID("$NetBSD: main.c,v 1.88 2015/09/03 13:53:36 uebayasi Exp $");
__RCSID("$NetBSD: main.c,v 1.89 2015/09/04 06:01:40 uebayasi Exp $");
#ifndef MAKE_BOOTSTRAP
#include <sys/cdefs.h>
@ -478,13 +478,6 @@ main(int argc, char **argv)
if (fixfiles())
stop();
/*
* Fix objects and libraries.
*/
yyfile = "fixobjects";
if (fixobjects())
stop();
/*
* Fix device-majors.
*/