config: Add no-ctfconvert support.
Bump CONFIGVERS to 600018 for this support. Some files may purposely have debug info disabled or are *source files* that attempt to run ctfconvert on them. Currently ctfconvert ignores these errors but I have a change to make the errors real so we can catch real problems like exceeding type limits. Sponsored by: Dell EMC Reviewed by: imp, cem, kevans Differential Revision: https://reviews.freebsd.org/D24535
This commit is contained in:
parent
4e4ec35e32
commit
5dda1d0b82
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=360443
@ -82,6 +82,7 @@ struct files_name {
|
|||||||
#define NO_OBJ 2
|
#define NO_OBJ 2
|
||||||
#define BEFORE_DEPEND 4
|
#define BEFORE_DEPEND 4
|
||||||
#define NOWERROR 16
|
#define NOWERROR 16
|
||||||
|
#define NO_CTFCONVERT 32
|
||||||
|
|
||||||
struct device {
|
struct device {
|
||||||
int d_done; /* processed */
|
int d_done; /* processed */
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
*
|
*
|
||||||
* $FreeBSD$
|
* $FreeBSD$
|
||||||
*/
|
*/
|
||||||
#define CONFIGVERS 600017
|
#define CONFIGVERS 600018
|
||||||
#define MAJOR_VERS(x) ((x) / 100000)
|
#define MAJOR_VERS(x) ((x) / 100000)
|
||||||
|
|
||||||
/* Last config(8) version to require envmode/hintmode */
|
/* Last config(8) version to require envmode/hintmode */
|
||||||
|
@ -397,7 +397,7 @@ read_file(char *fname)
|
|||||||
char *wd, *this, *compilewith, *depends, *clean, *warning;
|
char *wd, *this, *compilewith, *depends, *clean, *warning;
|
||||||
const char *objprefix;
|
const char *objprefix;
|
||||||
int compile, match, nreqs, std, filetype, not,
|
int compile, match, nreqs, std, filetype, not,
|
||||||
imp_rule, no_obj, before_depend, nowerror;
|
imp_rule, no_ctfconvert, no_obj, before_depend, nowerror;
|
||||||
|
|
||||||
fp = fopen(fname, "r");
|
fp = fopen(fname, "r");
|
||||||
if (fp == NULL)
|
if (fp == NULL)
|
||||||
@ -452,6 +452,7 @@ read_file(char *fname)
|
|||||||
warning = 0;
|
warning = 0;
|
||||||
std = 0;
|
std = 0;
|
||||||
imp_rule = 0;
|
imp_rule = 0;
|
||||||
|
no_ctfconvert = 0;
|
||||||
no_obj = 0;
|
no_obj = 0;
|
||||||
before_depend = 0;
|
before_depend = 0;
|
||||||
nowerror = 0;
|
nowerror = 0;
|
||||||
@ -479,6 +480,10 @@ read_file(char *fname)
|
|||||||
nreqs = 0;
|
nreqs = 0;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if (eq(wd, "no-ctfconvert")) {
|
||||||
|
no_ctfconvert++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (eq(wd, "no-obj")) {
|
if (eq(wd, "no-obj")) {
|
||||||
no_obj++;
|
no_obj++;
|
||||||
continue;
|
continue;
|
||||||
@ -591,8 +596,10 @@ nextparam:;
|
|||||||
tp->f_srcprefix = "$S/";
|
tp->f_srcprefix = "$S/";
|
||||||
if (imp_rule)
|
if (imp_rule)
|
||||||
tp->f_flags |= NO_IMPLCT_RULE;
|
tp->f_flags |= NO_IMPLCT_RULE;
|
||||||
|
if (no_ctfconvert)
|
||||||
|
tp->f_flags |= NO_CTFCONVERT;
|
||||||
if (no_obj)
|
if (no_obj)
|
||||||
tp->f_flags |= NO_OBJ;
|
tp->f_flags |= NO_OBJ | NO_CTFCONVERT;
|
||||||
if (before_depend)
|
if (before_depend)
|
||||||
tp->f_flags |= BEFORE_DEPEND;
|
tp->f_flags |= BEFORE_DEPEND;
|
||||||
if (nowerror)
|
if (nowerror)
|
||||||
@ -805,7 +812,7 @@ do_rules(FILE *f)
|
|||||||
else
|
else
|
||||||
fprintf(f, "\t%s\n", compilewith);
|
fprintf(f, "\t%s\n", compilewith);
|
||||||
|
|
||||||
if (!(ftp->f_flags & NO_OBJ))
|
if (!(ftp->f_flags & NO_CTFCONVERT))
|
||||||
fprintf(f, "\t${NORMAL_CTFCONVERT}\n\n");
|
fprintf(f, "\t${NORMAL_CTFCONVERT}\n\n");
|
||||||
else
|
else
|
||||||
fprintf(f, "\n");
|
fprintf(f, "\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user