From 37122d06ce0e1f214a48125a19b15aac9cae1206 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Tue, 28 Mar 2023 10:42:43 +0200 Subject: [PATCH] Linux: some version of the GNU ld include "linker stubs" synthetics entry in the map file. It needs to be filtered out. Signed-off-by: Pavel Pisa --- snippets/linux-kernel.omk | 2 +- snippets/linux.omk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/snippets/linux-kernel.omk b/snippets/linux-kernel.omk index 88f7866..b94a09c 100644 --- a/snippets/linux-kernel.omk +++ b/snippets/linux-kernel.omk @@ -237,7 +237,7 @@ $(2)/$(1)$(KERN_LINK_SUFFIX): $$($(1)_OBJS) @$(QUIET_CMD_ECHO) " LD [K] $$@" $(Q) $$(KERN_LD) $$(KERN_LDFLAGS) -r $$($(1)_OBJS) -L$$(kern_GCCLIB_DIR) $$($(1)_LIBS:%=-l%) $$(KERN_LOADLIBES) -Map $(KERN_OBJS_DIR)/$(1).mod.map -o $$@ @echo "$(2)/$(1)$(KERN_LINK_SUFFIX): \\" >$(KERN_OBJS_DIR)/$(1).mod.d - @$(SED4OMK) -n -e 's/^LOAD \(.*\)$$$$/ \1 \\/p' $(KERN_OBJS_DIR)/$(1).mod.map >>$(KERN_OBJS_DIR)/$(1).mod.d + @$(SED4OMK) -n -e 's/^LOAD \(.*\)$$$$/ \1 \\/p' $(KERN_OBJS_DIR)/$(1).mod.map | grep -v '^linker stubs' >>$(KERN_OBJS_DIR)/$(1).mod.d @echo >>$(KERN_OBJS_DIR)/$(1).mod.d @if [ "$(KERN_EXE_SUFFIX)" = ".ko" ] ; then \ echo $(1) >>$(KERN_MODPOST_DIR)/module-changes ; \ diff --git a/snippets/linux.omk b/snippets/linux.omk index d047e39..bf565d7 100644 --- a/snippets/linux.omk +++ b/snippets/linux.omk @@ -232,7 +232,7 @@ $(2)/$(1)$(3): $(TARGET_OBJS) $(Q) $(if $(filter $(CXX_PATTERN),$(TARGET_SOURCES)),$$(CXX),$$(CC)) \ $(TARGET_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(OMK_LDFLAGS) $$(LDFLAGS) $$($(1)_LDFLAGS) -Wl,-rpath-link,$(USER_LIB_DIR) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@ @echo "$(2)/$(1)$(3): \\" >$(USER_OBJS_DIR)/$(1).exe.d - @$(SED4OMK) -n -e 's|^LOAD \(.*\)$$$$| \1 \&|p' $(USER_OBJS_DIR)/$(1).exe.map|tr '&' '\134' >>$(USER_OBJS_DIR)/$(1).exe.d + @$(SED4OMK) -n -e 's|^LOAD \(.*\)$$$$| \1 \&|p' $(USER_OBJS_DIR)/$(1).exe.map|tr '&' '\134' | grep -v '^linker stubs' >>$(USER_OBJS_DIR)/$(1).exe.d @echo >>$(USER_OBJS_DIR)/$(1).exe.d binary-pass-local: $(2)/$(1)$(3) -- 2.39.2