mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
![Sam Ravnborg](/assets/img/avatar_default.png)
Albin Tonnerre <albin.tonnerre@free-electrons.com> reported: Bash 4 filters out variables which contain a dot in them. This happends to be the case of CPPFLAGS_vmlinux.lds. This is rather unfortunate, as it now causes build failures when using SHELL=/bin/bash to compile, or when bash happens to be used by make (eg when it's /bin/sh) Remove the common definition of CPPFLAGS_vmlinux.lds by pushing relevant stuff to either Makefile.build or the arch specific kernel/Makefile where we build the linker script. This is also nice cleanup as we move the information out where it is used. Notes for the different architectures touched: arm - we use an already exported symbol cris - we use a config symbol aleady available [Not build tested] mips - the jiffies complexity has moved to vmlinux.lds.S where we need it. Added a few variables to CPPFLAGS - they are only used by the linker script. [Not build tested] powerpc - removed assignment that is not needed [not build tested] sparc - simplified it using $(BITS) um - introduced a few new exported variables to deal with this xtensa - added options to CPP invocation [not build tested] Cc: Albin Tonnerre <albin.tonnerre@free-electrons.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Dike <jdike@addtoit.com> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
98 lines
2.4 KiB
Makefile
98 lines
2.4 KiB
Makefile
#
|
|
# cris/Makefile
|
|
#
|
|
# This file is included by the global makefile so that you can add your own
|
|
# architecture-specific flags and dependencies. Remember to do have actions
|
|
# for "archclean" and "archdep" for cleaning up and making dependencies for
|
|
# this architecture
|
|
#
|
|
# This file is subject to the terms and conditions of the GNU General Public
|
|
# License. See the file "COPYING" in the main directory of this archive
|
|
# for more details.
|
|
|
|
KBUILD_DEFCONFIG := etrax-100lx_v2_defconfig
|
|
|
|
arch-y := v10
|
|
arch-$(CONFIG_ETRAX_ARCH_V10) := v10
|
|
arch-$(CONFIG_ETRAX_ARCH_V32) := v32
|
|
|
|
# No config available for make clean etc
|
|
mach-y := fs
|
|
mach-$(CONFIG_CRIS_MACH_ARTPEC3) := a3
|
|
mach-$(CONFIG_ETRAXFS) := fs
|
|
|
|
ifneq ($(arch-y),)
|
|
SARCH := arch-$(arch-y)
|
|
inc := -Iarch/cris/include/$(SARCH)
|
|
inc += -Iarch/cris/include/$(SARCH)/arch
|
|
else
|
|
SARCH :=
|
|
inc :=
|
|
endif
|
|
|
|
ifneq ($(mach-y),)
|
|
MACH := mach-$(mach-y)
|
|
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/
|
|
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/mach
|
|
else
|
|
MACH :=
|
|
endif
|
|
|
|
LD = $(CROSS_COMPILE)ld -mcrislinux
|
|
|
|
OBJCOPYFLAGS := -O binary -R .note -R .comment -S
|
|
|
|
KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
|
|
KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
|
|
KBUILD_CPPFLAGS += $(inc)
|
|
|
|
ifdef CONFIG_FRAME_POINTER
|
|
KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g
|
|
KBUILD_CFLAGS += -fno-omit-frame-pointer
|
|
endif
|
|
|
|
head-y := arch/cris/$(SARCH)/kernel/head.o
|
|
|
|
LIBGCC = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libgcc.a)
|
|
|
|
core-y += arch/cris/kernel/ arch/cris/mm/
|
|
core-y += arch/cris/$(SARCH)/kernel/ arch/cris/$(SARCH)/mm/
|
|
ifdef CONFIG_ETRAX_ARCH_V32
|
|
core-y += arch/cris/$(SARCH)/$(MACH)/
|
|
endif
|
|
drivers-y += arch/cris/$(SARCH)/drivers/
|
|
libs-y += arch/cris/$(SARCH)/lib/ $(LIBGCC)
|
|
|
|
# cris source path
|
|
SRC_ARCH = $(srctree)/arch/cris
|
|
# cris object files path
|
|
OBJ_ARCH = $(objtree)/arch/cris
|
|
|
|
boot := arch/cris/boot
|
|
MACHINE := arch/cris/$(SARCH)
|
|
|
|
all: zImage
|
|
|
|
zImage Image: vmlinux
|
|
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
|
|
|
|
archprepare:
|
|
|
|
archclean:
|
|
$(Q)if [ -e arch/cris/boot ]; then \
|
|
$(MAKE) $(clean)=arch/cris/boot; \
|
|
fi
|
|
|
|
CLEAN_FILES += \
|
|
$(boot)/zImage \
|
|
$(boot)/compressed/decompress.bin \
|
|
$(boot)/compressed/piggy.gz \
|
|
$(boot)/rescue/rescue.bin
|
|
|
|
|
|
# MRPROPER_FILES +=
|
|
|
|
define archhelp
|
|
echo '* zImage - Compressed kernel image (arch/cris/boot/zImage)'
|
|
echo '* Image - Uncompressed kernel image (arch/cris/boot/Image)'
|
|
endef
|