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

Commit 39a33ff8 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: remove cc-option-align 



Documentation/kbuild/makefiles.txt says the change for align options
occurred at GCC 3.0, and Documentation/process/changes.rst says the
minimal supported GCC version is 3.2, so it should be safe to hard-code
-falign* options.

Fix the only user arch/x86/Makefile_32.cpu and remove cc-option-align.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
parent ae3f4151

Documentation/kbuild/makefiles.txt

+0 −16
Original line number Diff line number Diff line
@@ -486,22 +486,6 @@ more details, with real examples. 
	respectively.

	Note: cc-option-yn uses KBUILD_CFLAGS for $(CC) options



    cc-option-align

	gcc versions >= 3.0 changed the type of options used to specify

	alignment of functions, loops etc. $(cc-option-align), when used

	as prefix to the align options, will select the right prefix:

	gcc < 3.00

		cc-option-align = -malign

	gcc >= 3.00

		cc-option-align = -falign



	Example:

		KBUILD_CFLAGS += $(cc-option-align)-functions=4



	In the above example, the option -falign-functions=4 is used for

	gcc >= 3.00. For gcc < 3.00, -malign-functions=4 is used.

	Note: cc-option-align uses KBUILD_CFLAGS for $(CC) options



    cc-disable-warning

	cc-disable-warning checks if gcc supports a given warning and returns

	the commandline switch to disable it. This special function is needed,

arch/x86/Makefile_32.cpu

+3 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ else 
tune		= $(call cc-option,-mcpu=$(1),$(2))

endif



align := $(cc-option-align)

cflags-$(CONFIG_M486)		+= -march=i486

cflags-$(CONFIG_M586)		+= -march=i586

cflags-$(CONFIG_M586TSC)	+= -march=i586
@@ -24,11 +23,11 @@ cflags-$(CONFIG_MK6) += -march=k6 
# They make zero difference whatsosever to performance at this time.

cflags-$(CONFIG_MK7)		+= -march=athlon

cflags-$(CONFIG_MK8)		+= $(call cc-option,-march=k8,-march=athlon)

cflags-$(CONFIG_MCRUSOE)	+= -march=i686 $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0

cflags-$(CONFIG_MEFFICEON)	+= -march=i686 $(call tune,pentium3) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0

cflags-$(CONFIG_MCRUSOE)	+= -march=i686 -falign-functions=0 -falign-jumps=0 -falign-loops=0

cflags-$(CONFIG_MEFFICEON)	+= -march=i686 $(call tune,pentium3) -falign-functions=0 -falign-jumps=0 -falign-loops=0

cflags-$(CONFIG_MWINCHIPC6)	+= $(call cc-option,-march=winchip-c6,-march=i586)

cflags-$(CONFIG_MWINCHIP3D)	+= $(call cc-option,-march=winchip2,-march=i586)

cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-option,-march=c3,-march=i486) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0

cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-option,-march=c3,-march=i486) -falign-functions=0 -falign-jumps=0 -falign-loops=0

cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)

cflags-$(CONFIG_MVIAC7)		+= -march=i686

cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)

scripts/Kbuild.include

+0 −5
Original line number Diff line number Diff line
@@ -123,11 +123,6 @@ cc-option = $(call try-run,\ 
cc-option-yn = $(call try-run,\

	$(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)



# cc-option-align

# Prefix align with either -falign or -malign

cc-option-align = $(subst -functions=0,,\

	$(call cc-option,-falign-functions=0,-malign-functions=0))



# cc-disable-warning

# Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)

cc-disable-warning = $(call try-run,\