| Message ID | 1474023024-9105-1-git-send-email-abrodkin@synopsys.com |
|---|---|
| State | Changes Requested |
| Headers | show |
Hello, Thanks for proposing a patch for this! On Fri, 16 Sep 2016 13:50:24 +0300, Alexey Brodkin wrote: > Makefile | 3 --- > linux/linux.mk | 6 +++++- > package/Makefile.in | 2 -- > 3 files changed, 5 insertions(+), 6 deletions(-) We also need to change package/pkg-kernel-module.mk, which is used by packages containing external kernel modules. > diff --git a/linux/linux.mk b/linux/linux.mk > index 6e41a92..82c6d38 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -384,12 +384,16 @@ define LINUX_INSTALL_IMAGES_CMDS > $(call LINUX_INSTALL_DTB,$(BINARIES_DIR)) > endef > > +ifeq ($(BR2_STRIP_strip),y) > +LINUX_MOD_STRIP_FLAGS := INSTALL_MOD_STRIP=1 Replace := by =. Also, since INSTALL_MOD_PATH is part of LINUX_MAKE_FLAGS, I would suggest to do the same for INSTALL_MOD_STRIP, i.e: ifeq ($(BR2_STRIP_strip),y) LINUX_MAKE_FLAGS += INSTALL_MOD_STRIP=1 endif This also automagically solves the pkg-kernel-module.mk case, which uses $(LINUX_MAKE_FLAGS). > diff --git a/package/Makefile.in b/package/Makefile.in > index afd5d3a..1eb5ef7 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -207,12 +207,10 @@ STRIP_STRIP_UNNEEDED := --strip-unneeded > STRIP_STRIP_ALL := --strip-all > TARGET_STRIP = $(TARGET_CROSS)strip > STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note > -KSTRIPCMD = $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) Following this removal, the STRIP_STRIP_UNNEEDED variable is no longer used, so its definition a few lines above can be removed. Thanks! Thomas
diff --git a/Makefile b/Makefile index dfef021..0a44fa7 100644 --- a/Makefile +++ b/Makefile @@ -631,9 +631,6 @@ endif rm -rf $(TARGET_DIR)/usr/share/gtk-doc -rmdir $(TARGET_DIR)/usr/share 2>/dev/null $(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true - if test -d $(TARGET_DIR)/lib/modules; then \ - find $(TARGET_DIR)/lib/modules -type f -name '*.ko' -print0 | \ - xargs -0 -r $(KSTRIPCMD); fi # See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads # besides the one in which crash occurred; or SIGTRAP kills my program when diff --git a/linux/linux.mk b/linux/linux.mk index 6e41a92..82c6d38 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -384,12 +384,16 @@ define LINUX_INSTALL_IMAGES_CMDS $(call LINUX_INSTALL_DTB,$(BINARIES_DIR)) endef +ifeq ($(BR2_STRIP_strip),y) +LINUX_MOD_STRIP_FLAGS := INSTALL_MOD_STRIP=1 +endif + define LINUX_INSTALL_TARGET_CMDS $(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET) # Install modules and remove symbolic links pointing to build # directories, not relevant on the target @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ - $(LINUX_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \ + $(LINUX_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install $(LINUX_MOD_STRIP_FLAGS); \ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \ fi diff --git a/package/Makefile.in b/package/Makefile.in index afd5d3a..1eb5ef7 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -207,12 +207,10 @@ STRIP_STRIP_UNNEEDED := --strip-unneeded STRIP_STRIP_ALL := --strip-all TARGET_STRIP = $(TARGET_CROSS)strip STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note -KSTRIPCMD = $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) endif ifeq ($(BR2_STRIP_none),y) TARGET_STRIP = true STRIPCMD = $(TARGET_STRIP) -KSTRIPCMD = $(TARGET_STRIP) endif INSTALL := $(shell which install || type -p install) FLEX := $(shell which flex || type -p flex)
We used to do a special handling of Linux kernel modules when stripping target binaries because there's some special precious data in modules that we must keep for them to properly operate. This is for example true for stack unwinding data etc. It turned out there're cases when our existing "strip --strip-unneeded" doesn't work well. For example this removes .debug_frame section used by Linux on ARC for stack unwinding, refer to [1] and [2] for more details. Now Linux kernel may strip modules as a part of "modules_install" target if INSTALL_MOD_STRIP=1 is passed in command line. And so we'll do allowing kernel decide how to strip modules in the best way. Still note as of today Linux kernel strips modules uniformly for all arches with "strip" command, so this commit alone doesn't solve mentioned problem but it opens a possibility to add later a patch to the kernel which will strip modules for ARC differently - and that's our plan for mainline kernel. [1] https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/issues/86 [2] http://lists.busybox.net/pipermail/buildroot/2016-September/172161.html Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Peter Korsgaard <peter@korsgaard.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Daniel Mentz <danielmentz@google.com> --- Makefile | 3 --- linux/linux.mk | 6 +++++- package/Makefile.in | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-)