tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc/Makefiles: Change to new flag variables

Replace EXTRA_CFLAGS with ccflags-y and EXTRA_AFLAGS with asflags-y.

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by matt mooney and committed by Benjamin Herrenschmidt 4108d9ba fc15351d

+17 -32
unified split
+3 -3
arch/powerpc/kernel/vdso32/Makefile
··· 14 14 15 15 GCOV_PROFILE := n 16 16 17 - EXTRA_CFLAGS := -shared -fno-common -fno-builtin 18 - EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1 \ 17 + ccflags-y := -shared -fno-common -fno-builtin 18 + ccflags-y += -nostdlib -Wl,-soname=linux-vdso32.so.1 \ 19 19 $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) 20 - EXTRA_AFLAGS := -D__VDSO32__ -s 20 + asflags-y := -D__VDSO32__ -s 21 21 22 22 obj-y += vdso32_wrapper.o 23 23 extra-y += vdso32.lds
+3 -3
arch/powerpc/kernel/vdso64/Makefile
··· 9 9 10 10 GCOV_PROFILE := n 11 11 12 - EXTRA_CFLAGS := -shared -fno-common -fno-builtin 13 - EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso64.so.1 \ 12 + ccflags-y := -shared -fno-common -fno-builtin 13 + ccflags-y += -nostdlib -Wl,-soname=linux-vdso64.so.1 \ 14 14 $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) 15 - EXTRA_AFLAGS := -D__VDSO64__ -s 15 + asflags-y := -D__VDSO64__ -s 16 16 17 17 obj-y += vdso64_wrapper.o 18 18 extra-y += vdso64.lds
+1 -1
arch/powerpc/kvm/Makefile
··· 4 4 5 5 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror 6 6 7 - EXTRA_CFLAGS += -Ivirt/kvm -Iarch/powerpc/kvm 7 + ccflags-y := -Ivirt/kvm -Iarch/powerpc/kvm 8 8 9 9 common-objs-y = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o) 10 10
+1 -3
arch/powerpc/lib/Makefile
··· 4 4 5 5 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror 6 6 7 - ifeq ($(CONFIG_PPC64),y) 8 - EXTRA_CFLAGS += -mno-minimal-toc 9 - endif 7 + ccflags-$(CONFIG_PPC64) := -mno-minimal-toc 10 8 11 9 CFLAGS_REMOVE_code-patching.o = -pg 12 10 CFLAGS_REMOVE_feature-fixups.o = -pg
+1 -1
arch/powerpc/math-emu/Makefile
··· 15 15 CFLAGS_fabs.o = -fno-builtin-fabs 16 16 CFLAGS_math.o = -fno-builtin-fabs 17 17 18 - EXTRA_CFLAGS = -I. -Iinclude/math-emu -w 18 + ccflags-y = -I. -Iinclude/math-emu -w
+1 -3
arch/powerpc/mm/Makefile
··· 4 4 5 5 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror 6 6 7 - ifeq ($(CONFIG_PPC64),y) 8 - EXTRA_CFLAGS += -mno-minimal-toc 9 - endif 7 + ccflags-$(CONFIG_PPC64) := -mno-minimal-toc 10 8 11 9 obj-y := fault.o mem.o pgtable.o gup.o \ 12 10 init_$(CONFIG_WORD_SIZE).o \
+1 -3
arch/powerpc/oprofile/Makefile
··· 1 1 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror 2 2 3 - ifeq ($(CONFIG_PPC64),y) 4 - EXTRA_CFLAGS += -mno-minimal-toc 5 - endif 3 + ccflags-$(CONFIG_PPC64) := -mno-minimal-toc 6 4 7 5 obj-$(CONFIG_OPROFILE) += oprofile.o 8 6
+1 -1
arch/powerpc/platforms/iseries/Makefile
··· 1 - EXTRA_CFLAGS += -mno-minimal-toc 1 + ccflags-y := -mno-minimal-toc 2 2 3 3 obj-y += exception.o 4 4 obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt.o mf.o lpevents.o \
+3 -8
arch/powerpc/platforms/pseries/Makefile
··· 1 - ifeq ($(CONFIG_PPC64),y) 2 - EXTRA_CFLAGS += -mno-minimal-toc 3 - endif 4 - 5 - ifeq ($(CONFIG_PPC_PSERIES_DEBUG),y) 6 - EXTRA_CFLAGS += -DDEBUG 7 - endif 1 + ccflags-$(CONFIG_PPC64) := -mno-minimal-toc 2 + ccflags-$(CONFIG_PPC_PSERIES_DEBUG) += -DDEBUG 8 3 9 4 obj-y := lpar.o hvCall.o nvram.o reconfig.o \ 10 5 setup.o iommu.o event_sources.o ras.o \ ··· 18 23 obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o 19 24 obj-$(CONFIG_HVCS) += hvcserver.o 20 25 obj-$(CONFIG_HCALL_STATS) += hvCall_inst.o 21 - obj-$(CONFIG_PHYP_DUMP) += phyp_dump.o 26 + obj-$(CONFIG_PHYP_DUMP) += phyp_dump.o 22 27 obj-$(CONFIG_CMM) += cmm.o 23 28 obj-$(CONFIG_DTL) += dtl.o 24 29
+1 -3
arch/powerpc/sysdev/Makefile
··· 1 1 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror 2 2 3 - ifeq ($(CONFIG_PPC64),y) 4 - EXTRA_CFLAGS += -mno-minimal-toc 5 - endif 3 + ccflags-$(CONFIG_PPC64) := -mno-minimal-toc 6 4 7 5 mpic-msi-obj-$(CONFIG_PCI_MSI) += mpic_msi.o mpic_u3msi.o mpic_pasemi_msi.o 8 6 obj-$(CONFIG_MPIC) += mpic.o $(mpic-msi-obj-y)
+1 -3
arch/powerpc/xmon/Makefile
··· 4 4 5 5 GCOV_PROFILE := n 6 6 7 - ifdef CONFIG_PPC64 8 - EXTRA_CFLAGS += -mno-minimal-toc 9 - endif 7 + ccflags-$(CONFIG_PPC64) := -mno-minimal-toc 10 8 11 9 obj-y += xmon.o start.o nonstdio.o 12 10