Commit 7156d71a authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-isdn.bkbits.net/linux-2.5.make

into home.transmeta.com:/home/torvalds/v2.5/linux
parents b7ac98b1 26976a3d
...@@ -297,7 +297,9 @@ define rule_link_vmlinux ...@@ -297,7 +297,9 @@ define rule_link_vmlinux
$(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map $(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
endef endef
vmlinux: $(vmlinux-objs) FORCE LDFLAGS_vmlinux += -T arch/$(ARCH)/vmlinux.lds.s
vmlinux: $(vmlinux-objs) arch/$(ARCH)/vmlinux.lds.s FORCE
$(call if_changed_rule,link_vmlinux) $(call if_changed_rule,link_vmlinux)
# The actual objects are generated when descending, # The actual objects are generated when descending,
...@@ -323,7 +325,7 @@ prepare: include/linux/version.h include/asm include/config/MARKER ...@@ -323,7 +325,7 @@ prepare: include/linux/version.h include/asm include/config/MARKER
AFLAGS_vmlinux.lds.o += -P -C -U$(ARCH) AFLAGS_vmlinux.lds.o += -P -C -U$(ARCH)
arch/$(ARCH)/vmlinux.lds.s: arch/$(ARCH)/vmlinux.lds.S FORCE arch/$(ARCH)/vmlinux.lds.s: arch/$(ARCH)/vmlinux.lds.S scripts FORCE
$(call if_changed_dep,as_s_S) $(call if_changed_dep,as_s_S)
targets += arch/$(ARCH)/vmlinux.lds.s targets += arch/$(ARCH)/vmlinux.lds.s
...@@ -788,6 +790,7 @@ endif # ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) ...@@ -788,6 +790,7 @@ endif # ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
# FIXME Should go into a make.lib or something # FIXME Should go into a make.lib or something
# =========================================================================== # ===========================================================================
echo_target = $(RELDIR)/$@
a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(NOSTDINC_FLAGS) \ a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(NOSTDINC_FLAGS) \
$(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o) $(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
NM := $(NM) -B NM := $(NM) -B
LDFLAGS_vmlinux = -static -T arch/alpha/vmlinux.lds.s -N #-relax LDFLAGS_vmlinux = -static -N #-relax
CFLAGS := $(CFLAGS) -pipe -mno-fp-regs -ffixed-8 CFLAGS := $(CFLAGS) -pipe -mno-fp-regs -ffixed-8
# Determine if we can use the BWX instructions with GAS. # Determine if we can use the BWX instructions with GAS.
...@@ -126,8 +126,6 @@ archclean: ...@@ -126,8 +126,6 @@ archclean:
archmrproper: archmrproper:
rm -f include/asm-alpha/asm_offsets.h rm -f include/asm-alpha/asm_offsets.h
vmlinux: arch/alpha/vmlinux.lds.s
bootpfile: bootpfile:
@$(MAKEBOOT) bootpfile @$(MAKEBOOT) bootpfile
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# Copyright (C) 1995-2001 by Russell King # Copyright (C) 1995-2001 by Russell King
LDFLAGS_vmlinux :=-p -X -T arch/arm/vmlinux.lds LDFLAGS_vmlinux :=-p -X
OBJCOPYFLAGS :=-O binary -R .note -R .comment -S OBJCOPYFLAGS :=-O binary -R .note -R .comment -S
GZFLAGS :=-9 GZFLAGS :=-9
#CFLAGS +=-pipe #CFLAGS +=-pipe
...@@ -57,21 +57,11 @@ AFLAGS +=$(apcs-y) $(arch-y) -mno-fpu -msoft-float ...@@ -57,21 +57,11 @@ AFLAGS +=$(apcs-y) $(arch-y) -mno-fpu -msoft-float
ifeq ($(CONFIG_CPU_26),y) ifeq ($(CONFIG_CPU_26),y)
PROCESSOR := armo PROCESSOR := armo
HEAD := arch/arm/mach-arc/head.o arch/arm/kernel/init_task.o HEAD := arch/arm/mach-arc/head.o arch/arm/kernel/init_task.o
ifeq ($(CONFIG_ROM_KERNEL),y)
DATAADDR = 0x02080000
TEXTADDR = 0x03800000
LDSCRIPT = arch/arm/vmlinux-armo-rom.lds.in
else
TEXTADDR = 0x02080000
LDSCRIPT = arch/arm/vmlinux-armo.lds.in
endif
endif endif
ifeq ($(CONFIG_CPU_32),y) ifeq ($(CONFIG_CPU_32),y)
PROCESSOR = armv PROCESSOR = armv
HEAD := arch/arm/kernel/head.o arch/arm/kernel/init_task.o HEAD := arch/arm/kernel/head.o arch/arm/kernel/init_task.o
TEXTADDR = 0xC0008000
LDSCRIPT = arch/arm/vmlinux-armv.lds.in
endif endif
ifeq ($(CONFIG_ARCH_ARCA5K),y) ifeq ($(CONFIG_ARCH_ARCA5K),y)
...@@ -225,21 +215,9 @@ maketools: include/asm-arm/.arch include/asm-arm/.proc \ ...@@ -225,21 +215,9 @@ maketools: include/asm-arm/.arch include/asm-arm/.proc \
include/asm-arm/constants.h include/linux/version.h FORCE include/asm-arm/constants.h include/linux/version.h FORCE
@$(MAKETOOLS) @$(MAKETOOLS)
vmlinux: arch/arm/vmlinux.lds
arch/arm/vmlinux.lds: arch/arm/Makefile $(LDSCRIPT) \
$(wildcard include/config/cpu/32.h) \
$(wildcard include/config/cpu/26.h) \
$(wildcard include/config/arch/*.h)
@echo ' Generating $@'
@sed 's/TEXTADDR/$(TEXTADDR)/;s/DATAADDR/$(DATAADDR)/' $(LDSCRIPT) >$@
bzImage zImage zinstall Image bootpImage install: vmlinux bzImage zImage zinstall Image bootpImage install: vmlinux
@$(MAKEBOOT) $@ @$(MAKEBOOT) $@
CLEAN_FILES += \
arch/arm/vmlinux.lds
MRPROPER_FILES += \ MRPROPER_FILES += \
include/asm-arm/arch include/asm-arm/.arch \ include/asm-arm/arch include/asm-arm/.arch \
include/asm-arm/proc include/asm-arm/.proc \ include/asm-arm/proc include/asm-arm/.proc \
......
#include <linux/config.h>
#ifdef CONFIG_CPU_26
#ifdef CONFIG_ROM_KERNEL
#define DATAADDR 0x02080000
#define TEXTADDR 0x03800000
#include "vmlinux-armo-rom.lds.in"
#else
#define TEXTADDR 0x02080000
#include "vmlinux-armo.lds.in"
#endif
#endif
#ifdef CONFIG_CPU_32
#define TEXTADDR 0xC0008000
#include "vmlinux-armv.lds.in"
#endif
...@@ -10,28 +10,10 @@ ...@@ -10,28 +10,10 @@
# License. See the file "COPYING" in the main directory of this archive # License. See the file "COPYING" in the main directory of this archive
# for more details. # for more details.
LD_SCRIPT=$(TOPDIR)/arch/cris/cris.ld
# A bug in ld prevents us from having a (constant-value) symbol in a # A bug in ld prevents us from having a (constant-value) symbol in a
# "ORIGIN =" or "LENGTH =" expression. We fix that by generating a # "ORIGIN =" or "LENGTH =" expression.
# linker file with the symbolic part of those expressions evaluated.
# Unfortunately, there is trouble making vmlinux depend on anything we LD = $(CROSS_COMPILE)ld -mcrislinux
# generate here, so we *always* regenerate the final linker script and
# replace the LD macro to get what we want. Thankfully(?) vmlinux is
# always rebuilt (due to calling make recursively and not knowing if
# anything was rebuilt).
# The shell script to build in some kind of dependency is really not
# necessary for reasons of speed. It's there because always
# regenerating stuff (even for incremental linking of subsystems!) is
# even more nauseating.
LD = if [ ! -e $(LD_SCRIPT).tmp -o $(LD_SCRIPT) -nt $(LD_SCRIPT).tmp ]; then \
sed -e s/@CONFIG_ETRAX_DRAM_VIRTUAL_BASE@/0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)/ \
-e s/@CONFIG_ETRAX_DRAM_SIZE_M@/$(CONFIG_ETRAX_DRAM_SIZE)/ \
< $(LD_SCRIPT) > $(LD_SCRIPT).tmp; \
else true; \
fi && $(CROSS_COMPILE)ld -mcrislinux
LDFLAGS_vmlinux = -T $(LD_SCRIPT).tmp
# objcopy is used to make binary images from the resulting linked file # objcopy is used to make binary images from the resulting linked file
......
...@@ -8,10 +8,12 @@ ...@@ -8,10 +8,12 @@
* the kernel has booted. * the kernel has booted.
*/ */
#include <linux/config.h>
jiffies = jiffies_64; jiffies = jiffies_64;
SECTIONS SECTIONS
{ {
. = @CONFIG_ETRAX_DRAM_VIRTUAL_BASE@; . = 0x ## CONFIG_ETRAX_DRAM_VIRTUAL_BASE;
dram_start = .; dram_start = .;
ibr_start = .; ibr_start = .;
. = . + 0x4000; /* see head.S and pages reserved at the start */ . = . + 0x4000; /* see head.S and pages reserved at the start */
...@@ -99,5 +101,5 @@ SECTIONS ...@@ -99,5 +101,5 @@ SECTIONS
*(.exitcall.exit) *(.exitcall.exit)
} }
dram_end = dram_start + @CONFIG_ETRAX_DRAM_SIZE_M@*1024*1024; dram_end = dram_start + CONFIG_ETRAX_DRAM_SIZE*1024*1024;
} }
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
LDFLAGS := -m elf_i386 LDFLAGS := -m elf_i386
OBJCOPYFLAGS := -O binary -R .note -R .comment -S OBJCOPYFLAGS := -O binary -R .note -R .comment -S
LDFLAGS_vmlinux := -T arch/i386/vmlinux.lds.s -e stext LDFLAGS_vmlinux := -e stext
CFLAGS += -pipe CFLAGS += -pipe
...@@ -104,8 +104,6 @@ endif ...@@ -104,8 +104,6 @@ endif
MAKEBOOT = +$(MAKE) -C arch/$(ARCH)/boot MAKEBOOT = +$(MAKE) -C arch/$(ARCH)/boot
vmlinux: arch/i386/vmlinux.lds.s
.PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \ .PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \
clean archclean archmrproper clean archclean archmrproper
......
...@@ -14,7 +14,7 @@ AWK := awk ...@@ -14,7 +14,7 @@ AWK := awk
export AWK export AWK
OBJCOPYFLAGS := --strip-all OBJCOPYFLAGS := --strip-all
LDFLAGS_vmlinux := -static -T arch/$(ARCH)/vmlinux.lds.s LDFLAGS_vmlinux := -static
AFLAGS_KERNEL := -mconstant-gp AFLAGS_KERNEL := -mconstant-gp
EXTRA = EXTRA =
...@@ -94,8 +94,6 @@ LIBS := $(TOPDIR)/arch/$(ARCH)/lib/lib.a $(LIBS) \ ...@@ -94,8 +94,6 @@ LIBS := $(TOPDIR)/arch/$(ARCH)/lib/lib.a $(LIBS) \
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
vmlinux: arch/$(ARCH)/vmlinux.lds.s
compressed: vmlinux compressed: vmlinux
$(OBJCOPY) $(OBJCOPYFLAGS) vmlinux vmlinux-tmp $(OBJCOPY) $(OBJCOPYFLAGS) vmlinux vmlinux-tmp
gzip vmlinux-tmp gzip vmlinux-tmp
......
...@@ -24,10 +24,8 @@ ifneq ($(COMPILE_ARCH),$(ARCH)) ...@@ -24,10 +24,8 @@ ifneq ($(COMPILE_ARCH),$(ARCH))
CROSS_COMPILE = m68k-linux- CROSS_COMPILE = m68k-linux-
endif endif
ifndef CONFIG_SUN3 ifdef CONFIG_SUN3
LDFLAGS_vmlinux = -T $(TOPDIR)/arch/m68k/vmlinux.lds LDFLAGS_vmlinux = -N
else
LDFLAGS_vmlinux = -T $(TOPDIR)/arch/m68k/vmlinux-sun3.lds -N
endif endif
# without -fno-strength-reduce the 53c7xx.c driver fails ;-( # without -fno-strength-reduce the 53c7xx.c driver fails ;-(
......
#include <linux/config.h>
#ifdef CONFIG_SUN3
#include "vmlinux-sun3.lds"
#else
#include "vmlinux-std.lds"
#endif
\ No newline at end of file
...@@ -266,11 +266,8 @@ endif ...@@ -266,11 +266,8 @@ endif
# error messages during linking. Select a default linkscript if # error messages during linking. Select a default linkscript if
# none has been choosen above. # none has been choosen above.
# #
vmlinux: arch/$(ARCH)/ld.script
arch/$(ARCH)/ld.script: arch/$(ARCH)/ld.script.in arch/$(ARCH)/Makefile AFLAGS_vmlinux.lds.o := -DLOADADDR=$(LOADADDR)
sed -e 's/@@LOADADDR@@/$(LOADADDR)/' <$< >$@
LDFLAGS_vmlinux += -T arch/$(ARCH)/ld.script
HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
......
...@@ -3,7 +3,7 @@ ENTRY(kernel_entry) ...@@ -3,7 +3,7 @@ ENTRY(kernel_entry)
SECTIONS SECTIONS
{ {
/* Read-only sections, merged into text segment: */ /* Read-only sections, merged into text segment: */
. = @@LOADADDR@@; . = LOADADDR;
.init : { *(.init) } =0 .init : { *(.init) } =0
.text : .text :
{ {
......
...@@ -117,7 +117,6 @@ endif ...@@ -117,7 +117,6 @@ endif
# #
ifdef CONFIG_BOOT_ELF32 ifdef CONFIG_BOOT_ELF32
CFLAGS += -Wa,-32 CFLAGS += -Wa,-32
LDFLAGS_vmlinux += -T arch/mips64/vmlinux.lds.s
endif endif
# #
# The 64-bit ELF tools are pretty broken so at this time we generate 64-bit # The 64-bit ELF tools are pretty broken so at this time we generate 64-bit
...@@ -125,7 +124,6 @@ endif ...@@ -125,7 +124,6 @@ endif
# #
ifdef CONFIG_BOOT_ELF64 ifdef CONFIG_BOOT_ELF64
CFLAGS += -Wa,-32 CFLAGS += -Wa,-32
LDFLAGS_vmlinux += -T arch/mips64/vmlinux.lds.s
#AS += -64 #AS += -64
#LDFLAGS += -m elf64bmip #LDFLAGS += -m elf64bmip
#LDFLAGS_vmlinux += -T arch/mips64/ld.script.elf64 #LDFLAGS_vmlinux += -T arch/mips64/ld.script.elf64
...@@ -147,8 +145,6 @@ else ...@@ -147,8 +145,6 @@ else
64bit-bfd = elf64-bigmips 64bit-bfd = elf64-bigmips
endif endif
vmlinux: arch/mips64/vmlinux.lds.s
AFLAGS_vmlinux.lds.o := -imacros $(srctree)/include/asm-mips64/sn/mapped_kernel.h AFLAGS_vmlinux.lds.o := -imacros $(srctree)/include/asm-mips64/sn/mapped_kernel.h
ifdef CONFIG_MAPPED_KERNEL ifdef CONFIG_MAPPED_KERNEL
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
FINAL_LD=$(CROSS_COMPILE)ld --warn-common --warn-section-align FINAL_LD=$(CROSS_COMPILE)ld --warn-common --warn-section-align
OBJCOPY_FLAGS =-O binary -R .note -R .comment -S OBJCOPY_FLAGS =-O binary -R .note -R .comment -S
LDFLAGS_vmlinux =-T arch/parisc/vmlinux.lds
CFLAGS_PIPE := -pipe CFLAGS_PIPE := -pipe
CFLAGS_NSR := -fno-strength-reduce CFLAGS_NSR := -fno-strength-reduce
......
...@@ -21,7 +21,7 @@ else ...@@ -21,7 +21,7 @@ else
KERNELLOAD =0xc0000000 KERNELLOAD =0xc0000000
endif endif
LDFLAGS_vmlinux = -T arch/ppc/vmlinux.lds -Ttext $(KERNELLOAD) -Bstatic LDFLAGS_vmlinux = -Ttext $(KERNELLOAD) -Bstatic
CPPFLAGS := $(CPPFLAGS) -I$(TOPDIR)/arch/$(ARCH) CPPFLAGS := $(CPPFLAGS) -I$(TOPDIR)/arch/$(ARCH)
AFLAGS := $(AFLAGS) -I$(TOPDIR)/arch/$(ARCH) AFLAGS := $(AFLAGS) -I$(TOPDIR)/arch/$(ARCH)
CFLAGS := $(CFLAGS) -I$(TOPDIR)/arch/$(ARCH) -fsigned-char \ CFLAGS := $(CFLAGS) -I$(TOPDIR)/arch/$(ARCH) -fsigned-char \
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
KERNELLOAD =0xc000000000000000 KERNELLOAD =0xc000000000000000
LDFLAGS := -m elf64ppc LDFLAGS := -m elf64ppc
LDFLAGS_vmlinux = -T arch/ppc64/vmlinux.lds -Bstatic \ LDFLAGS_vmlinux = -Bstatic \
-e $(KERNELLOAD) -Ttext $(KERNELLOAD) -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
CFLAGS := $(CFLAGS) -msoft-float -pipe \ CFLAGS := $(CFLAGS) -msoft-float -pipe \
-Wno-uninitialized -mminimal-toc -mtraceback=full \ -Wno-uninitialized -mminimal-toc -mtraceback=full \
......
...@@ -15,12 +15,7 @@ ...@@ -15,12 +15,7 @@
LDFLAGS := -m elf_s390 LDFLAGS := -m elf_s390
OBJCOPYFLAGS := -O binary OBJCOPYFLAGS := -O binary
ifeq ($(CONFIG_SHARED_KERNEL),y) LDFLAGS_vmlinux := -e start
LINKSCRIPT := arch/s390/vmlinux-shared.lds
else
LINKSCRIPT := arch/s390/vmlinux.lds
endif
LDFLAGS_vmlinux := -T $(LINKSCRIPT) -e start
CFLAGS_PIPE := -pipe CFLAGS_PIPE := -pipe
CFLAGS_NSR := -fno-strength-reduce CFLAGS_NSR := -fno-strength-reduce
...@@ -46,8 +41,6 @@ listing: vmlinux ...@@ -46,8 +41,6 @@ listing: vmlinux
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
vmlinux: $(LINKSCRIPT)
image: vmlinux image: vmlinux
@$(MAKEBOOT) image @$(MAKEBOOT) image
......
#include <linux/config.h>
#ifdef CONFIG_SHARED_KERNEL
#include "vmlinux-shared.lds"
#else
#include "vmlinux.lds"
#endif
\ No newline at end of file
...@@ -15,12 +15,7 @@ ...@@ -15,12 +15,7 @@
LDFLAGS := -m elf64_s390 LDFLAGS := -m elf64_s390
OBJCOPYFLAGS := -O binary OBJCOPYFLAGS := -O binary
ifeq ($(CONFIG_SHARED_KERNEL),y) LDFLAGS_vmlinux := -e start
LINKSCRIPT := arch/s390x/vmlinux-shared.lds
else
LINKSCRIPT := arch/s390x/vmlinux.lds
endif
LDFLAGS_vmlinux := -T $(LINKSCRIPT) -e start
MODFLAGS += -fpic MODFLAGS += -fpic
CFLAGS_PIPE := -pipe CFLAGS_PIPE := -pipe
...@@ -41,8 +36,6 @@ listing: vmlinux ...@@ -41,8 +36,6 @@ listing: vmlinux
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
vmlinux: $(LINKSCRIPT)
image: vmlinux image: vmlinux
@$(MAKEBOOT) image @$(MAKEBOOT) image
......
#include <linux/config.h>
#ifdef CONFIG_SHARED_KERNEL
#include "vmlinux-shared.lds"
#else
#include "vmlinux.lds"
#endif
\ No newline at end of file
...@@ -42,11 +42,9 @@ endif ...@@ -42,11 +42,9 @@ endif
# #
# Choosing incompatible machines durings configuration will result in # Choosing incompatible machines durings configuration will result in
# error messages during linking. Select a default linkscript if # error messages during linking.
# none has been choosen above.
# #
LINKSCRIPT = arch/sh/vmlinux.lds.s LDFLAGS_vmlinux += -e _stext
LDFLAGS_vmlinux += -T $(word 1,$(LINKSCRIPT)) -e _stext
ifdef LOADADDR ifdef LOADADDR
LDFLAGS_vmlinux += -Ttext $(word 1,$(LOADADDR)) LDFLAGS_vmlinux += -Ttext $(word 1,$(LOADADDR))
...@@ -70,8 +68,6 @@ SUBDIRS += arch/sh/stboards ...@@ -70,8 +68,6 @@ SUBDIRS += arch/sh/stboards
CORE_FILES += arch/sh/stboards/stboards.o CORE_FILES += arch/sh/stboards/stboards.o
endif endif
vmlinux: arch/sh/vmlinux.lds.s
AFLAGS_vmlinux.lds.o := -traditional AFLAGS_vmlinux.lds.o := -traditional
zImage: vmlinux zImage: vmlinux
......
...@@ -31,7 +31,6 @@ CFLAGS := $(CFLAGS) -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7 ...@@ -31,7 +31,6 @@ CFLAGS := $(CFLAGS) -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7
endif endif
#LDFLAGS_vmlinux = -N -Ttext 0xf0004000 #LDFLAGS_vmlinux = -N -Ttext 0xf0004000
LDFLAGS_vmlinux = -T arch/sparc/vmlinux.lds
HEAD := arch/sparc/kernel/head.o arch/sparc/kernel/init_task.o HEAD := arch/sparc/kernel/head.o arch/sparc/kernel/init_task.o
......
...@@ -53,8 +53,6 @@ ifeq ($(CONFIG_MCOUNT),y) ...@@ -53,8 +53,6 @@ ifeq ($(CONFIG_MCOUNT),y)
CFLAGS := $(CFLAGS) -pg CFLAGS := $(CFLAGS) -pg
endif endif
LDFLAGS_vmlinux = -T arch/sparc64/vmlinux.lds
HEAD := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o HEAD := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o
SUBDIRS += arch/sparc64/kernel arch/sparc64/lib arch/sparc64/mm \ SUBDIRS += arch/sparc64/kernel arch/sparc64/lib arch/sparc64/mm \
......
...@@ -35,7 +35,7 @@ export IA32_CC IA32_LD IA32_AS IA32_OBJCOPY IA32_CPP ...@@ -35,7 +35,7 @@ export IA32_CC IA32_LD IA32_AS IA32_OBJCOPY IA32_CPP
LD=$(CROSS_COMPILE)ld -m elf_x86_64 LD=$(CROSS_COMPILE)ld -m elf_x86_64
OBJCOPYFLAGS := -O binary -R .note -R .comment -S OBJCOPYFLAGS := -O binary -R .note -R .comment -S
LDFLAGS_vmlinux := -T arch/x86_64/vmlinux.lds -e stext LDFLAGS_vmlinux := -e stext
CFLAGS += -mno-red-zone CFLAGS += -mno-red-zone
CFLAGS += -mcmodel=kernel CFLAGS += -mcmodel=kernel
...@@ -66,8 +66,6 @@ CORE_FILES += $(core-y) ...@@ -66,8 +66,6 @@ CORE_FILES += $(core-y)
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
vmlinux: arch/x86_64/vmlinux.lds
.PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \ .PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \
clean archclean archmrproper clean archclean archmrproper
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment