Commit c330b50d authored by Naveen N Rao's avatar Naveen N Rao Committed by Michael Ellerman
Browse files

powerpc/Makefile: Remove bits related to the previous use of -mcmodel=large 



All supported compilers today (gcc v5.1+ and clang v11+) have support for
-mcmodel=medium. As such, NO_MINIMAL_TOC is no longer being set. Remove
NO_MINIMAL_TOC as well as the fallback to -mminimal-toc.

Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarNaveen N Rao <naveen@kernel.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240110141237.3179199-1-naveen@kernel.org
parent 2d8ebee0

arch/powerpc/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ LDFLAGS_vmlinux := $(LDFLAGS_vmlinux-y) 


ifdef CONFIG_PPC64

ifndef CONFIG_PPC_KERNEL_PCREL

ifeq ($(call cc-option-yn,-mcmodel=medium),y)

	# -mcmodel=medium breaks modules because it uses 32bit offsets from

	# the TOC pointer to create pointers where possible. Pointers into the

	# percpu data area are created by this method.
@@ -124,9 +123,6 @@ ifeq ($(call cc-option-yn,-mcmodel=medium),y) 
	# kernel percpu data space (starting with 0xc...). We need a full

	# 64bit relocation for this to work, hence -mcmodel=large.

	KBUILD_CFLAGS_MODULE += -mcmodel=large

else

	export NO_MINIMAL_TOC := -mno-minimal-toc

endif

endif

endif
@@ -139,7 +135,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1) 
CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcall-aixdesc)

endif

endif

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,$(call cc-option,-mminimal-toc))

CFLAGS-$(CONFIG_PPC64)	+= -mcmodel=medium

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mno-pointers-to-nested-functions)

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mlong-double-128)

arch/powerpc/kernel/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
# Makefile for the linux kernel.

#



ifdef CONFIG_PPC64

CFLAGS_prom_init.o	+= $(NO_MINIMAL_TOC)

endif

ifdef CONFIG_PPC32

CFLAGS_prom_init.o      += -fPIC

CFLAGS_btext.o		+= -fPIC

arch/powerpc/lib/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
# Makefile for ppc-specific library files..

#



ccflags-$(CONFIG_PPC64)	:= $(NO_MINIMAL_TOC)



CFLAGS_code-patching.o += -fno-stack-protector

CFLAGS_feature-fixups.o += -fno-stack-protector

arch/powerpc/mm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
# Makefile for the linux ppc-specific parts of the memory manager.

#



ccflags-$(CONFIG_PPC64)	:= $(NO_MINIMAL_TOC)



obj-y				:= fault.o mem.o pgtable.o maccess.o pageattr.o \

				   init_$(BITS).o pgtable_$(BITS).o \

				   pgtable-frag.o ioremap.o ioremap_$(BITS).o \

arch/powerpc/mm/book3s64/Makefile

+0 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



ccflags-y	:= $(NO_MINIMAL_TOC)



obj-y				+= mmu_context.o pgtable.o trace.o

ifdef CONFIG_PPC_64S_HASH_MMU

CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE)