Module Name: src
Committed By: rillig
Date: Tue Sep 21 23:06:18 UTC 2021
Modified Files:
src/usr.bin/make: cond.c parse.c trace.c var.c
Log Message:
make: reduce relocations, thereby reducing .text size
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/usr.bin/make/cond.c
cvs rdiff -u -r1.564 -r1.565 src/usr.bin/make/parse.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/make/trace.c
cvs rdiff -u -r1.950 -r1.951 src/usr.bin/make/var.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/make/cond.c
diff -u src/usr.bin/make/cond.c:1.278 src/usr.bin/make/cond.c:1.279
--- src/usr.bin/make/cond.c:1.278 Tue Sep 21 22:53:35 2021
+++ src/usr.bin/make/cond.c Tue Sep 21 23:06:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.278 2021/09/21 22:53:35 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.279 2021/09/21 23:06:18 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.278 2021/09/21 22:53:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.279 2021/09/21 23:06:18 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -778,8 +778,8 @@ static bool
CondParser_FuncCall(CondParser *par, bool doEval, Token *out_token)
{
static const struct fn_def {
- const char *fn_name;
- size_t fn_name_len;
+ const char fn_name[9];
+ unsigned char fn_name_len;
size_t (*fn_parse)(CondParser *, const char **, bool,
const char *, char **);
bool (*fn_eval)(size_t, const char *);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.564 src/usr.bin/make/parse.c:1.565
--- src/usr.bin/make/parse.c:1.564 Tue Sep 21 21:39:32 2021
+++ src/usr.bin/make/parse.c Tue Sep 21 23:06:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.564 2021/09/21 21:39:32 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.565 2021/09/21 23:06:18 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.564 2021/09/21 21:39:32 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.565 2021/09/21 23:06:18 rillig Exp $");
/* types and constants */
@@ -261,7 +261,7 @@ SearchPath *defSysIncPath; /* default fo
* keyword is used as a source ("0" if the keyword isn't special as a source)
*/
static const struct {
- const char *name; /* Name of keyword */
+ const char name[17]; /* Name of keyword */
ParseSpecial spec; /* Type when used as a target */
GNodeType op; /* Operator when used as a source */
} parseKeywords[] = {
Index: src/usr.bin/make/trace.c
diff -u src/usr.bin/make/trace.c:1.28 src/usr.bin/make/trace.c:1.29
--- src/usr.bin/make/trace.c:1.28 Fri Feb 5 05:15:12 2021
+++ src/usr.bin/make/trace.c Tue Sep 21 23:06:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: trace.c,v 1.28 2021/02/05 05:15:12 rillig Exp $ */
+/* $NetBSD: trace.c,v 1.29 2021/09/21 23:06:18 rillig Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -48,13 +48,13 @@
#include "job.h"
#include "trace.h"
-MAKE_RCSID("$NetBSD: trace.c,v 1.28 2021/02/05 05:15:12 rillig Exp $");
+MAKE_RCSID("$NetBSD: trace.c,v 1.29 2021/09/21 23:06:18 rillig Exp $");
static FILE *trfile;
static pid_t trpid;
const char *trwd;
-static const char *evname[] = {
+static const char evname[][4] = {
"BEG",
"END",
"ERR",
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.950 src/usr.bin/make/var.c:1.951
--- src/usr.bin/make/var.c:1.950 Sat Sep 11 09:16:14 2021
+++ src/usr.bin/make/var.c Tue Sep 21 23:06:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.950 2021/09/11 09:16:14 rillig Exp $ */
+/* $NetBSD: var.c,v 1.951 2021/09/21 23:06:18 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.950 2021/09/11 09:16:14 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.951 2021/09/21 23:06:18 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -318,7 +318,7 @@ GNode *SCOPE_INTERNAL;
static VarExportedMode var_exportedVars = VAR_EXPORTED_NONE;
-static const char *VarEvalMode_Name[] = {
+static const char VarEvalMode_Name[][32] = {
"parse-only",
"eval",
"eval-defined",
@@ -2010,7 +2010,7 @@ typedef enum ExprDefined {
DEF_DEFINED
} ExprDefined;
-static const char *const ExprDefined_Name[] = {
+static const char ExprDefined_Name[][10] = {
"regular",
"undefined",
"defined"
