| Message ID | 20191024225132.13410-17-samitolvanen@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | add support for Clang's Shadow Call Stack | expand |
On Thu, 24 Oct 2019 15:51:31 -0700 samitolvanen@google.com wrote: Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org> ;-) > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> > --- > arch/arm64/kvm/hyp/Makefile | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile > index ea710f674cb6..8289ea086e5e 100644 > --- a/arch/arm64/kvm/hyp/Makefile > +++ b/arch/arm64/kvm/hyp/Makefile > @@ -28,3 +28,6 @@ GCOV_PROFILE := n > KASAN_SANITIZE := n > UBSAN_SANITIZE := n > KCOV_INSTRUMENT := n > + > +ORIG_CFLAGS := $(KBUILD_CFLAGS) > +KBUILD_CFLAGS = $(subst $(CC_FLAGS_SCS),,$(ORIG_CFLAGS)) May want a comment above that that states: # remove the SCS flags from all objects in this directory -- Steve
On Fri, Oct 25, 2019 at 7:52 AM <samitolvanen@google.com> wrote: > > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> > --- > arch/arm64/kvm/hyp/Makefile | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile > index ea710f674cb6..8289ea086e5e 100644 > --- a/arch/arm64/kvm/hyp/Makefile > +++ b/arch/arm64/kvm/hyp/Makefile > @@ -28,3 +28,6 @@ GCOV_PROFILE := n > KASAN_SANITIZE := n > UBSAN_SANITIZE := n > KCOV_INSTRUMENT := n > + > +ORIG_CFLAGS := $(KBUILD_CFLAGS) > +KBUILD_CFLAGS = $(subst $(CC_FLAGS_SCS),,$(ORIG_CFLAGS)) $(subst ... ) is not the correct use here. It works like sed, s/$(CC_CFLAGS_SCS)// instead of matching by word. KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS)) is more correct, and simpler.
On Fri, 25 Oct 2019 10:29:47 +0900 Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > On Fri, Oct 25, 2019 at 7:52 AM <samitolvanen@google.com> wrote: > > > > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> > > --- > > arch/arm64/kvm/hyp/Makefile | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile > > index ea710f674cb6..8289ea086e5e 100644 > > --- a/arch/arm64/kvm/hyp/Makefile > > +++ b/arch/arm64/kvm/hyp/Makefile > > @@ -28,3 +28,6 @@ GCOV_PROFILE := n > > KASAN_SANITIZE := n > > UBSAN_SANITIZE := n > > KCOV_INSTRUMENT := n > > + > > +ORIG_CFLAGS := $(KBUILD_CFLAGS) > > +KBUILD_CFLAGS = $(subst $(CC_FLAGS_SCS),,$(ORIG_CFLAGS)) > > > $(subst ... ) is not the correct use here. > > It works like sed, s/$(CC_CFLAGS_SCS)// > instead of matching by word. > > > > > KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS)) > > is more correct, and simpler. I guess that would work too. Not sure why I never used it. I see mips used it for their -pg flags. -- Steve
On Thu, Oct 24, 2019 at 6:31 PM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > $(subst ... ) is not the correct use here. > > It works like sed, s/$(CC_CFLAGS_SCS)// > instead of matching by word. > > > > > KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS)) > > is more correct, and simpler. Thanks, I will change this in v3. Sami
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index ea710f674cb6..8289ea086e5e 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -28,3 +28,6 @@ GCOV_PROFILE := n KASAN_SANITIZE := n UBSAN_SANITIZE := n KCOV_INSTRUMENT := n + +ORIG_CFLAGS := $(KBUILD_CFLAGS) +KBUILD_CFLAGS = $(subst $(CC_FLAGS_SCS),,$(ORIG_CFLAGS))
Signed-off-by: Sami Tolvanen <samitolvanen@google.com> --- arch/arm64/kvm/hyp/Makefile | 3 +++ 1 file changed, 3 insertions(+)