diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/s390/Makefile | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/s390/Makefile')
| -rw-r--r-- | arch/s390/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/Makefile b/arch/s390/Makefile index 30c5f01f93b0..0c9e6c6d2a64 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile | |||
| @@ -24,7 +24,8 @@ CHECKFLAGS += -D__s390__ -msize-long | |||
| 24 | else | 24 | else |
| 25 | LD_BFD := elf64-s390 | 25 | LD_BFD := elf64-s390 |
| 26 | LDFLAGS := -m elf64_s390 | 26 | LDFLAGS := -m elf64_s390 |
| 27 | MODFLAGS += -fpic -D__PIC__ | 27 | KBUILD_AFLAGS_MODULE += -fpic -D__PIC__ |
| 28 | KBUILD_CFLAGS_MODULE += -fpic -D__PIC__ | ||
| 28 | KBUILD_CFLAGS += -m64 | 29 | KBUILD_CFLAGS += -m64 |
| 29 | KBUILD_AFLAGS += -m64 | 30 | KBUILD_AFLAGS += -m64 |
| 30 | UTS_MACHINE := s390x | 31 | UTS_MACHINE := s390x |