| Message ID | alpine.LFD.2.20.1604201512410.27452@knanqh.ubzr |
|---|---|
| State | New |
| Headers | show |
On Tue, 26 Apr 2016, Michal Marek wrote: > On 2016-04-20 21:26, Nicolas Pitre wrote: > > On Wed, 20 Apr 2016, Nicolas Pitre wrote: > > > >> On Wed, 20 Apr 2016, Michal Marek wrote: > >> > >>> Dne 19.4.2016 v 05:32 Nicolas Pitre napsal(a): > >>>> Ping ! > >>>> > >>>> /me only hears back empty cave echoes ... > >>> > >>> Pulled now, sorry for the delay. > >> > >> Thanks! > > > > Looking at your kbuild branch, I see subsequent changes that require > > minor adjustments. Please merge the following patch: > > > > ----- >8 > > From a14d6e7a2902af78ee43ab075c7caf829fdfa4b2 Mon Sep 17 00:00:00 2001 > > From: Nicolas Pitre <nicolas.pitre@linaro.org> > > Date: Wed, 20 Apr 2016 15:16:01 -0400 > > Subject: [PATCH] kbuild: adjust ksym_dep_filter for some cmd renames > > > > The following renames occurred recently: > > > > cmd_cc_i_c --> cmd_cpp_i_c > > cmd_as_s_S --> cmd_cpp_s_S > > > > The respective cc_*_c and as_*_S patterns no longer match the above > > therefore additional patterns are needed. > > > > Signed-off-by: Nicolas Pitre <nico@linaro.org> > > > > diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include > > index a09927e027..bd6bd048cf 100644 > > --- a/scripts/Kbuild.include > > +++ b/scripts/Kbuild.include > > @@ -275,8 +275,10 @@ else > > flags_nodeps = $(filter-out -Wp$(comma)-M%, $($(1))) > > ksym_dep_filter = \ > > case "$(1)" in \ > > - cc_*_c) $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;; \ > > - as_*_S) $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ > > + cc_*_c) $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;; \ > > + as_*_S) $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ > > + cpp_i_c) $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;; \ > > + cpp_s_S) $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ > > Please make it > cc_*_c | cpp_i_c) ... > as_*_S | cpp_s_S) ... Sure. Patch follows Nicolas
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index a09927e027..bd6bd048cf 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -275,8 +275,10 @@ else flags_nodeps = $(filter-out -Wp$(comma)-M%, $($(1))) ksym_dep_filter = \ case "$(1)" in \ - cc_*_c) $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;; \ - as_*_S) $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ + cc_*_c) $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;; \ + as_*_S) $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ + cpp_i_c) $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;; \ + cpp_s_S) $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ boot*|build*|*cpp_lds_S|dtc|host*|vdso*) : ;; \ *) echo "Don't know how to preprocess $(1)" >&2; false ;; \ esac | sed -rn 's/^.*=== __KSYM_(.*) ===.*$$/KSYM_\1/p'