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/m68k | |
| 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/m68k')
| -rw-r--r-- | arch/m68k/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index aa383a5ea7ac..4a1bd44ff162 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile | |||
| @@ -32,18 +32,18 @@ endif | |||
| 32 | CHECKFLAGS += -D__mc68000__ | 32 | CHECKFLAGS += -D__mc68000__ |
| 33 | 33 | ||
| 34 | # without -fno-strength-reduce the 53c7xx.c driver fails ;-( | 34 | # without -fno-strength-reduce the 53c7xx.c driver fails ;-( |
| 35 | CFLAGS += -pipe -fno-strength-reduce -ffixed-a2 | 35 | KBUILD_CFLAGS += -pipe -fno-strength-reduce -ffixed-a2 |
| 36 | 36 | ||
| 37 | # enable processor switch if compiled only for a single cpu | 37 | # enable processor switch if compiled only for a single cpu |
| 38 | ifndef CONFIG_M68020 | 38 | ifndef CONFIG_M68020 |
| 39 | ifndef CONFIG_M68030 | 39 | ifndef CONFIG_M68030 |
| 40 | 40 | ||
| 41 | ifndef CONFIG_M68060 | 41 | ifndef CONFIG_M68060 |
| 42 | CFLAGS := $(CFLAGS) -m68040 | 42 | KBUILD_CFLAGS += -m68040 |
| 43 | endif | 43 | endif |
| 44 | 44 | ||
| 45 | ifndef CONFIG_M68040 | 45 | ifndef CONFIG_M68040 |
| 46 | CFLAGS := $(CFLAGS) -m68060 | 46 | KBUILD_CFLAGS += -m68060 |
| 47 | endif | 47 | endif |
| 48 | 48 | ||
| 49 | endif | 49 | endif |
| @@ -52,7 +52,7 @@ endif | |||
| 52 | ifdef CONFIG_KGDB | 52 | ifdef CONFIG_KGDB |
| 53 | # If configured for kgdb support, include debugging infos and keep the | 53 | # If configured for kgdb support, include debugging infos and keep the |
| 54 | # frame pointer | 54 | # frame pointer |
| 55 | CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS)) -g | 55 | KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g |
| 56 | endif | 56 | endif |
| 57 | 57 | ||
| 58 | ifndef CONFIG_SUN3 | 58 | ifndef CONFIG_SUN3 |