Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sh-for-v6.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh update from John Paul Adrian Glaubitz:
"A single patch by Ben Hutchings replaces the hyphen in the exported
shell variable ld-bfd with an underscore to avoid issues with certain
shells such as dash which do not pass through environment variables
whose name includes a hyphen"
* tag 'sh-for-v6.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: Do not use hyphen in exported variable name
+9
-9
+5
-5
arch/sh/Makefile
+5
-5
arch/sh/Makefile
···
103
103
LDFLAGS_vmlinux += -e _stext
104
104
105
105
ifdef CONFIG_CPU_LITTLE_ENDIAN
106
-
ld-bfd := elf32-sh-linux
107
-
LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld-bfd)
106
+
ld_bfd := elf32-sh-linux
107
+
LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld_bfd)
108
108
KBUILD_LDFLAGS += -EL
109
109
else
110
-
ld-bfd := elf32-shbig-linux
111
-
LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld-bfd)
110
+
ld_bfd := elf32-shbig-linux
111
+
LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld_bfd)
112
112
KBUILD_LDFLAGS += -EB
113
113
endif
114
114
115
-
export ld-bfd
115
+
export ld_bfd
116
116
117
117
# Mach groups
118
118
machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se
+2
-2
arch/sh/boot/compressed/Makefile
+2
-2
arch/sh/boot/compressed/Makefile
···
27
27
28
28
ccflags-remove-$(CONFIG_MCOUNT) += -pg
29
29
30
-
LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \
30
+
LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(IMAGE_OFFSET) -e startup \
31
31
-T $(obj)/../../kernel/vmlinux.lds
32
32
33
33
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
···
51
51
52
52
OBJCOPYFLAGS += -R .empty_zero_page
53
53
54
-
LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
54
+
LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T
55
55
56
56
$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
57
57
$(call if_changed,ld)
+2
-2
arch/sh/boot/romimage/Makefile
+2
-2
arch/sh/boot/romimage/Makefile
···
13
13
load-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-load-y)
14
14
obj-$(CONFIG_ROMIMAGE_MMCIF) := $(mmcif-obj-y)
15
15
16
-
LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(load-y) -e romstart \
16
+
LDFLAGS_vmlinux := --oformat $(ld_bfd) -Ttext $(load-y) -e romstart \
17
17
-T $(obj)/../../kernel/vmlinux.lds
18
18
19
19
$(obj)/vmlinux: $(obj)/head.o $(obj-y) $(obj)/piggy.o FORCE
···
24
24
$(obj)/zeropage.bin: vmlinux FORCE
25
25
$(call if_changed,objcopy)
26
26
27
-
LDFLAGS_piggy.o := -r --format binary --oformat $(ld-bfd) -T
27
+
LDFLAGS_piggy.o := -r --format binary --oformat $(ld_bfd) -T
28
28
29
29
$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/zeropage.bin arch/sh/boot/zImage FORCE
30
30
$(call if_changed,ld)