diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/s390/Makefile | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/s390/Makefile')
-rw-r--r-- | arch/s390/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile index fc8fb20e7fc0..0da10746e0e5 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile | |||
@@ -14,6 +14,7 @@ | |||
14 | # | 14 | # |
15 | 15 | ||
16 | ifndef CONFIG_64BIT | 16 | ifndef CONFIG_64BIT |
17 | LD_BFD := elf32-s390 | ||
17 | LDFLAGS := -m elf_s390 | 18 | LDFLAGS := -m elf_s390 |
18 | KBUILD_CFLAGS += -m31 | 19 | KBUILD_CFLAGS += -m31 |
19 | KBUILD_AFLAGS += -m31 | 20 | KBUILD_AFLAGS += -m31 |
@@ -21,6 +22,7 @@ UTS_MACHINE := s390 | |||
21 | STACK_SIZE := 8192 | 22 | STACK_SIZE := 8192 |
22 | CHECKFLAGS += -D__s390__ -msize-long | 23 | CHECKFLAGS += -D__s390__ -msize-long |
23 | else | 24 | else |
25 | LD_BFD := elf64-s390 | ||
24 | LDFLAGS := -m elf64_s390 | 26 | LDFLAGS := -m elf64_s390 |
25 | MODFLAGS += -fpic -D__PIC__ | 27 | MODFLAGS += -fpic -D__PIC__ |
26 | KBUILD_CFLAGS += -m64 | 28 | KBUILD_CFLAGS += -m64 |
@@ -30,6 +32,8 @@ STACK_SIZE := 16384 | |||
30 | CHECKFLAGS += -D__s390__ -D__s390x__ | 32 | CHECKFLAGS += -D__s390__ -D__s390x__ |
31 | endif | 33 | endif |
32 | 34 | ||
35 | export LD_BFD | ||
36 | |||
33 | cflags-$(CONFIG_MARCH_G5) += $(call cc-option,-march=g5) | 37 | cflags-$(CONFIG_MARCH_G5) += $(call cc-option,-march=g5) |
34 | cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900) | 38 | cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900) |
35 | cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990) | 39 | cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990) |
@@ -85,7 +89,9 @@ KBUILD_AFLAGS += $(aflags-y) | |||
85 | OBJCOPYFLAGS := -O binary | 89 | OBJCOPYFLAGS := -O binary |
86 | LDFLAGS_vmlinux := -e start | 90 | LDFLAGS_vmlinux := -e start |
87 | 91 | ||
88 | head-y := arch/s390/kernel/head.o arch/s390/kernel/init_task.o | 92 | head-y := arch/s390/kernel/head.o |
93 | head-y += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o) | ||
94 | head-y += arch/s390/kernel/init_task.o | ||
89 | 95 | ||
90 | core-y += arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \ | 96 | core-y += arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \ |
91 | arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/ | 97 | arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/ |
@@ -99,12 +105,12 @@ drivers-$(CONFIG_OPROFILE) += arch/s390/oprofile/ | |||
99 | 105 | ||
100 | boot := arch/s390/boot | 106 | boot := arch/s390/boot |
101 | 107 | ||
102 | all: image | 108 | all: image bzImage |
103 | 109 | ||
104 | install: vmlinux | 110 | install: vmlinux |
105 | $(Q)$(MAKE) $(build)=$(boot) $@ | 111 | $(Q)$(MAKE) $(build)=$(boot) $@ |
106 | 112 | ||
107 | image: vmlinux | 113 | image bzImage: vmlinux |
108 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ | 114 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ |
109 | 115 | ||
110 | zfcpdump: | 116 | zfcpdump: |
@@ -116,4 +122,5 @@ archclean: | |||
116 | # Don't use tabs in echo arguments | 122 | # Don't use tabs in echo arguments |
117 | define archhelp | 123 | define archhelp |
118 | echo '* image - Kernel image for IPL ($(boot)/image)' | 124 | echo '* image - Kernel image for IPL ($(boot)/image)' |
125 | echo '* bzImage - Compressed kernel image for IPL ($(boot)/bzImage)' | ||
119 | endef | 126 | endef |