diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 07:45:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 07:45:59 -0400 |
| commit | 91d0322bef047e2916b3e52741411bffc63929cb (patch) | |
| tree | 44c4fd13cc17755a6db8a3d70cffb86e57a838dc /arch/arm/boot/compressed/Makefile | |
| parent | 065cb3dfe24978651caedfa54da585388ad15dde (diff) | |
| parent | 50515af207d410c9f228380e529c56f43c3de0bd (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/arm/boot/compressed/Makefile')
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index de9d9ee50958..95baac4939e0 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile | |||
| @@ -69,6 +69,12 @@ SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ | |||
| 69 | 69 | ||
| 70 | targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \ | 70 | targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \ |
| 71 | head.o misc.o $(OBJS) | 71 | head.o misc.o $(OBJS) |
| 72 | |||
| 73 | ifeq ($(CONFIG_FTRACE),y) | ||
| 74 | ORIG_CFLAGS := $(KBUILD_CFLAGS) | ||
| 75 | KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS)) | ||
| 76 | endif | ||
| 77 | |||
| 72 | EXTRA_CFLAGS := -fpic -fno-builtin | 78 | EXTRA_CFLAGS := -fpic -fno-builtin |
| 73 | EXTRA_AFLAGS := | 79 | EXTRA_AFLAGS := |
| 74 | 80 | ||