From: Simon Glass <sjg@chromium.org>
Date: Mon, 1 Oct 2018 18:22:43 +0000 (-0600)
Subject: fdt: Allow C++ comments in link scripts and DT files
X-Git-Tag: v2025.01-rc5-pxa1908~3370^2~6
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=44093a1554be9ca4d4e964710537a3d0014909b9;p=u-boot.git

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>
---

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)