[Armadeus-commitlog] UNNAMED PROJECT branch, opos6ul-2018.05, updated. c2e3fc055aca24f259977a89de3a20625ad2b42a

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, opos6ul-2018.05 has been updated
       via  c2e3fc055aca24f259977a89de3a20625ad2b42a (commit)
       via  e176b552484ad65effa6cdb014548b7d003bc987 (commit)
      from  525d5256f0d07d9862c8e0af395308c7e22793b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c2e3fc055aca24f259977a89de3a20625ad2b42a
Author: Masahiro Yamada <yam...@so...>
Date:   Wed Sep 19 11:35:57 2018 +0900

    kbuild: fix # escaping in appending U-Boot own DT
    
    The escape sequence '\#' does not work for the latest GNU Make from
    the git tree.
    
    Replace it with $(pound) as Linux did.
    
    Signed-off-by: Masahiro Yamada <yam...@so...>
    (cherry picked from commit 0c544115379ed77c1843a194e26960e5b8f3d369)

commit e176b552484ad65effa6cdb014548b7d003bc987
Author: Rasmus Villemoes <li...@ra...>
Date:   Wed Sep 19 11:35:56 2018 +0900

    Kbuild: fix # escaping in .cmd files for future Make
    
    [ commit 9564a8cf422d7b58f6e857e3546d346fa970191e in Linux ]
    
    I tried building using a freshly built Make (4.2.1-69-g8a731d1), but
    already the objtool build broke with
    
    orc_dump.c: In function ‘orc_dump’:
    orc_dump.c:106:2: error: ‘elf_getshnum’ is deprecated [-Werror=deprecated-declarations]
      if (elf_getshdrnum(elf, &nr_sections)) {
    
    Turns out that with that new Make, the backslash was not removed, so cpp
    didn't see a #include directive, grep found nothing, and
    -DLIBELF_USE_DEPRECATED was wrongly put in CFLAGS.
    
    Now, that new Make behaviour is documented in their NEWS file:
    
      * WARNING: Backward-incompatibility!
        Number signs (#) appearing inside a macro reference or function invocation
        no longer introduce comments and should not be escaped with backslashes:
        thus a call such as:
          foo := $(shell echo '#')
        is legal.  Previously the number sign needed to be escaped, for example:
          foo := $(shell echo '\#')
        Now this latter will resolve to "\#".  If you want to write makefiles
        portable to both versions, assign the number sign to a variable:
          C := \#
          foo := $(shell echo '$C')
        This was claimed to be fixed in 3.81, but wasn't, for some reason.
        To detect this change search for 'nocomment' in the .FEATURES variable.
    
    This also fixes up the two make-cmd instances to replace # with $(pound)
    rather than with \#. There might very well be other places that need
    similar fixup in preparation for whatever future Make release contains
    the above change, but at least this builds an x86_64 defconfig with the
    new make.
    
    Link: https://bugzilla.kernel.org/show_bug.cgi?id=197847
    Cc: Randy Dunlap <rd...@in...>
    Signed-off-by: Rasmus Villemoes <li...@ra...>
    Signed-off-by: Masahiro Yamada <yam...@so...>
    (cherry picked from commit e5e701c2b8470de044c5c71d2a54ecfc72680d59)

-----------------------------------------------------------------------

Summary of changes:
 scripts/Kbuild.include | 5 +++--
 scripts/Makefile.lib   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 2c7918ad37..13ebddda65 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -7,6 +7,7 @@ quote   := "
 squote  := '
 empty   :=
 space   := $(empty) $(empty)
+pound := \#
 
 ###
 # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
@@ -242,11 +243,11 @@ endif
 
 # Replace >$< with >$$< to preserve $ when reloading the .cmd file
 # (needed for make)
-# Replace >#< with >\#< to avoid starting a comment in the .cmd file
+# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file
 # (needed for make)
 # Replace >'< with >'\''< to be able to enclose the whole string in '...'
 # (needed for the shell)
-make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
+make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1)))))
 
 # Find any prerequisites that is newer than target or that does not exist.
 # PHONY targets skipped in both cases.
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index f9809ce7ce..4bb768b2ce 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -316,7 +316,7 @@ quiet_cmd_dtc = DTC     $@
 # Modified for U-Boot
 # Bring in any U-Boot-specific include at the end of the file
 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
-	(cat $<; $(if $(u_boot_dtsi),echo '\#include "$(u_boot_dtsi)"')) > $(pre-tmp); \
+	(cat $<; $(if $(u_boot_dtsi),echo '$(pound)include "$(u_boot_dtsi)"')) > $(pre-tmp); \
 	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \
 	$(DTC) -O dtb -o $@ -b 0 \
 		-i $(dir $<) $(DTC_FLAGS) \


hooks/post-receive
-- 
UNNAMED PROJECT