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

Commit 665d92e3 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek
Browse files

kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion 



The macros cc-version, cc-fullversion and ld-version take no argument.
It is not necessary to add $(call ...) to invoke them.

Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Helge Deller <deller@gmx.de> [parisc]
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent dd33c03b

Documentation/kbuild/makefiles.txt

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ more details, with real examples. 
	Example:

		#arch/x86/Makefile

		cflags-y += $(shell \

		if [ $(call cc-version) -ge 0300 ] ; then \

		if [ $(cc-version) -ge 0300 ] ; then \

			echo "-mregparm=3"; fi ;)



	In the above example, -mregparm=3 is only used for gcc version greater
@@ -552,7 +552,7 @@ more details, with real examples. 


	Example:

		#arch/powerpc/Makefile

		$(Q)if test "$(call cc-fullversion)" = "040200" ; then \

		$(Q)if test "$(cc-fullversion)" = "040200" ; then \

			echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \

			false ; \

		fi

arch/parisc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ endef 
# we require gcc 3.3 or above to compile the kernel

archprepare: checkbin

checkbin:

	@if test "$(call cc-version)" -lt "0303"; then \

	@if test "$(cc-version)" -lt "0303"; then \

		echo -n "Sorry, GCC v3.3 or above is required to build " ; \

		echo "the kernel." ; \

		false ; \

arch/powerpc/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ TOUT := .tmp_gas_check 
# - Require gcc 4.0 or above on 64-bit

# - gcc-4.2.0 has issues compiling modules on 64-bit

checkbin:

	@if test "$(call cc-version)" = "0304" ; then \

	@if test "$(cc-version)" = "0304" ; then \

		if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \

			echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \

			echo 'correctly with gcc-3.4 and your version of binutils.'; \
@@ -322,13 +322,13 @@ checkbin: 
			false; \

		fi ; \

	fi

	@if test "$(call cc-version)" -lt "0400" \

	@if test "$(cc-version)" -lt "0400" \

	    && test "x${CONFIG_PPC64}" = "xy" ; then \

                echo -n "Sorry, GCC v4.0 or above is required to build " ; \

                echo "the 64-bit powerpc kernel." ; \

                false ; \

        fi

	@if test "$(call cc-fullversion)" = "040200" \

	@if test "$(cc-fullversion)" = "040200" \

	    && test "x${CONFIG_MODULES}${CONFIG_PPC64}" = "xyy" ; then \

		echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \

		echo 'kernel with modules enabled.' ; \

arch/x86/Makefile.um

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ cflags-y += -ffreestanding 
# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use

# a lot more stack due to the lack of sharing of stacklots.  Also, gcc

# 4.3.0 needs -funit-at-a-time for extern inline functions.

KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \

KBUILD_CFLAGS += $(shell if [ $(cc-version) -lt 0400 ] ; then \

			echo $(call cc-option,-fno-unit-at-a-time); \

			else echo $(call cc-option,-funit-at-a-time); fi ;)

kernel/gcov/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ else 
# is not available. We can probably move if-lt to Kbuild.include, so it's also

# not defined during clean or to include Kbuild.include in

# scripts/Makefile.clean. But the following workaround seems least invasive.

  cc-ver := $(if $(call cc-version),$(call cc-version),0)

  cc-ver := $(if $(cc-version),$(cc-version),0)

endif



obj-$(CONFIG_GCOV_KERNEL) := base.o fs.o