Commit 95698570 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Michal Marek
Browse files

kbuild: refactor final link of sparc32 



sparc32 uses an additional final link to support btfix.
Introduce a new set of exported variables in the top-level Makefile
to make the extra linking step simpler.

sparc32 has hardcoded knowledge of kallsyms support. This fix
include support for EXTRA_KALLSYM_PASS=1.
The ugly part is that it is hardcoded in the arch/sparc/boot
Makefile.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 275eb135

Makefile

+5 −0
Original line number Diff line number Diff line
@@ -723,6 +723,11 @@ libs-y1 := $(patsubst %/, %/lib.a, $(libs-y)) 
libs-y2		:= $(patsubst %/, %/built-in.o, $(libs-y))

libs-y		:= $(libs-y1) $(libs-y2)



# externally visible symbols

export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)

export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y)

export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds



# Build vmlinux

# ---------------------------------------------------------------------------

# vmlinux is built from the objects selected by $(vmlinux-init) and

arch/sparc/Makefile

+0 −11
Original line number Diff line number Diff line
@@ -72,17 +72,6 @@ libs-y += arch/sparc/lib/ 


drivers-$(CONFIG_OPROFILE)	+= arch/sparc/oprofile/



# Export what is needed by arch/sparc/boot/Makefile

export VMLINUX_INIT VMLINUX_MAIN

VMLINUX_INIT := $(head-y) $(init-y)

VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/

VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)

VMLINUX_MAIN += $(drivers-y) $(net-y)



ifdef CONFIG_KALLSYMS

export kallsyms.o := .tmp_kallsyms2.o

endif



boot := arch/sparc/boot



# Default target

arch/sparc/boot/Makefile

+9 −5
Original line number Diff line number Diff line
@@ -39,11 +39,15 @@ define rule_image 
	echo 'cmd_$@ := $(cmd_image)' > $(@D)/.$(@F).cmd

endef



BTOBJS := $(patsubst %/, %/built-in.o, $(VMLINUX_INIT))

BTLIBS := $(patsubst %/, %/built-in.o, $(VMLINUX_MAIN))

LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds $(BTOBJS) \

                  --start-group $(BTLIBS) --end-group \

                  $(kallsyms.o) $(obj)/btfix.o

# Support for kallsyms

kallsyms-$(CONFIG_KALLSYMS) := .tmp_kallsyms2.o

ifdef KALLSYMS_EXTRA_PASS

        kallsyms-$(CONFIG_KALLSYMS) := .tmp_kallsyms3.o

endif



LDFLAGS_image := -T $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT)           \

                  --start-group $(KBUILD_VMLINUX_MAIN) --end-group \

                  $(kallsyms-y) $(obj)/btfix.o



# Link the final image including btfixup'ed symbols.

# This is a replacement for the link done in the top-level Makefile.

CRA Git | Maintained and supported by SUSTech CRA and CCSE