Hi Michal,
these are just two simple patches which add
1) an AFLAGS_REMOVE option which works just like CFLAGS_REMOVE and
2) one user of it in s390 code.
If you agree this is ok, then these two patches could go upstream either
via your tree or the s390 tree.
Thanks,
Heiko
Heiko Carstens (2):
kbuild: add AFLAGS_REMOVE_(basename).o option
s390: compile head.s always with -march=z900
arch/s390/kernel/Makefile | 6 ++++--
scripts/Makefile.lib | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
--
2.3.9
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 <[email protected]>
---
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))
#
--
2.3.9
head.s on s390 contains some sanity checks if the kernel will run on a
machine or if the machine is too old, e.g. if the kernel contains
instructions not available on the machine. If so, it will emit an error
message to the console before it stops execution.
Therefore head.s contains only instructions which are availanble with the
earliest machine generation (z900). In order to make sure we don't
accidently add instructions which are not available on z900, always compile
with -march=z900. This makes sure compilation will fail if wrong
instructions are used.
Signed-off-by: Heiko Carstens <[email protected]>
---
arch/s390/kernel/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index dc167a23b920..a53755e37e3d 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -34,8 +34,10 @@ CFLAGS_sysinfo.o += -w
#
CFLAGS_REMOVE_sclp.o = $(CC_FLAGS_FTRACE)
ifneq ($(CC_FLAGS_MARCH),-march=z900)
-CFLAGS_REMOVE_sclp.o += $(CC_FLAGS_MARCH)
-CFLAGS_sclp.o += -march=z900
+CFLAGS_REMOVE_sclp.o += $(CC_FLAGS_MARCH)
+CFLAGS_sclp.o += -march=z900
+AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH)
+AFLAGS_head.o += -march=z900
endif
GCOV_PROFILE_sclp.o := n
--
2.3.9
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 <[email protected]>
> ---
> 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
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 <[email protected]>
>> ---
>> 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
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.