auto import from //branches/cupcake/...@125939
diff --git a/core/combo/linux-arm.mk b/core/combo/linux-arm.mk
index adb82d3..507e4dd 100644
--- a/core/combo/linux-arm.mk
+++ b/core/combo/linux-arm.mk
@@ -53,6 +53,7 @@
 			-ffunction-sections \
 			-funwind-tables \
 			-fstack-protector \
+			-fno-short-enums \
 			-D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ \
 			-D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
 			-include $(call select-android-config-h,linux-arm)