133 lines
5.1 KiB
Diff
133 lines
5.1 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sat, 19 Aug 2017 21:42:09 +0100
|
|
Subject: sh: Do not use hyphen in exported variable names
|
|
Forwarded: https://marc.info/?l=linux-sh&m=150317827322995&w=2
|
|
|
|
arch/sh/Makefile defines and exports ld-bfd to be used by
|
|
arch/sh/boot/Makefile and arch/sh/boot/compressed/Makefile. Similarly
|
|
arch/sh/boot/Makefile defines and exports suffix-y to be used by
|
|
arch/sh/boot/compressed/Makefile. However some shells, including
|
|
dash, will not pass through environment variables whose name includes
|
|
a hyphen. Usually GNU make does not use a shell to recurse, but if
|
|
e.g. $(srctree) contains '~' it will use a shell here.
|
|
|
|
Rename these variables to ld_bfd and suffix_y.
|
|
|
|
References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=sh4&ver=4.13%7Erc5-1%7Eexp1&stamp=1502943967&raw=0
|
|
Fixes: ef9b542fce00 ("sh: bzip2/lzma uImage support.")
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
arch/sh/Makefile | 10 +++++-----
|
|
arch/sh/boot/Makefile | 16 ++++++++--------
|
|
arch/sh/boot/compressed/Makefile | 6 +++---
|
|
arch/sh/boot/romimage/Makefile | 4 ++--
|
|
4 files changed, 18 insertions(+), 18 deletions(-)
|
|
|
|
Index: linux/arch/sh/Makefile
|
|
===================================================================
|
|
--- linux.orig/arch/sh/Makefile
|
|
+++ linux/arch/sh/Makefile
|
|
@@ -119,16 +119,16 @@ LDFLAGS_vmlinux += --defsym phys_stext=
|
|
endif
|
|
|
|
ifdef CONFIG_CPU_LITTLE_ENDIAN
|
|
-ld-bfd := elf32-$(UTS_MACHINE)-linux
|
|
-LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld-bfd)
|
|
+ld_bfd := elf32-$(UTS_MACHINE)-linux
|
|
+LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld_bfd)
|
|
KBUILD_LDFLAGS += -EL
|
|
else
|
|
-ld-bfd := elf32-$(UTS_MACHINE)big-linux
|
|
-LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld-bfd)
|
|
+ld_bfd := elf32-$(UTS_MACHINE)big-linux
|
|
+LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld_bfd)
|
|
KBUILD_LDFLAGS += -EB
|
|
endif
|
|
|
|
-export ld-bfd BITS
|
|
+export ld_bfd BITS
|
|
|
|
head-y := arch/sh/kernel/head_$(BITS).o
|
|
|
|
Index: linux/arch/sh/boot/Makefile
|
|
===================================================================
|
|
--- linux.orig/arch/sh/boot/Makefile
|
|
+++ linux/arch/sh/boot/Makefile
|
|
@@ -19,12 +19,12 @@ CONFIG_ZERO_PAGE_OFFSET ?= 0x00001000
|
|
CONFIG_ENTRY_OFFSET ?= 0x00001000
|
|
CONFIG_PHYSICAL_START ?= $(CONFIG_MEMORY_START)
|
|
|
|
-suffix-y := bin
|
|
-suffix-$(CONFIG_KERNEL_GZIP) := gz
|
|
-suffix-$(CONFIG_KERNEL_BZIP2) := bz2
|
|
-suffix-$(CONFIG_KERNEL_LZMA) := lzma
|
|
-suffix-$(CONFIG_KERNEL_XZ) := xz
|
|
-suffix-$(CONFIG_KERNEL_LZO) := lzo
|
|
+suffix_y := bin
|
|
+suffix_$(CONFIG_KERNEL_GZIP) := gz
|
|
+suffix_$(CONFIG_KERNEL_BZIP2) := bz2
|
|
+suffix_$(CONFIG_KERNEL_LZMA) := lzma
|
|
+suffix_$(CONFIG_KERNEL_XZ) := xz
|
|
+suffix_$(CONFIG_KERNEL_LZO) := lzo
|
|
|
|
targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz \
|
|
uImage.bz2 uImage.lzma uImage.xz uImage.lzo uImage.bin
|
|
@@ -106,10 +106,10 @@ OBJCOPYFLAGS_uImage.srec := -I binary -O
|
|
$(obj)/uImage.srec: $(obj)/uImage
|
|
$(call if_changed,objcopy)
|
|
|
|
-$(obj)/uImage: $(obj)/uImage.$(suffix-y)
|
|
+$(obj)/uImage: $(obj)/uImage.$(suffix_y)
|
|
@ln -sf $(notdir $<) $@
|
|
@echo ' Image $@ is ready'
|
|
|
|
export CONFIG_PAGE_OFFSET CONFIG_MEMORY_START CONFIG_BOOT_LINK_OFFSET \
|
|
CONFIG_PHYSICAL_START CONFIG_ZERO_PAGE_OFFSET CONFIG_ENTRY_OFFSET \
|
|
- KERNEL_MEMORY suffix-y
|
|
+ KERNEL_MEMORY suffix_y
|
|
Index: linux/arch/sh/boot/compressed/Makefile
|
|
===================================================================
|
|
--- linux.orig/arch/sh/boot/compressed/Makefile
|
|
+++ linux/arch/sh/boot/compressed/Makefile
|
|
@@ -33,7 +33,7 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS)
|
|
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
|
|
endif
|
|
|
|
-LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \
|
|
+LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(IMAGE_OFFSET) -e startup \
|
|
-T $(obj)/../../kernel/vmlinux.lds
|
|
|
|
#
|
|
@@ -75,7 +75,7 @@ $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.al
|
|
|
|
OBJCOPYFLAGS += -R .empty_zero_page
|
|
|
|
-LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
|
|
+LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T
|
|
|
|
-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE
|
|
+$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
|
|
$(call if_changed,ld)
|
|
Index: linux/arch/sh/boot/romimage/Makefile
|
|
===================================================================
|
|
--- linux.orig/arch/sh/boot/romimage/Makefile
|
|
+++ linux/arch/sh/boot/romimage/Makefile
|
|
@@ -13,7 +13,7 @@ mmcif-obj-$(CONFIG_CPU_SUBTYPE_SH7724) :
|
|
load-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-load-y)
|
|
obj-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-obj-y)
|
|
|
|
-LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(load-y) -e romstart \
|
|
+LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(load-y) -e romstart \
|
|
-T $(obj)/../../kernel/vmlinux.lds
|
|
|
|
$(obj)/vmlinux: $(obj)/head.o $(obj-y) $(obj)/piggy.o FORCE
|
|
@@ -24,7 +24,7 @@ OBJCOPYFLAGS += -j .empty_zero_page
|
|
$(obj)/zeropage.bin: vmlinux FORCE
|
|
$(call if_changed,objcopy)
|
|
|
|
-LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
|
|
+LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T
|
|
|
|
$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/zeropage.bin arch/sh/boot/zImage FORCE
|
|
$(call if_changed,ld)
|