[coreboot] [v2] r4151 - in trunk/coreboot-v2/util: newconfig romcc
svn at coreboot.org
svn at coreboot.org
Tue Apr 21 14:41:55 CEST 2009
Author: oxygene
Date: 2009-04-21 14:41:55 +0200 (Tue, 21 Apr 2009)
New Revision: 4151
Modified:
trunk/coreboot-v2/util/newconfig/config.g
trunk/coreboot-v2/util/romcc/romcc.c
Log:
scan-build prefers -include over --includes=, gcc knows both.
With this change, romcc knows -include and the build system uses it.
Also use a full path to settings.h because scan-build has trouble
finding it otherwise.
Signed-off-by: Patrick Georgi <patrick.georgi at coresystems.de>
Acked-by: Joseph Smith <joe at settoplinux.org>
Modified: trunk/coreboot-v2/util/newconfig/config.g
===================================================================
--- trunk/coreboot-v2/util/newconfig/config.g 2009-04-21 01:47:16 UTC (rev 4150)
+++ trunk/coreboot-v2/util/newconfig/config.g 2009-04-21 12:41:55 UTC (rev 4151)
@@ -2098,7 +2098,7 @@
file.write("# Function to create an item like -Di586 or -DCONFIG_MAX_CPUS='1' or -Ui686\n")
file.write("D_item = $(shell echo '$(if $(subst undefined,,$(origin $1)),\\#define $1$(if $($1), $($1),),\\#undef $1)' >> settings.h)\n\n")
file.write("# Compute the value of CPUFLAGS here during make's first pass.\n")
- file.write("CPUFLAGS := $(strip $(shell echo '/* autogenerated */' > settings.h)$(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))--include=settings.h)\n\n")
+ file.write("CPUFLAGS := $(strip $(shell echo '/* autogenerated */' > settings.h)$(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))-include $(PWD)/settings.h)\n\n")
for i in image.getuserdefines():
file.write("%s\n" %i)
Modified: trunk/coreboot-v2/util/romcc/romcc.c
===================================================================
--- trunk/coreboot-v2/util/romcc/romcc.c 2009-04-21 01:47:16 UTC (rev 4150)
+++ trunk/coreboot-v2/util/romcc/romcc.c 2009-04-21 12:41:55 UTC (rev 4151)
@@ -25118,11 +25118,13 @@
else if (strncmp(argv[1], "-m", 2) == 0) {
result = arch_encode_flag(&arch, argv[1]+2);
}
- else if (strncmp(argv[1], "--include=", 10) == 0) {
+ else if (strncmp(argv[1], "-include", 10) == 0) {
if (includefile) {
- arg_error("Only one --include option may be specified.\n");
+ arg_error("Only one -include option may be specified.\n");
} else {
- includefile = argv[1] + 10;
+ argv++;
+ argc--;
+ includefile = argv[1];
result = 0;
}
}
More information about the coreboot
mailing list