diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 16:40:26 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 16:40:26 (GMT) |
| commit | f8b71a3a92d69cb1c9c2162f9235d3dd550e4aa0 (patch) | |
| tree | d0853186f33314a6e45903876d0e94d1619fcca9 /arch/sparc64/Makefile | |
| parent | 42a77a1b8fe4fd78cf8d8fccbaac918bbe888192 (diff) | |
| parent | e4f25060b87a627f5cda84b8134911d43c919458 (diff) | |
| download | linux-fsl-qoriq-f8b71a3a92d69cb1c9c2162f9235d3dd550e4aa0.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (44 commits)
sparc: Remove Sparc's asm-offsets for sclow.S
sparc64: Update defconfig.
sparc64: Add Niagara2 RNG driver.
sparc64: Add missing hypervisor service group numbers.
sparc64: Remove 4MB and 512K base page size options.
sparc64: Convert to generic helpers for IPI function calls.
sparc: Use new '%pS' infrastructure to print symbols.
sparc32: fix init.c allnoconfig build error
sparc64: Config category "Processor type and features" absent
sparc: arch/sparc/kernel/apc.c to unlocked_ioctl
sparc: join the remaining header files
sparc: merge header files with trivial differences
sparc: when header files are equal use asm-sparc version
sparc: copy sparc64 specific files to asm-sparc
sparc: Merge asm-sparc{,64}/asi.h
sparc: export openprom.h to userspace
sparc: Merge asm-sparc{,64}/types.h
sparc: Merge asm-sparc{,64}/termios.h
sparc: Merge asm-sparc{,64}/termbits.h
sparc: Merge asm-sparc{,64}/setup.h
...
Diffstat (limited to 'arch/sparc64/Makefile')
| -rw-r--r-- | arch/sparc64/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile index 4b8f2b0..b785a39 100644 --- a/arch/sparc64/Makefile +++ b/arch/sparc64/Makefile @@ -9,7 +9,9 @@ CHECKFLAGS += -D__sparc__ -D__sparc_v9__ -m64 -CPPFLAGS_vmlinux.lds += -Usparc +# Undefine sparc when processing vmlinux.lds - it is used +# And teach CPP we are doing 64 bit builds (for this case) +CPPFLAGS_vmlinux.lds += -m64 -Usparc LDFLAGS := -m elf64_sparc |