diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /arch/s390/Makefile | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
Merge branch 'devel-stable' into devel
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 |