tech-toolchain archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: CVS commit: src/usr.bin/crunch/crunchgen
Here is a patch that:
1. removes all the special handling of variables (-d -p -P -s -S) that
were dealing with DBG (-d) LDSTATIC/NOPIE (-p), and the rest with
disabling/enabling sanitizers.
2. uses emalloc/estrdup for all the allocators instead of only some cases.
3. adds -V varspec which passes variables on the command line (as DBG
and LDSTATIC used to be passed before) instead of appending them
to the on-the-fly Makefile using -v varspec.
The motivation of this is to make variable handling consistent, less magical,
and remove the need for changing crunchgen each time we want to add disabling
an option by default.
Index: rescue/Makefile
===================================================================
RCS file: /cvsroot/src/rescue/Makefile,v
retrieving revision 1.38
diff -u -u -r1.38 Makefile
--- rescue/Makefile 2 Oct 2019 09:45:10 -0000 1.38
+++ rescue/Makefile 23 Dec 2019 18:48:01 -0000
@@ -12,13 +12,17 @@
DBG+= -Os
.endif
-CRUNCHGEN_FLAGS=-d "${DBG}"
+CRUNCHGEN_FLAGS+=-V DBG="${DBG}"
.if ${MKSTATICPIE:Uno} == "yes"
-CRUNCHGEN_FLAGS+=-p
CFLAGS+=-fPIE
+CRUNCHGEN_FLAGS+=-V LDSTATIC="-static -pie"
+.else
+CRUNCHGEN_FLAGS+=-V LDSTATIC="-static" -V NOPIE=
.endif
+CRUNCHGEN_FLAGS+=-V NOLIBCSANITIZER= -V NOSANITIZER= -V NOMAN=
+
RESCUEDIR= /rescue
CRUNCHBIN= rescue
CRUNCHENV= RESCUEDIR=${RESCUEDIR}
Index: usr.bin/crunch/crunchgen/crunchgen.1
===================================================================
RCS file: /cvsroot/src/usr.bin/crunch/crunchgen/crunchgen.1,v
retrieving revision 1.38
diff -u -u -r1.38 crunchgen.1
--- usr.bin/crunch/crunchgen/crunchgen.1 18 Dec 2019 02:16:04 -0000 1.38
+++ usr.bin/crunch/crunchgen/crunchgen.1 23 Dec 2019 18:48:01 -0000
@@ -24,7 +24,7 @@
.\" Computer Science Department
.\" University of Maryland at College Park
.\"
-.Dd June 21, 2018
+.Dd December 23, 2019
.Dt CRUNCHGEN 1
.Os
.Sh NAME
@@ -32,14 +32,14 @@
.Nd generates build environment for a crunched binary
.Sh SYNOPSIS
.Nm
-.Op Fl FfOoPpqSs
+.Op Fl FfOoq
.Op Fl c Ar c-file-name
.Op Fl D Ar src-root
-.Op Fl d Ar build-options
.Op Fl e Ar exec-file-name
.Op Fl L Ar lib-dir
.Op Fl m Ar makefile-name
.Op Fl v Ar var-spec
+.Op Fl V Ar var-spec
.Ar conf-file
.Sh DESCRIPTION
A crunched binary is a program made up of many other programs linked
@@ -92,10 +92,6 @@
.It Fl D Ar src-root
Assume that relative source directory specifications begin with
.Ar src-root .
-.It Fl d Ar build-options
-Set the DBG variable in the generated makefile to
-.Ar build-options .
-The default flags are -Os.
.It Fl e Ar exec-file-name
Set crunched binary executable file name to
.Ar exec-file-name .
@@ -126,19 +122,15 @@
Use existing object files.
Rather than rebuilding object files via reach-over
makefiles, instead search for and use existing object files.
-.It Fl P
-Enable stack protector.
-.It Fl p
-Produce static pie (position independent executables).
.It Fl q
Quiet operation.
Status messages are suppressed.
-.It Fl S
-Enable sanitization with a sanitizer in libc.
-.It Fl s
-Enable sanitization.
.It Fl v Ar varspec
-Append a variable specification to the on-the fly generated Makefile.
+Append a variable specification to the on-the fly generated Makefiles
+for the individual programs.
+.It Fl V ar varspec
+Set the variable in the top level Makefile, and pass it in the command
+line of all sub-makes, so that it cannot be overwriten.
.El
.Sh CRUNCHGEN CONFIGURATION FILE COMMANDS
.Nm
Index: usr.bin/crunch/crunchgen/crunchgen.c
===================================================================
RCS file: /cvsroot/src/usr.bin/crunch/crunchgen/crunchgen.c,v
retrieving revision 1.93
diff -u -u -r1.93 crunchgen.c
--- usr.bin/crunch/crunchgen/crunchgen.c 18 Dec 2019 02:16:04 -0000 1.93
+++ usr.bin/crunch/crunchgen/crunchgen.c 23 Dec 2019 18:48:01 -0000
@@ -55,7 +55,7 @@
#include <sys/param.h>
#include <sys/utsname.h>
-#define CRUNCH_VERSION "20180508"
+#define CRUNCH_VERSION "20191223"
#define MAXLINELEN 16384
#define MAXFIELDS 2048
@@ -80,6 +80,12 @@
int goterror;
} prog_t;
+typedef struct var {
+ struct var *next;
+ char *name;
+ const char *value;
+ size_t len;
+} var_t;
/* global state */
@@ -87,6 +93,8 @@
static strlst_t *libs = NULL;
static strlst_t *vars = NULL;
static prog_t *progs = NULL;
+static var_t *mvars = NULL;
+static var_t *evars = NULL;
static char line[MAXLINELEN];
@@ -96,15 +104,13 @@
static char curdir[MAXPATHLEN];
static char topdir[MAXPATHLEN];
static char libdir[MAXPATHLEN] = "/usr/lib";
-static char dbg[MAXPATHLEN] = "-Os";
static int linenum = -1;
static int goterror = 0;
static const char *pname = "crunchgen";
/* options */
-static int verbose, readcache, useobjs, oneobj, pie, libcsanitizer, sanitizer;
-static int ssp, fortify;
+static int verbose, readcache, useobjs, oneobj;
static int reading_cache;
static char *machine;
@@ -115,10 +121,10 @@
/* general library routines */
static void status(const char *str);
-__dead static void out_of_memory(void);
static void add_string(strlst_t **listp, char *str);
static int is_dir(const char *pathname);
static int is_nonempty_file(const char *pathname);
+static void addvar(const char *cstr);
/* helper routines for main() */
@@ -154,32 +160,26 @@
readcache = 1;
useobjs = 0;
oneobj = 1;
- pie = 0;
*outmkname = *outcfname = *execfname = '\0';
if (argc > 0)
pname = argv[0];
- while ((optc = getopt(argc, argv, "m:c:d:e:FfopPqsD:L:Ov:")) != -1) {
+ while ((optc = getopt(argc, argv, "m:c:e:foqsD:L:OV:v:")) != -1) {
switch(optc) {
case 'f': readcache = 0; break;
- case 'F': fortify = 1; break;
- case 'p': pie = 1; break;
- case 'P': ssp = 1; break;
case 'q': verbose = 0; break;
case 'O': oneobj = 0; break;
case 'o': useobjs = 1, oneobj = 0; break;
- case 's': sanitizer = 1; break;
- case 'S': libcsanitizer = 1; break;
case 'm': (void)estrlcpy(outmkname, optarg, sizeof(outmkname)); break;
case 'c': (void)estrlcpy(outcfname, optarg, sizeof(outcfname)); break;
case 'e': (void)estrlcpy(execfname, optarg, sizeof(execfname)); break;
- case 'd': (void)estrlcpy(dbg, optarg, sizeof(dbg)); break;
case 'D': (void)estrlcpy(topdir, optarg, sizeof(topdir)); break;
case 'L': (void)estrlcpy(libdir, optarg, sizeof(libdir)); break;
case 'v': add_string(&vars, optarg); break;
+ case 'V': addvar(optarg); break;
case '?':
default: usage();
@@ -399,11 +399,8 @@
if (!strcmp(p2->name, progname))
return;
- p2 = malloc(sizeof(prog_t));
- if (p2)
- p2->name = strdup(progname);
- if (!p2 || !p2->name)
- out_of_memory();
+ p2 = emalloc(sizeof(*p2));
+ p2->name = estrdup(progname);
p2->next = NULL;
if (p1 == NULL)
@@ -464,8 +461,7 @@
if (!strcmp(argv[2], "ident")) {
if (argc != 4)
goto argcount;
- if ((p->ident = strdup(argv[3])) == NULL)
- out_of_memory();
+ p->ident = estrdup(argv[3]);
return;
}
@@ -473,8 +469,7 @@
if (argc != 4)
goto argcount;
if (argv[3][0] == '/') {
- if ((p->srcdir = strdup(argv[3])) == NULL)
- out_of_memory();
+ p->srcdir = estrdup(argv[3]);
} else {
char tmppath[MAXPATHLEN];
if (topdir[0] == '\0')
@@ -483,8 +478,7 @@
(void)estrlcpy(tmppath, topdir, sizeof(tmppath));
(void)estrlcat(tmppath, "/", sizeof(tmppath));
(void)estrlcat(tmppath, argv[3], sizeof(tmppath));
- if ((p->srcdir = strdup(tmppath)) == NULL)
- out_of_memory();
+ p->srcdir = estrdup(tmppath);
}
return;
}
@@ -492,8 +486,7 @@
if (!strcmp(argv[2], "objdir")) {
if (argc != 4)
goto argcount;
- if ((p->objdir = strdup(argv[3])) == NULL)
- out_of_memory();
+ p->objdir = estrdup(argv[3]);
return;
}
@@ -603,8 +596,7 @@
(void)snprintf(path, sizeof(path), "%s/%s", srcparent, p->name);
if (is_dir(path)) {
if (path[0] == '/') {
- if ((p->srcdir = strdup(path)) == NULL)
- out_of_memory();
+ p->srcdir = estrdup(path);
} else {
char tmppath[MAXPATHLEN];
if (topdir[0] == '\0')
@@ -613,8 +605,7 @@
(void)estrlcpy(tmppath, topdir, sizeof(tmppath));
(void)estrlcat(tmppath, "/", sizeof(tmppath));
(void)estrlcat(tmppath, path, sizeof(tmppath));
- if ((p->srcdir = strdup(tmppath)) == NULL)
- out_of_memory();
+ p->srcdir = estrdup(tmppath);
}
}
}
@@ -805,13 +796,28 @@
fclose(cachef);
}
-
static void
-addno(char *str, size_t len, const char *stem)
+addvar(const char *cstr)
{
- char buf[128];
- snprintf(buf, sizeof(buf), "NO%s=\n", stem);
- strlcat(str, buf, len);
+ char *str = estrdup(cstr), *p;
+ var_t *v = emalloc(sizeof(*v));
+
+ if ((p = strchr(str, '=')) == NULL) {
+ v->value = "";
+ } else {
+ *p++ = '\0';
+ v->value = p;
+ }
+ v->name = str;
+ // "%s=${%s:Q} "
+ v->len = 2 * strlen(v->name) + 7;
+ v->next = NULL;
+ if (mvars == NULL) {
+ mvars = evars = v;
+ } else {
+ evars->next = v;
+ evars = v;
+ }
}
@@ -819,24 +825,10 @@
gen_output_makefile(void)
{
prog_t *p;
+ var_t *v;
FILE *outmk;
- char noes[1024], *ptr;
-
- noes[0] = '\0';
-
- if (!pie)
- addno(noes, sizeof(noes), "PIE");
- if (!ssp)
- addno(noes, sizeof(noes), "SSP");
- if (!fortify)
- addno(noes, sizeof(noes), "FORT");
- if (!libcsanitizer)
- addno(noes, sizeof(noes), "LIBCSANITIZER");
- if (!sanitizer)
- addno(noes, sizeof(noes), "SANITIZER");
-
- addno(noes, sizeof(noes), "MAN");
-
+ size_t len;
+ char *linevars, *ptr;
(void)snprintf(line, sizeof(line), "generating %s", outmkname);
status(line);
@@ -850,14 +842,24 @@
fprintf(outmk, "# %s - generated from %s by crunchgen %s\n\n",
outmkname, infilename, CRUNCH_VERSION);
- fprintf(outmk, "%s\n", noes);
- while ((ptr = strchr(noes, '\n')) != NULL)
- *ptr = ' ';
-
top_makefile_rules(outmk);
+
+ len = 0;
+ for (v = mvars; v != NULL; v = v->next) {
+ len += v->len;
+ }
+
+ linevars = emalloc(len + 1);
+
+ ptr = linevars;
+ for (v = mvars; v != NULL; v = v->next) {
+ int rl = snprintf(ptr, v->len + 1, "%s=${%s:Q} ", v->name, v->name);
+ ptr += rl;
+ }
+
for (p = progs; p != NULL; p = p->next)
- prog_makefile_rules(outmk, p, noes);
+ prog_makefile_rules(outmk, p, linevars);
fprintf(outmk, "\n.include <bsd.prog.mk>\n");
fprintf(outmk, "\n# ========\n");
@@ -956,8 +958,11 @@
top_makefile_rules(FILE *outmk)
{
prog_t *p;
+ var_t *v;
- fprintf(outmk, "DBG=%s\n", dbg);
+ for (v = mvars; v != NULL; v = v->next) {
+ fprintf(outmk, "%s=%s\n", v->name, v->value);
+ }
fprintf(outmk, "MAKE?=make\n");
#ifdef NEW_TOOLCHAIN
fprintf(outmk, "OBJCOPY?=objcopy\n");
@@ -984,7 +989,6 @@
fprintf(outmk, " %s_make", p->ident);
fprintf(outmk, "\n\n");
- fprintf(outmk, "LDSTATIC=-static%s\n\n", pie ? " -pie" : "");
fprintf(outmk, "PROG=%s\n\n", execfname);
fprintf(outmk, "OBJCOPY_REMOVE_FLAGS=-R .eh_frame_hdr -R .note -R .note.netbsd.pax -R .ident -R .comment -R .copyright\n\n");
@@ -1018,7 +1022,7 @@
static void
-prog_makefile_rules(FILE *outmk, prog_t *p, const char *noes)
+prog_makefile_rules(FILE *outmk, prog_t *p, const char *linevars)
{
strlst_t *lst;
@@ -1048,8 +1052,8 @@
fprintf(outmk, "%s\\n", lst->str);
fprintf(outmk, "'\\\n");
#define MAKECMD \
- "\t| ${MAKE} -f- CRUNCHEDPROG=1 %sDBG=${DBG:Q} LDSTATIC=${LDSTATIC:Q} "
- fprintf(outmk, MAKECMD "depend", noes);
+ "\t| ${MAKE} -f- CRUNCHEDPROG=1 %s"
+ fprintf(outmk, MAKECMD "depend", linevars);
fprintf(outmk, " )\n");
fprintf(outmk, "\t( cd %s; printf '.PATH: ${%s_SRCDIR}\\n"
".CURDIR:= ${%s_SRCDIR}\\n"
@@ -1058,7 +1062,7 @@
for (lst = vars; lst != NULL; lst = lst->next)
fprintf(outmk, "%s\\n", lst->str);
fprintf(outmk, "'\\\n");
- fprintf(outmk, MAKECMD, noes);
+ fprintf(outmk, MAKECMD, linevars);
if (p->objs)
fprintf(outmk, "${%s_OBJS} ) \n\n", p->ident);
else
@@ -1141,14 +1145,6 @@
static void
-out_of_memory(void)
-{
- fprintf(stderr, "%s: %d: out of memory, stopping.\n", infilename, linenum);
- exit(1);
-}
-
-
-static void
add_string(strlst_t **listp, char *str)
{
strlst_t *p1, *p2;
@@ -1159,11 +1155,8 @@
if (!strcmp(p2->str, str))
return;
- p2 = malloc(sizeof(strlst_t));
- if (p2)
- p2->str = strdup(str);
- if (!p2 || !p2->str)
- out_of_memory();
+ p2 = emalloc(sizeof(*p2));
+ p2->str = estrdup(str);
p2->next = NULL;
if (p1 == NULL)
Index: distrib/amd64/ramdisks/common/Makefile.ramdisk
===================================================================
RCS file: /cvsroot/src/distrib/amd64/ramdisks/common/Makefile.ramdisk,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile.ramdisk
--- distrib/amd64/ramdisks/common/Makefile.ramdisk 27 Jan 2019 04:22:46 -0000 1.14
+++ distrib/amd64/ramdisks/common/Makefile.ramdisk 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
WARNS= 1
DBG= -Os -fno-asynchronous-unwind-tables
-CRUNCHGEN_FLAGS= -d "${DBG}"
CRUNCHBIN= ramdiskbin
Index: distrib/arc/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/arc/ramdisk/Makefile,v
retrieving revision 1.26
diff -u -u -r1.26 Makefile
--- distrib/arc/ramdisk/Makefile 12 May 2017 07:26:35 -0000 1.26
+++ distrib/arc/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= -Os -mmemcpy -fno-unwind-tables
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst.en
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
Index: distrib/bebox/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/bebox/ramdisk/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- distrib/bebox/ramdisk/Makefile 24 Jan 2017 18:04:01 -0000 1.3
+++ distrib/bebox/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= -Os
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS=-d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst.en
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/cobalt/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/cobalt/ramdisk/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- distrib/cobalt/ramdisk/Makefile 18 Jul 2017 23:12:24 -0000 1.12
+++ distrib/cobalt/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= -Os -mmemcpy
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst.en
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
Index: distrib/common/Makefile.crunch
===================================================================
RCS file: /cvsroot/src/distrib/common/Makefile.crunch,v
retrieving revision 1.25
diff -u -u -r1.25 Makefile.crunch
--- distrib/common/Makefile.crunch 1 Feb 2014 21:05:54 -0000 1.25
+++ distrib/common/Makefile.crunch 23 Dec 2019 18:48:01 -0000
@@ -26,6 +26,17 @@
.if !defined(_MAKEFILE_CRUNCH_)
_MAKEFILE_CRUNCH_=1
+DBG?=-Os
+CRUNCHGEN_FLAGS?=\
+-V LDSTATIC=-static \
+-V DBG="${DBG}" \
+-V NOMAN= \
+-V NOLIBCSANITIZER= \
+-V NOSANITIZER= \
+-V NOPIE= \
+-V NOSSP= \
+-V NOFORT=
+
CRUNCHENV+= AWK=${TOOL_AWK:Q}
SMALLPROG?= 1
@@ -52,7 +63,7 @@
CRUNCHGEN != command -v ${TOOL_CRUNCHGEN:[-1]} || echo
${CRUNCHBIN}.mk: ${CRUNCHBIN}.conf ${CRUNCHGEN}
- ${CRUNCHENV} ${TOOL_CRUNCHGEN} -f -D ${NETBSDSRCDIR} -d ${DBG:Q} \
+ ${CRUNCHENV} ${TOOL_CRUNCHGEN} -f -D ${NETBSDSRCDIR} \
-L ${DESTDIR}/usr/lib -q ${CRUNCHGEN_FLAGS} ${CRUNCHBIN}.conf
${CRUNCHBIN}.conf: ${LISTS} ${PARSELISTDEP}
Index: distrib/dreamcast/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/dreamcast/ramdisk/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- distrib/dreamcast/ramdisk/Makefile 24 Jan 2017 18:04:01 -0000 1.14
+++ distrib/dreamcast/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= -Os
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list # ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
Index: distrib/emips/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/emips/ramdisk/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- distrib/emips/ramdisk/Makefile 31 Mar 2019 16:09:14 -0000 1.5
+++ distrib/emips/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -12,7 +12,6 @@
DBG= -Os -mmemcpy
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/evbppc/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/evbppc/ramdisk/Makefile,v
retrieving revision 1.23
diff -u -u -r1.23 Makefile
--- distrib/evbppc/ramdisk/Makefile 23 Jul 2017 20:59:00 -0000 1.23
+++ distrib/evbppc/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= ${${ACTIVE_CC} == "clang":? -Oz -fomit-frame-pointer : -Os } -fno-unwind-tables
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS=-d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/ews4800mips/floppies/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/ews4800mips/floppies/ramdisk/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- distrib/ews4800mips/floppies/ramdisk/Makefile 4 Sep 2019 12:10:00 -0000 1.13
+++ distrib/ews4800mips/floppies/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= -Os -mmemcpy -fno-unwind-tables
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst.en
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/hppa/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/hppa/ramdisk/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- distrib/hppa/ramdisk/Makefile 4 Nov 2019 00:59:05 -0000 1.6
+++ distrib/hppa/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -10,7 +10,6 @@
WARNS= 1
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/ibmnws/netboot/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/ibmnws/netboot/ramdisk/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- distrib/ibmnws/netboot/ramdisk/Makefile 24 Jan 2017 18:04:03 -0000 1.13
+++ distrib/ibmnws/netboot/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -10,7 +10,6 @@
WARNS= 1
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/landisk/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/landisk/ramdisk/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- distrib/landisk/ramdisk/Makefile 24 Jan 2017 18:04:03 -0000 1.11
+++ distrib/landisk/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -12,7 +12,6 @@
DBG= -Os
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
Index: distrib/macppc/floppies/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/macppc/floppies/ramdisk/Makefile,v
retrieving revision 1.50
diff -u -u -r1.50 Makefile
--- distrib/macppc/floppies/ramdisk/Makefile 7 Jan 2019 01:39:26 -0000 1.50
+++ distrib/macppc/floppies/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -15,7 +15,6 @@
DBG= -Os
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/miniroot/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/miniroot/Makefile,v
retrieving revision 1.68
diff -u -u -r1.68 Makefile
--- distrib/miniroot/Makefile 20 Sep 2009 19:49:09 -0000 1.68
+++ distrib/miniroot/Makefile 23 Dec 2019 18:48:01 -0000
@@ -8,7 +8,6 @@
ARCHDIR= ${.CURDIR}/../${MACHINE}/miniroot
CRUNCHBIN= instbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${ARCHDIR}/list
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGE= miniroot.fs
Index: distrib/mipsco/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/mipsco/ramdisk/Makefile,v
retrieving revision 1.21
diff -u -u -r1.21 Makefile
--- distrib/mipsco/ramdisk/Makefile 24 Jan 2017 18:04:03 -0000 1.21
+++ distrib/mipsco/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -12,7 +12,6 @@
DBG= -Os
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/newsmips/floppies/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/newsmips/floppies/ramdisk/Makefile,v
retrieving revision 1.35
diff -u -u -r1.35 Makefile
--- distrib/newsmips/floppies/ramdisk/Makefile 7 Feb 2019 04:33:58 -0000 1.35
+++ distrib/newsmips/floppies/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= -Os -mmemcpy
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/ofppc/ramdisks/common/Makefile.ramdisk
===================================================================
RCS file: /cvsroot/src/distrib/ofppc/ramdisks/common/Makefile.ramdisk,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile.ramdisk
--- distrib/ofppc/ramdisks/common/Makefile.ramdisk 24 Dec 2018 20:11:22 -0000 1.9
+++ distrib/ofppc/ramdisks/common/Makefile.ramdisk 23 Dec 2019 18:48:01 -0000
@@ -9,7 +9,6 @@
WARNS= 1
DBG= -Os -fno-asynchronous-unwind-tables
-CRUNCHGEN_FLAGS= -d "${DBG}"
CRUNCHBIN= ramdiskbin
Index: distrib/pmax/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/pmax/ramdisk/Makefile,v
retrieving revision 1.52
diff -u -u -r1.52 Makefile
--- distrib/pmax/ramdisk/Makefile 26 Jun 2019 07:33:19 -0000 1.52
+++ distrib/pmax/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -12,7 +12,6 @@
DBG= -Os -mmemcpy
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
Index: distrib/prep/floppies/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/prep/floppies/ramdisk/Makefile,v
retrieving revision 1.22
diff -u -u -r1.22 Makefile
--- distrib/prep/floppies/ramdisk/Makefile 24 Jan 2017 18:04:04 -0000 1.22
+++ distrib/prep/floppies/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= -Os
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS=-d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst.en
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/rs6000/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/rs6000/ramdisk/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- distrib/rs6000/ramdisk/Makefile 6 Feb 2019 07:51:20 -0000 1.9
+++ distrib/rs6000/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= -Os
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list # ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/sandpoint/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/sandpoint/ramdisk/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- distrib/sandpoint/ramdisk/Makefile 24 Jan 2017 18:04:04 -0000 1.13
+++ distrib/sandpoint/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -11,7 +11,6 @@
DBG= -Os
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS=-d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/sgimips/ramdisk/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/sgimips/ramdisk/Makefile,v
retrieving revision 1.21
diff -u -u -r1.21 Makefile
--- distrib/sgimips/ramdisk/Makefile 7 Feb 2019 04:33:58 -0000 1.21
+++ distrib/sgimips/ramdisk/Makefile 23 Dec 2019 18:48:01 -0000
@@ -12,7 +12,6 @@
DBG= -Os -mmemcpy
CRUNCHBIN= ramdiskbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= be
Index: distrib/sun2/miniroot/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/sun2/miniroot/Makefile,v
retrieving revision 1.37
diff -u -u -r1.37 Makefile
--- distrib/sun2/miniroot/Makefile 18 Dec 2019 02:35:59 -0000 1.37
+++ distrib/sun2/miniroot/Makefile 23 Dec 2019 18:48:01 -0000
@@ -15,7 +15,6 @@
DBG= -Os -fno-unwind-tables
CRUNCHBIN= instbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list
MTREECONF= ${.CURDIR}/mtree.conf
Index: distrib/sun3/miniroot/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/sun3/miniroot/Makefile,v
retrieving revision 1.48
diff -u -u -r1.48 Makefile
--- distrib/sun3/miniroot/Makefile 27 Oct 2019 02:07:42 -0000 1.48
+++ distrib/sun3/miniroot/Makefile 23 Dec 2019 18:48:01 -0000
@@ -17,7 +17,6 @@
USE_WIDECHAR= no
CRUNCHBIN= instbin
-CRUNCHGEN_FLAGS= -d "${DBG}"
LISTS= ${.CURDIR}/list
MTREECONF= ${.CURDIR}/mtree.conf
Home |
Main Index |
Thread Index |
Old Index