diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-28 20:42:26 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-28 20:42:26 -0400 |
commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
tree | 032f067d3af458527d903a7653885404ed82431e /arch/mips/Makefile | |
parent | acc429a517bd11fdcac9bea97d082d26231beb92 (diff) | |
parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/Makefile')
-rw-r--r-- | arch/mips/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 69b9c1b8fafc..133900aca992 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -615,7 +615,10 @@ LDFLAGS += -m $(ld-emul) | |||
615 | ifdef CONFIG_MIPS | 615 | ifdef CONFIG_MIPS |
616 | CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \ | 616 | CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \ |
617 | egrep -vw '__GNUC_(MAJOR|MINOR|PATCHLEVEL)__' | \ | 617 | egrep -vw '__GNUC_(MAJOR|MINOR|PATCHLEVEL)__' | \ |
618 | sed -e 's/^\#define /-D/' -e 's/ /="/' -e 's/$$/"/') | 618 | sed -e 's/^\#define /-D/' -e "s/ /='/" -e "s/$$/'/") |
619 | ifdef CONFIG_64BIT | ||
620 | CHECKFLAGS += -m64 | ||
621 | endif | ||
619 | endif | 622 | endif |
620 | 623 | ||
621 | OBJCOPYFLAGS += --remove-section=.reginfo | 624 | OBJCOPYFLAGS += --remove-section=.reginfo |