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/cris | |
| 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/cris')
| -rw-r--r-- | arch/cris/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/cris/Makefile b/arch/cris/Makefile index ee114699ef8e..e6bf00c262e0 100644 --- a/arch/cris/Makefile +++ b/arch/cris/Makefile | |||
| @@ -29,18 +29,18 @@ LD = $(CROSS_COMPILE)ld -mcrislinux | |||
| 29 | OBJCOPYFLAGS := -O binary -R .note -R .comment -S | 29 | OBJCOPYFLAGS := -O binary -R .note -R .comment -S |
| 30 | 30 | ||
| 31 | CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) | 31 | CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) |
| 32 | AFLAGS += -mlinux | 32 | KBUILD_AFLAGS += -mlinux |
| 33 | 33 | ||
| 34 | CFLAGS := $(CFLAGS) -mlinux -march=$(arch-y) -pipe | 34 | KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe |
| 35 | 35 | ||
| 36 | ifdef CONFIG_FRAME_POINTER | 36 | ifdef CONFIG_FRAME_POINTER |
| 37 | CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS)) -g | 37 | KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g |
| 38 | CFLAGS += -fno-omit-frame-pointer | 38 | KBUILD_CFLAGS += -fno-omit-frame-pointer |
| 39 | endif | 39 | endif |
| 40 | 40 | ||
| 41 | head-y := arch/$(ARCH)/$(SARCH)/kernel/head.o | 41 | head-y := arch/$(ARCH)/$(SARCH)/kernel/head.o |
| 42 | 42 | ||
| 43 | LIBGCC = $(shell $(CC) $(CFLAGS) -print-file-name=libgcc.a) | 43 | LIBGCC = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libgcc.a) |
| 44 | 44 | ||
| 45 | core-y += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/ | 45 | core-y += arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/ |
| 46 | core-y += arch/$(ARCH)/$(SARCH)/kernel/ arch/$(ARCH)/$(SARCH)/mm/ | 46 | core-y += arch/$(ARCH)/$(SARCH)/kernel/ arch/$(ARCH)/$(SARCH)/mm/ |