mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
kbuild: rename ld-option to cc-ldoption
ld-option is misnamed as it test options to gcc, not to ld. Renamed it to reflect this. Cc: Andi Kleen <andi@firstfloor.org> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
parent
4779105e03
commit
f86fd30660
|
@ -435,14 +435,14 @@ more details, with real examples.
|
||||||
The second argument is optional, and if supplied will be used
|
The second argument is optional, and if supplied will be used
|
||||||
if first argument is not supported.
|
if first argument is not supported.
|
||||||
|
|
||||||
ld-option
|
cc-ldoption
|
||||||
ld-option is used to check if $(CC) when used to link object files
|
cc-ldoption is used to check if $(CC) when used to link object files
|
||||||
supports the given option. An optional second option may be
|
supports the given option. An optional second option may be
|
||||||
specified if first option are not supported.
|
specified if first option are not supported.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
#arch/i386/kernel/Makefile
|
#arch/i386/kernel/Makefile
|
||||||
vsyscall-flags += $(call ld-option, -Wl$(comma)--hash-style=sysv)
|
vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
|
||||||
|
|
||||||
In the above example, vsyscall-flags will be assigned the option
|
In the above example, vsyscall-flags will be assigned the option
|
||||||
-Wl$(comma)--hash-style=sysv if it is supported by $(CC).
|
-Wl$(comma)--hash-style=sysv if it is supported by $(CC).
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -635,7 +635,7 @@ endif
|
||||||
|
|
||||||
# Use --build-id when available.
|
# Use --build-id when available.
|
||||||
LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
|
LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
|
||||||
$(call ld-option, -Wl$(comma)--build-id,))
|
$(call cc-ldoption, -Wl$(comma)--build-id,))
|
||||||
LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
|
LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
|
||||||
LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
|
LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ quiet_cmd_gate = GATE $@
|
||||||
cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
|
cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
|
||||||
|
|
||||||
GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
|
GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
|
||||||
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
|
||||||
$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
|
$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
|
||||||
$(call if_changed,gate)
|
$(call if_changed,gate)
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ GCOV_PROFILE := n
|
||||||
|
|
||||||
EXTRA_CFLAGS := -shared -fno-common -fno-builtin
|
EXTRA_CFLAGS := -shared -fno-common -fno-builtin
|
||||||
EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1 \
|
EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1 \
|
||||||
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
|
||||||
EXTRA_AFLAGS := -D__VDSO32__ -s
|
EXTRA_AFLAGS := -D__VDSO32__ -s
|
||||||
|
|
||||||
obj-y += vdso32_wrapper.o
|
obj-y += vdso32_wrapper.o
|
||||||
|
|
|
@ -11,7 +11,7 @@ GCOV_PROFILE := n
|
||||||
|
|
||||||
EXTRA_CFLAGS := -shared -fno-common -fno-builtin
|
EXTRA_CFLAGS := -shared -fno-common -fno-builtin
|
||||||
EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso64.so.1 \
|
EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso64.so.1 \
|
||||||
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
|
||||||
EXTRA_AFLAGS := -D__VDSO64__ -s
|
EXTRA_AFLAGS := -D__VDSO64__ -s
|
||||||
|
|
||||||
obj-y += vdso64_wrapper.o
|
obj-y += vdso64_wrapper.o
|
||||||
|
|
|
@ -13,7 +13,7 @@ KBUILD_AFLAGS_31 += -m31 -s
|
||||||
KBUILD_CFLAGS_31 := $(filter-out -m64,$(KBUILD_CFLAGS))
|
KBUILD_CFLAGS_31 := $(filter-out -m64,$(KBUILD_CFLAGS))
|
||||||
KBUILD_CFLAGS_31 += -m31 -fPIC -shared -fno-common -fno-builtin
|
KBUILD_CFLAGS_31 += -m31 -fPIC -shared -fno-common -fno-builtin
|
||||||
KBUILD_CFLAGS_31 += -nostdlib -Wl,-soname=linux-vdso32.so.1 \
|
KBUILD_CFLAGS_31 += -nostdlib -Wl,-soname=linux-vdso32.so.1 \
|
||||||
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
|
||||||
|
|
||||||
$(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_31)
|
$(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_31)
|
||||||
$(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_31)
|
$(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_31)
|
||||||
|
|
|
@ -13,7 +13,7 @@ KBUILD_AFLAGS_64 += -m64 -s
|
||||||
KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS))
|
KBUILD_CFLAGS_64 := $(filter-out -m64,$(KBUILD_CFLAGS))
|
||||||
KBUILD_CFLAGS_64 += -m64 -fPIC -shared -fno-common -fno-builtin
|
KBUILD_CFLAGS_64 += -m64 -fPIC -shared -fno-common -fno-builtin
|
||||||
KBUILD_CFLAGS_64 += -nostdlib -Wl,-soname=linux-vdso64.so.1 \
|
KBUILD_CFLAGS_64 += -nostdlib -Wl,-soname=linux-vdso64.so.1 \
|
||||||
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
|
||||||
|
|
||||||
$(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64)
|
$(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64)
|
||||||
$(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_64)
|
$(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_64)
|
||||||
|
|
|
@ -15,7 +15,7 @@ quiet_cmd_syscall = SYSCALL $@
|
||||||
export CPPFLAGS_vsyscall.lds += -P -C -Ush
|
export CPPFLAGS_vsyscall.lds += -P -C -Ush
|
||||||
|
|
||||||
vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
|
vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
|
||||||
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
$(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
|
||||||
|
|
||||||
SYSCFLAGS_vsyscall-trapa.so = $(vsyscall-flags)
|
SYSCFLAGS_vsyscall-trapa.so = $(vsyscall-flags)
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
|
||||||
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
|
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
|
||||||
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
|
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
|
||||||
|
|
||||||
VDSO_LDFLAGS = -fPIC -shared $(call ld-option, -Wl$(comma)--hash-style=sysv)
|
VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
|
||||||
GCOV_PROFILE := n
|
GCOV_PROFILE := n
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -130,9 +130,9 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \
|
||||||
# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
|
# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
|
||||||
cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
|
cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
|
||||||
|
|
||||||
# ld-option
|
# cc-ldoption
|
||||||
# Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)
|
# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
|
||||||
ld-option = $(call try-run,\
|
cc-ldoption = $(call try-run,\
|
||||||
$(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP",$(1),$(2))
|
$(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP",$(1),$(2))
|
||||||
|
|
||||||
######
|
######
|
||||||
|
|
Loading…
Reference in a new issue