diff options
author | bde <bde@FreeBSD.org> | 2002-07-13 19:36:14 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 2002-07-13 19:36:14 +0000 |
commit | d738702902195501104503bce0a5b7e76170523c (patch) | |
tree | 190dab1e55362079eccb9f8e5bccd9369f6dbd35 | |
parent | 9c6596bcd6435686141c1a7b6111b116fa90a57c (diff) | |
download | FreeBSD-src-d738702902195501104503bce0a5b7e76170523c.zip FreeBSD-src-d738702902195501104503bce0a5b7e76170523c.tar.gz |
Moved the setting of all profiling-related variables except the key one
(PROFLEVEL) to kern.pre.mk so that it is easier to manage. Bumped config
version to match.
Moved the check for cputype being configured to a less bogus place in
mkmakefile.c.
-rw-r--r-- | sys/conf/Makefile.alpha | 2 | ||||
-rw-r--r-- | sys/conf/Makefile.amd64 | 2 | ||||
-rw-r--r-- | sys/conf/Makefile.i386 | 2 | ||||
-rw-r--r-- | sys/conf/Makefile.ia64 | 2 | ||||
-rw-r--r-- | sys/conf/Makefile.pc98 | 2 | ||||
-rw-r--r-- | sys/conf/Makefile.powerpc | 2 | ||||
-rw-r--r-- | sys/conf/Makefile.sparc64 | 2 | ||||
-rw-r--r-- | sys/conf/kern.pre.mk | 5 | ||||
-rw-r--r-- | usr.sbin/config/configvers.h | 2 | ||||
-rw-r--r-- | usr.sbin/config/mkmakefile.c | 18 |
10 files changed, 20 insertions, 19 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 4ccb876..df48d84 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 .if !defined(S) .if exists(./@/.) diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64 index 33c871e..77bbc37 100644 --- a/sys/conf/Makefile.amd64 +++ b/sys/conf/Makefile.amd64 @@ -18,7 +18,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 STD8X16FONT?= iso diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 51d2afb..62e871c 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 STD8X16FONT?= iso diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64 index 083b95d..a127e65 100644 --- a/sys/conf/Makefile.ia64 +++ b/sys/conf/Makefile.ia64 @@ -19,7 +19,7 @@ GCC3= you bet # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 STD8X16FONT?= iso diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index 9330d8d..0e5d57a 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -19,7 +19,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 .if !defined(S) .if exists(./@/.) diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index f0cbad2..1a253e0 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 # Temporary stuff while we're still embryonic NO_MODULES?= yes diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64 index 3af0203..2980fd7 100644 --- a/sys/conf/Makefile.sparc64 +++ b/sys/conf/Makefile.sparc64 @@ -21,7 +21,7 @@ CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -ansi # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 STD8X16FONT?= iso diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 946ef2d..3e213c7 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -49,6 +49,11 @@ ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} # then it might break building of utilities. CFLAGS+= ${FMT} +.if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 +IDENT= -DGPROF +PROF= -pg +.endif + DEFINED_PROF= ${PROF} .if defined(PROF) CFLAGS+= -falign-functions=16 diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h index fcc7265..580ea83 100644 --- a/usr.sbin/config/configvers.h +++ b/usr.sbin/config/configvers.h @@ -8,4 +8,4 @@ * * $FreeBSD$ */ -#define CONFIGVERS 500010 +#define CONFIGVERS 500011 diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index c24a121..6d38186 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -134,27 +134,23 @@ makefile(void) } if (ifp == 0) err(1, "%s", line); - ofp = fopen(path("Makefile.new"), "w"); - if (ofp == 0) - err(1, "%s", path("Makefile.new")); - fprintf(ofp, "KERN_IDENT=%s\n", raisestr(ident)); - fprintf(ofp, "IDENT="); - if (profiling) - fprintf(ofp, " -DGPROF"); + /* XXX this check seems to be misplaced. */ if (cputype == 0) { printf("cpu type must be specified\n"); exit(1); } - fprintf(ofp, "\n"); + + ofp = fopen(path("Makefile.new"), "w"); + if (ofp == 0) + err(1, "%s", path("Makefile.new")); + fprintf(ofp, "KERN_IDENT=%s\n", raisestr(ident)); for (op = mkopt; op; op = op->op_next) fprintf(ofp, "%s=%s\n", op->op_name, op->op_value); if (debugging) fprintf(ofp, "DEBUG=-g\n"); - if (profiling) { - fprintf(ofp, "PROF=-pg\n"); + if (profiling) fprintf(ofp, "PROFLEVEL=%d\n", profiling); - } if (*srcdir != '\0') fprintf(ofp,"S=%s\n", srcdir); while (fgets(line, BUFSIZ, ifp) != 0) { |