[src/trunk]: src/usr.bin/config *.o files don't need special handling at all ...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d6f75a55096b
branches:  trunk
changeset: 340423:d6f75a55096b
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Sep 04 06:01:40 2015 +0000

description:
*.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.

diffstat:

 usr.bin/config/defs.h  |   3 +--
 usr.bin/config/files.c |  34 ++--------------------------------
 usr.bin/config/main.c  |  11 ++---------
 3 files changed, 5 insertions(+), 43 deletions(-)

diffs (104 lines):

diff -r 3de188d04cea -r d6f75a55096b usr.bin/config/defs.h
--- a/usr.bin/config/defs.h     Fri Sep 04 05:52:15 2015 +0000
+++ b/usr.bin/config/defs.h     Fri Sep 04 06:01:40 2015 +0000
@@ -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 @@
 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 *);
diff -r 3de188d04cea -r d6f75a55096b usr.bin/config/files.c
--- a/usr.bin/config/files.c    Fri Sep 04 05:52:15 2015 +0000
+++ b/usr.bin/config/files.c    Fri Sep 04 06:01:40 2015 +0000
@@ -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 @@
        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
diff -r 3de188d04cea -r d6f75a55096b usr.bin/config/main.c
--- a/usr.bin/config/main.c     Fri Sep 04 05:52:15 2015 +0000
+++ b/usr.bin/config/main.c     Fri Sep 04 06:01:40 2015 +0000
@@ -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 @@
                stop();
 
        /*
-        * Fix objects and libraries.
-        */
-       yyfile = "fixobjects";
-       if (fixobjects())
-               stop();
-
-       /*
         * Fix device-majors.
         */
        yyfile = "fixdevsw";