aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShih-wei Liao <sliao@google.com>2010-05-04 03:19:48 -0700
committerShih-wei Liao <sliao@google.com>2010-05-04 03:21:56 -0700
commit44ce444e5ee78c3230e92439366b48a13559ccd6 (patch)
tree0df1e0db31ce85df2b25e1291a876abd7e1db451
parenta7752e7017a1ca50973b6b3dcce5d6d484090ba9 (diff)
downloadexternal_llvm-44ce444e5ee78c3230e92439366b48a13559ccd6.zip
external_llvm-44ce444e5ee78c3230e92439366b48a13559ccd6.tar.gz
external_llvm-44ce444e5ee78c3230e92439366b48a13559ccd6.tar.bz2
enable assertion
Change-Id: I1db0884c86ac6744f3c95ae10cefc75e762a79c7
-rw-r--r--Android.mk1
-rw-r--r--lib/VMCore/LLVMContext.cpp1
-rw-r--r--llvm-device-build.mk8
-rw-r--r--llvm-host-build.mk8
4 files changed, 16 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index a9a449e..cf684a8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,6 @@
LOCAL_PATH := $(call my-dir)
LLVM_ROOT_PATH := $(LOCAL_PATH)
+LLVM_ENABLE_ASSERTION := true
include $(CLEAR_VARS)
# Only use this on the device or emulator.
diff --git a/lib/VMCore/LLVMContext.cpp b/lib/VMCore/LLVMContext.cpp
index 4d61363..27d7774 100644
--- a/lib/VMCore/LLVMContext.cpp
+++ b/lib/VMCore/LLVMContext.cpp
@@ -19,6 +19,7 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/SourceMgr.h"
#include "LLVMContextImpl.h"
+#include <ctype.h>
using namespace llvm;
static ManagedStatic<LLVMContext> GlobalContext;
diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 6e008ca..774d051 100644
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -1,5 +1,4 @@
LOCAL_CFLAGS := \
- -D_DEBUG \
-D_GNU_SOURCE \
-D__STDC_LIMIT_MACROS \
-D__STDC_CONSTANT_MACROS \
@@ -12,6 +11,13 @@ LOCAL_CFLAGS := \
-Wwrite-strings \
$(LOCAL_CFLAGS)
+ifeq ($(LLVM_ENABLE_ASSERTION),true)
+LOCAL_CFLAGS := \
+ -D_DEBUG \
+ -UNDEBUG \
+ $(LOCAL_CFLAGS)
+endif
+
ifneq ($(REQUIRES_EH),1)
LOCAL_CFLAGS += -fno-exceptions
else
diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 1424dfe..2af0cc8 100644
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -1,5 +1,4 @@
LOCAL_CFLAGS := \
- -D_DEBUG \
-D_GNU_SOURCE \
-D__STDC_LIMIT_MACROS \
-D__STDC_CONSTANT_MACROS \
@@ -11,6 +10,13 @@ LOCAL_CFLAGS := \
-Wwrite-strings \
$(LOCAL_CFLAGS)
+ifeq ($(LLVM_ENABLE_ASSERTION),true)
+LOCAL_CFLAGS := \
+ -D_DEBUG \
+ -UNDEBUG \
+ $(LOCAL_CFLAGS)
+endif
+
ifneq ($(REQUIRES_EH),1)
LOCAL_CFLAGS += -fno-exceptions
else