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/um/sys-ppc/Makefile | |
| 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/um/sys-ppc/Makefile')
| -rw-r--r-- | arch/um/sys-ppc/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/sys-ppc/Makefile b/arch/um/sys-ppc/Makefile index af200268fddb..a9814a7ae60e 100644 --- a/arch/um/sys-ppc/Makefile +++ b/arch/um/sys-ppc/Makefile | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | OBJ = built-in.o | 1 | OBJ = built-in.o |
| 2 | 2 | ||
| 3 | .S.o: | 3 | .S.o: |
| 4 | $(CC) $(AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o | 4 | $(CC) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o |
| 5 | 5 | ||
| 6 | OBJS = ptrace.o sigcontext.o semaphore.o checksum.o miscthings.o misc.o \ | 6 | OBJS = ptrace.o sigcontext.o semaphore.o checksum.o miscthings.o misc.o \ |
| 7 | ptrace_user.o sysrq.o | 7 | ptrace_user.o sysrq.o |
| @@ -57,13 +57,13 @@ ppc_defs.h: mk_defs.c ppc_defs.head \ | |||
| 57 | checksum.o: checksum.S | 57 | checksum.o: checksum.S |
| 58 | rm -f asm | 58 | rm -f asm |
| 59 | ln -s $(TOPDIR)/include/asm-ppc asm | 59 | ln -s $(TOPDIR)/include/asm-ppc asm |
| 60 | $(CC) $(EXTRA_AFLAGS) $(AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o | 60 | $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o |
| 61 | rm -f asm | 61 | rm -f asm |
| 62 | 62 | ||
| 63 | misc.o: misc.S ppc_defs.h | 63 | misc.o: misc.S ppc_defs.h |
| 64 | rm -f asm | 64 | rm -f asm |
| 65 | ln -s $(TOPDIR)/include/asm-ppc asm | 65 | ln -s $(TOPDIR)/include/asm-ppc asm |
| 66 | $(CC) $(EXTRA_AFLAGS) $(AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o | 66 | $(CC) $(EXTRA_AFLAGS) $(KBUILD_AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o |
| 67 | rm -f asm | 67 | rm -f asm |
| 68 | 68 | ||
| 69 | clean-files := $(OBJS) ppc_defs.h checksum.S semaphore.c mk_defs.c | 69 | clean-files := $(OBJS) ppc_defs.h checksum.S semaphore.c mk_defs.c |