fix double merge

[oweals/busybox.git] / Makefile.flags

diff --git a/Makefile.flags b/Makefile.flags
index f5eb65fafbed44db1312ebe7bb04b72a5333fcea..ed42c2b6d205082020ddfd7ca7d8421b5785c2af 100644 (file)
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -1,5 +1,5 @@
 # ==========================================================================
-# Building
+# Build system
 # ==========================================================================
 
 BB_VER = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -11,9 +11,7 @@ CPPFLAGS += \
        -D_GNU_SOURCE -DNDEBUG \
        $(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \
        -D"BB_VER=KBUILD_STR($(BB_VER))" -DBB_BT=AUTOCONF_TIMESTAMP \
-       -Wall -Wstrict-prototypes -Wshadow -Werror \
+       -Wall -Wstrict-prototypes -Wshadow -Werror -Wundef \
        -funsigned-char -fno-builtin-strlen -finline-limit=0 -static-libgcc \
-       -Os -march=i386 -mpreferred-stack-boundary=2 \
-       -falign-functions=1 -falign-jumps=1 -falign-loops=1 \
-       -fomit-frame-pointer -ffunction-sections -fdata-sections \
-       -funsigned-char -fno-builtin-strlen \
+       -Os -falign-functions=1 -falign-jumps=1 -falign-loops=1 \
+       -fomit-frame-pointer -ffunction-sections -fdata-sections