Merge "gcc 4.6: don't reorder functions"
diff --git a/Android.mk b/Android.mk
index 3f57042..ae94276 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,7 +30,7 @@
-Wall -Wmissing-prototypes -Wunused -Wshadow \
-Wpointer-arith -falign-jumps=1 -falign-loops=1 \
-falign-functions=1 -Wundef
-LOCAL_CFLAGS += -m32 -O2 -fno-builtin -nostdinc
+LOCAL_CFLAGS += -m32 -O2 -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector
LOCAL_C_INCLUDES := $(LOCAL_PATH)/stage1
@@ -87,7 +87,7 @@
-Wpointer-arith -falign-jumps=1 -falign-loops=1 \
-falign-functions=1 -Wundef
-LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc
+LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFSYS_EXT2FS=1 -DSUPPORT_SERIAL=1
@@ -124,7 +124,7 @@
-Wpointer-arith -falign-jumps=1 -falign-loops=1 \
-falign-functions=1 -Wundef
-LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc
+LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector
LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFSYS_EXT2FS=1 -DSUPPORT_SERIAL=1
