| Message ID | 20190208151011.0807668DD3@newverein.lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: ftrace with regs | expand |
On Fri, Feb 08, 2019 at 04:10:11PM +0100, Torsten Duwe wrote: > In preparation for arm64 supporting ftrace built on other compiler > options, let's have makefiles remove the $(CC_FLAGS_FTRACE) > flags, whatever these may be, rather than assuming '-pg'. > While at it, fix arm32 as well. > > There should be no functional change as a result of this patch. > > Signed-off-by: Torsten Duwe <duwe@suse.de> With the indentation removed from the commit text: Reviewed-by: Mark Rutland <mark.rutland@arm.com> Mark. > > --- > drivers/firmware/efi/libstub/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > --- a/drivers/firmware/efi/libstub/Makefile > +++ b/drivers/firmware/efi/libstub/Makefile > @@ -16,9 +16,9 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__K > > # arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly > # disable the stackleak plugin > -cflags-$(CONFIG_ARM64) := $(subst -pg,,$(KBUILD_CFLAGS)) -fpie \ > - $(DISABLE_STACKLEAK_PLUGIN) > -cflags-$(CONFIG_ARM) := $(subst -pg,,$(KBUILD_CFLAGS)) \ > +cflags-$(CONFIG_ARM64) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ > + -fpie $(DISABLE_STACKLEAK_PLUGIN) > +cflags-$(CONFIG_ARM) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ > -fno-builtin -fpic \ > $(call cc-option,-mno-single-pic-base) >
On Fri, Feb 08, 2019 at 04:10:11PM +0100, Torsten Duwe wrote: > In preparation for arm64 supporting ftrace built on other compiler > options, let's have makefiles remove the $(CC_FLAGS_FTRACE) > flags, whatever these may be, rather than assuming '-pg'. > While at it, fix arm32 as well. > > There should be no functional change as a result of this patch. > > Signed-off-by: Torsten Duwe <duwe@suse.de> Ard, would you be happy if we were to take this via the arm64 tree? Assuming so, can we have your ack? Thanks, Mark. > > --- > drivers/firmware/efi/libstub/Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > --- a/drivers/firmware/efi/libstub/Makefile > +++ b/drivers/firmware/efi/libstub/Makefile > @@ -16,9 +16,9 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__K > > # arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly > # disable the stackleak plugin > -cflags-$(CONFIG_ARM64) := $(subst -pg,,$(KBUILD_CFLAGS)) -fpie \ > - $(DISABLE_STACKLEAK_PLUGIN) > -cflags-$(CONFIG_ARM) := $(subst -pg,,$(KBUILD_CFLAGS)) \ > +cflags-$(CONFIG_ARM64) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ > + -fpie $(DISABLE_STACKLEAK_PLUGIN) > +cflags-$(CONFIG_ARM) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ > -fno-builtin -fpic \ > $(call cc-option,-mno-single-pic-base) >
On Mon, 8 Apr 2019 at 17:23, Mark Rutland <mark.rutland@arm.com> wrote: > > On Fri, Feb 08, 2019 at 04:10:11PM +0100, Torsten Duwe wrote: > > In preparation for arm64 supporting ftrace built on other compiler > > options, let's have makefiles remove the $(CC_FLAGS_FTRACE) > > flags, whatever these may be, rather than assuming '-pg'. > > While at it, fix arm32 as well. > > > > There should be no functional change as a result of this patch. > > > > Signed-off-by: Torsten Duwe <duwe@suse.de> > > Ard, would you be happy if we were to take this via the arm64 tree? > > Assuming so, can we have your ack? > Sure Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
--- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -16,9 +16,9 @@ cflags-$(CONFIG_X86) += -m$(BITS) -D__K # arm64 uses the full KBUILD_CFLAGS so it's necessary to explicitly # disable the stackleak plugin -cflags-$(CONFIG_ARM64) := $(subst -pg,,$(KBUILD_CFLAGS)) -fpie \ - $(DISABLE_STACKLEAK_PLUGIN) -cflags-$(CONFIG_ARM) := $(subst -pg,,$(KBUILD_CFLAGS)) \ +cflags-$(CONFIG_ARM64) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ + -fpie $(DISABLE_STACKLEAK_PLUGIN) +cflags-$(CONFIG_ARM) := $(subst $(CC_FLAGS_FTRACE),,$(KBUILD_CFLAGS)) \ -fno-builtin -fpic \ $(call cc-option,-mno-single-pic-base)
In preparation for arm64 supporting ftrace built on other compiler options, let's have makefiles remove the $(CC_FLAGS_FTRACE) flags, whatever these may be, rather than assuming '-pg'. While at it, fix arm32 as well. There should be no functional change as a result of this patch. Signed-off-by: Torsten Duwe <duwe@suse.de> --- drivers/firmware/efi/libstub/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)