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

Commit 51b563fc authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0 



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: default avatarSam Ravnborg <sam@ravnborg.org>
parent 4356f489

Makefile

+0 −5
Original line number Diff line number Diff line
@@ -1027,11 +1027,6 @@ prepare0: archprepare FORCE 
# All the preparing..

prepare: prepare0



# Leave this as default for preprocessing vmlinux.lds.S, which is now

# done in arch/$(ARCH)/kernel/Makefile



export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)



# The asm symlink changes when $(ARCH) changes.

# Detect this and ask user to run make mrproper

# If asm is a stale symlink (point to dir that does not exist) remove it

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LDFLAGS_vmlinux :=-p --no-undefined -X 
ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux	+= --be8

endif

CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)



OBJCOPYFLAGS	:=-O binary -R .note -R .note.gnu.build-id -R .comment -S

GZFLAGS		:=-9

#KBUILD_CFLAGS	+=-pipe

arch/arm/kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Makefile for the linux kernel.

#



CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)

AFLAGS_head.o        := -DTEXT_OFFSET=$(TEXT_OFFSET)



ifdef CONFIG_DYNAMIC_FTRACE

arch/cris/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ LD = $(CROSS_COMPILE)ld -mcrislinux 


OBJCOPYFLAGS := -O binary -R .note -R .comment -S



CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)



KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)

KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)

KBUILD_CPPFLAGS += $(inc)

arch/cris/kernel/Makefile

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

#



CPPFLAGS_vmlinux.lds := -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)

extra-y	:= vmlinux.lds



obj-y   := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o