Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f86fd306 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

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: default avatarSam Ravnborg <sam@ravnborg.org>
parent 4779105e

Documentation/kbuild/makefiles.txt

+3 −3
Original line number Diff line number Diff line
@@ -435,14 +435,14 @@ more details, with real examples. 
	The second argument is optional, and if supplied will be used

	if first argument is not supported.



    ld-option

	ld-option is used to check if $(CC) when used to link object files

    cc-ldoption

	cc-ldoption is used to check if $(CC) when used to link object files

	supports the given option.  An optional second option may be

	specified if first option are not supported.



	Example:

		#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

	-Wl$(comma)--hash-style=sysv if it is supported by $(CC).

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ endif 


# Use --build-id when available.

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_vmlinux += $(LDFLAGS_BUILD_ID)

arch/ia64/kernel/Makefile.gate

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ quiet_cmd_gate = GATE $@ 
      cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@



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

	$(call if_changed,gate)

arch/powerpc/kernel/vdso32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ GCOV_PROFILE := n 


EXTRA_CFLAGS := -shared -fno-common -fno-builtin

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



obj-y += vdso32_wrapper.o

arch/powerpc/kernel/vdso64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ GCOV_PROFILE := n 


EXTRA_CFLAGS := -shared -fno-common -fno-builtin

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



obj-y += vdso64_wrapper.o