Module Name: src
Committed By: uebayasi
Date: Fri Sep 4 06:01:40 UTC 2015
Modified Files:
src/usr.bin/config: defs.h files.c main.c
Log Message:
*.o files don't need special handling at all now. Makefile.kern.inc knows
*.o input files don't need to get compiled, but need to get linked.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/usr.bin/config/defs.h
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/config/files.c
cvs rdiff -u -r1.88 -r1.89 src/usr.bin/config/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.90 src/usr.bin/config/defs.h:1.91
--- src/usr.bin/config/defs.h:1.90 Thu Sep 3 14:23:52 2015
+++ src/usr.bin/config/defs.h Fri Sep 4 06:01:40 2015
@@ -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 *);
Index: src/usr.bin/config/files.c
diff -u src/usr.bin/config/files.c:1.31 src/usr.bin/config/files.c:1.32
--- src/usr.bin/config/files.c:1.31 Fri Sep 4 05:13:32 2015
+++ src/usr.bin/config/files.c Fri Sep 4 06:01:40 2015
@@ -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
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.88 src/usr.bin/config/main.c:1.89
--- src/usr.bin/config/main.c:1.88 Thu Sep 3 13:53:36 2015
+++ src/usr.bin/config/main.c Fri Sep 4 06:01:40 2015
@@ -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>
@@ -479,13 +479,6 @@ main(int argc, char **argv)
stop();
/*
- * Fix objects and libraries.
- */
- yyfile = "fixobjects";
- if (fixobjects())
- stop();
-
- /*
* Fix device-majors.
*/
yyfile = "fixdevsw";
