diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-23 13:38:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-23 13:38:39 +0200 |
| commit | 6b8503baabb5a55dc6e21c80d02ac8729149525e (patch) | |
| tree | d5d5ae95990164e0cee130a629dabb9ba8226a8b /arch/x86 | |
| parent | 9a5898e524437495cfdbcb84521136d2bb7ddf2d (diff) | |
| parent | dac6e90115de9b47295fc5289a26f686bcae4d35 (diff) | |
| download | barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.gz barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 3b034c0516..db4180b32b 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -5,7 +5,7 @@ machine-y := i386 TEXT_BASE = $(CONFIG_TEXT_BASE) -CPPFLAGS += -march=i386 -m32 -DTEXT_BASE=$(TEXT_BASE) -P +CPPFLAGS += -march=i386 -m32 -DTEXT_BASE=$(TEXT_BASE) LDFLAGS += -m elf_i386 ifndef CONFIG_MODULES |