| Message ID | 1448103599-6660-2-git-send-email-heiko.carstens@de.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Nov 21, 2015 at 11:59:58AM +0100, Heiko Carstens wrote: > It is already possible to remove CFLAGS with the CFLAGS_REMOVE option > that was introduced with commit 656ee82cc855 ("kbuild: create new > CFLAGS_REMOVE_(basename).o option"). However it is not possible to > remove AFLAGS for assembler files. > > So this patch just adds the AFLAGS_REMOVE option which works the same > like CFLAGS_REMOVE. > > Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> > --- > scripts/Makefile.lib | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index 79e86613712f..26a48d76eb9d 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -104,8 +104,9 @@ modname_flags = $(if $(filter 1,$(words $(modname))),\ > orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ > $(ccflags-y) $(CFLAGS_$(basetarget).o) > _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) > -_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ > +orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ > $(asflags-y) $(AFLAGS_$(basetarget).o) > +_a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) > _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) > > # Hello Michal, since I didn't hear anything from you, I'll simply add this to the s390 tree. The patch should be trivial enough and is certainly not controversial. Thanks, Heiko -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2015-11-30 09:17, Heiko Carstens wrote: > On Sat, Nov 21, 2015 at 11:59:58AM +0100, Heiko Carstens wrote: >> It is already possible to remove CFLAGS with the CFLAGS_REMOVE option >> that was introduced with commit 656ee82cc855 ("kbuild: create new >> CFLAGS_REMOVE_(basename).o option"). However it is not possible to >> remove AFLAGS for assembler files. >> >> So this patch just adds the AFLAGS_REMOVE option which works the same >> like CFLAGS_REMOVE. >> >> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> >> --- >> scripts/Makefile.lib | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib >> index 79e86613712f..26a48d76eb9d 100644 >> --- a/scripts/Makefile.lib >> +++ b/scripts/Makefile.lib >> @@ -104,8 +104,9 @@ modname_flags = $(if $(filter 1,$(words $(modname))),\ >> orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ >> $(ccflags-y) $(CFLAGS_$(basetarget).o) >> _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) >> -_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ >> +orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ >> $(asflags-y) $(AFLAGS_$(basetarget).o) >> +_a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) >> _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) >> >> # > > Hello Michal, > > since I didn't hear anything from you, I'll simply add this to the s390 tree. > The patch should be trivial enough and is certainly not controversial. Hi Heiko, yes, please go ahead, the patch is fine. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Nov 30, 2015 at 09:36:29AM +0100, Michal Marek wrote: > >> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > >> index 79e86613712f..26a48d76eb9d 100644 > >> --- a/scripts/Makefile.lib > >> +++ b/scripts/Makefile.lib > >> @@ -104,8 +104,9 @@ modname_flags = $(if $(filter 1,$(words $(modname))),\ > >> orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ > >> $(ccflags-y) $(CFLAGS_$(basetarget).o) > >> _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) > >> -_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ > >> +orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ > >> $(asflags-y) $(AFLAGS_$(basetarget).o) > >> +_a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) > >> _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) > >> > >> # > > > > Hello Michal, > > > > since I didn't hear anything from you, I'll simply add this to the s390 tree. > > The patch should be trivial enough and is certainly not controversial. > > Hi Heiko, > > yes, please go ahead, the patch is fine. Ok, thanks. I'll add your ack then. -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 79e86613712f..26a48d76eb9d 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -104,8 +104,9 @@ modname_flags = $(if $(filter 1,$(words $(modname))),\ orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ $(ccflags-y) $(CFLAGS_$(basetarget).o) _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) -_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ +orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ $(asflags-y) $(AFLAGS_$(basetarget).o) +_a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) #
It is already possible to remove CFLAGS with the CFLAGS_REMOVE option that was introduced with commit 656ee82cc855 ("kbuild: create new CFLAGS_REMOVE_(basename).o option"). However it is not possible to remove AFLAGS for assembler files. So this patch just adds the AFLAGS_REMOVE option which works the same like CFLAGS_REMOVE. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> --- scripts/Makefile.lib | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)