i965/fs: Don't constant propagate into integer math instructions.

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index 3e6d4c398911a3747a5e048f2d82a3c1c3f46e74..edf52d6fabbbb4aa6f69034701119fa220aacea6 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -24,16 +24,17 @@
 # use c99 compiler by default
 ifeq ($(LOCAL_CC),)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_CC := $(HOST_CC) -std=c99
+LOCAL_CC := $(HOST_CC) -std=c99 -D_GNU_SOURCE
 else
 LOCAL_CC := $(TARGET_CC) -std=c99
 endif
 endif
 
 LOCAL_C_INCLUDES += \
+       $(MESA_TOP)/src \
        $(MESA_TOP)/include
 
-MESA_VERSION=$(shell cat $(MESA_TOP)/VERSION)
+MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
 LOCAL_CFLAGS += \
        -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
@@ -41,6 +42,19 @@ LOCAL_CFLAGS += \
        -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 
 LOCAL_CFLAGS += \
+       -DHAVE___BUILTIN_EXPECT \
+       -DHAVE___BUILTIN_FFS \
+       -DHAVE___BUILTIN_FFSLL \
+       -DHAVE_FUNC_ATTRIBUTE_FLATTEN \
+       -DHAVE_FUNC_ATTRIBUTE_UNUSED \
+       -DHAVE_FUNC_ATTRIBUTE_FORMAT \
+       -DHAVE_FUNC_ATTRIBUTE_PACKED \
+       -DHAVE___BUILTIN_CTZ \
+       -DHAVE___BUILTIN_POPCOUNT \
+       -DHAVE___BUILTIN_POPCOUNTLL \
+       -DHAVE___BUILTIN_CLZ \
+       -DHAVE___BUILTIN_CLZLL \
+       -DHAVE___BUILTIN_UNREACHABLE \
        -DHAVE_PTHREAD=1 \
        -fvisibility=hidden \
        -Wno-sign-compare