diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
| commit | 821f3eff7cdb9d6c7076effabd46c96c322daed1 (patch) | |
| tree | 60f13155196fd6c84424c8aebc133ca4a5f56749 /arch/sparc | |
| parent | ebc283118ee448dcb6e6cae74a8a43f17a1ccc3f (diff) | |
| parent | f77bf01425b11947eeb3b5b54685212c302741b8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
kbuild: introduce ccflags-y, asflags-y and ldflags-y
kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
kbuild: enable use of AFLAGS and CFLAGS on commandline
kbuild: enable 'make AFLAGS=...' to add additional options to AS
kbuild: fix AFLAGS use in h8300 and m68knommu
kbuild: check for wrong use of CFLAGS
kbuild: enable 'make CFLAGS=...' to add additional options to CC
kbuild: fix up CFLAGS usage
kbuild: make modpost detect unterminated device id lists
kbuild: call export_report from the Makefile
kbuild: move Kai Germaschewski to CREDITS
kconfig/menuconfig: distinguish between selected-by-another options and comments
kconfig: tristate choices with mixed tristate and boolean values
include/linux/Kbuild: remove duplicate entries
kbuild: kill backward compatibility checks
kbuild: kill EXTRA_ARFLAGS
kbuild: fix documentation in makefiles.txt
kbuild: call make once for all targets when O=.. is used
kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
kbuild: update _shipped files for kconfig syntax cleanup
...
Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index f33c3817f014..fef28e267a52 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile | |||
| @@ -8,16 +8,16 @@ | |||
| 8 | # | 8 | # |
| 9 | 9 | ||
| 10 | # | 10 | # |
| 11 | # Uncomment the first CFLAGS if you are doing kgdb source level | 11 | # Uncomment the first KBUILD_CFLAGS if you are doing kgdb source level |
| 12 | # debugging of the kernel to get the proper debugging information. | 12 | # debugging of the kernel to get the proper debugging information. |
| 13 | 13 | ||
| 14 | AS := $(AS) -32 | 14 | AS := $(AS) -32 |
| 15 | LDFLAGS := -m elf32_sparc | 15 | LDFLAGS := -m elf32_sparc |
| 16 | CHECKFLAGS += -D__sparc__ | 16 | CHECKFLAGS += -D__sparc__ |
| 17 | 17 | ||
| 18 | #CFLAGS := $(CFLAGS) -g -pipe -fcall-used-g5 -fcall-used-g7 | 18 | #KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7 |
| 19 | CFLAGS := $(CFLAGS) -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7 | 19 | KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7 |
| 20 | AFLAGS := $(AFLAGS) -m32 | 20 | KBUILD_AFLAGS += -m32 |
| 21 | 21 | ||
| 22 | #LDFLAGS_vmlinux = -N -Ttext 0xf0004000 | 22 | #LDFLAGS_vmlinux = -N -Ttext 0xf0004000 |
| 23 | # Since 2.5.40, the first stage is left not btfix-ed. | 23 | # Since 2.5.40, the first stage is left not btfix-ed. |