summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2018-10-01 12:22:43 -0600
committerSimon Glass <sjg@chromium.org>2018-10-09 04:40:27 -0600
commit44093a1554be9ca4d4e964710537a3d0014909b9 (patch)
tree366dbcf1149c6bb2dbe4f82a214a93c3fc9ef00a
parent07bc873c73315854f52506777d9afb70c5cfedda (diff)
downloadu-boot-44093a1554be9ca4d4e964710537a3d0014909b9.tar.gz
fdt: Allow C++ comments in link scripts and DT files
At present // in a device-tree file or link script causes a warning. But this is used in the standard license header. Update the compiler flags to use C99, which permits this. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--Makefile2
-rw-r--r--scripts/Makefile.spl2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 3f2d494c4f..aadd1ec8c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1524,7 +1524,7 @@ $(defaultenv_h): $(CONFIG_DEFAULT_ENV_FILE:"%"=%) FORCE
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds = LDS $@
cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) \
- -D__ASSEMBLY__ -x assembler-with-cpp -P -o $@ $<
+ -D__ASSEMBLY__ -x assembler-with-cpp -std=c99 -P -o $@ $<
u-boot.lds: $(LDSCRIPT) prepare FORCE
$(call if_changed_dep,cpp_lds)
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index c71497ff00..7416abec62 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -371,7 +371,7 @@ $(u-boot-spl-dirs): $(u-boot-spl-platdata)
quiet_cmd_cpp_lds = LDS $@
cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \
- -D__ASSEMBLY__ -x assembler-with-cpp -P -o $@ $<
+ -D__ASSEMBLY__ -x assembler-with-cpp -std=c99 -P -o $@ $<
$(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE
$(call if_changed_dep,cpp_lds)