6 files changed, 104 insertions, 0 deletions
diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
new file mode 100644
index 0000000000..002888d712
--- /dev/null
+++ b/lib/MC/Android.mk
@@ -0,0 +1,62 @@
+LOCAL_PATH:= $(call my-dir)
+
+mc_SRC_FILES :=    \
+	ELFObjectWriter.cpp	\
+	MachObjectWriter.cpp    \
+	MCAsmInfo.cpp   \
+	MCAsmInfoCOFF.cpp   \
+	MCAsmInfoDarwin.cpp \
+	MCAsmStreamer.cpp   \
+	MCAssembler.cpp \
+	MCCodeEmitter.cpp   \
+	MCContext.cpp   \
+	MCDisassembler.cpp  \
+	MCDwarf.cpp \
+	MCELFStreamer.cpp	\
+	MCExpr.cpp  \
+	MCInst.cpp  \
+	MCInstPrinter.cpp   \
+	MCLabel.cpp	\
+	MCLoggingStreamer.cpp	\
+	MCMachOStreamer.cpp \
+	MCNullStreamer.cpp  \
+	MCObjectFormat.cpp \
+	MCObjectStreamer.cpp	\
+	MCObjectWriter.cpp  \
+	MCSection.cpp   \
+	MCSectionCOFF.cpp	\
+	MCSectionELF.cpp    \
+	MCSectionMachO.cpp  \
+	MCStreamer.cpp  \
+	MCSymbol.cpp    \
+	MCValue.cpp \
+	WinCOFFObjectWriter.cpp	\
+	WinCOFFStreamer.cpp	\
+	TargetAsmBackend.cpp
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mc_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMMC
+
+LOCAL_MODULE_TAGS := optional
+
+
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mc_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMMC
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp
index 021873c2db..692f1788ca 100644
--- a/lib/MC/MCAsmStreamer.cpp
+++ b/lib/MC/MCAsmStreamer.cpp
@@ -23,6 +23,7 @@
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/FormattedStream.h"
+#include <ctype.h>
 using namespace llvm;
 
 namespace {
diff --git a/lib/MC/MCParser/Android.mk b/lib/MC/MCParser/Android.mk
new file mode 100644
index 0000000000..33d3aea845
--- /dev/null
+++ b/lib/MC/MCParser/Android.mk
@@ -0,0 +1,38 @@
+LOCAL_PATH:= $(call my-dir)
+
+mc_parser_SRC_FILES :=	\
+	AsmLexer.cpp	\
+	AsmParser.cpp	\
+	COFFAsmParser.cpp \
+        DarwinAsmParser.cpp	\
+        ELFAsmParser.cpp	\
+	MCAsmLexer.cpp	\
+	MCAsmParser.cpp	\
+        MCAsmParserExtension.cpp	\
+	TargetAsmParser.cpp
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mc_parser_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMMCParser
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mc_parser_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMMCParser
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/MC/MCParser/AsmLexer.cpp b/lib/MC/MCParser/AsmLexer.cpp
index 867cb208ce..5c1ae2fd93 100644
--- a/lib/MC/MCParser/AsmLexer.cpp
+++ b/lib/MC/MCParser/AsmLexer.cpp
@@ -15,6 +15,7 @@
 #include "llvm/Support/SMLoc.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/MC/MCAsmInfo.h"
+#include <ctype.h>
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp
index 3632c93740..fa7a78514e 100644
--- a/lib/MC/MCParser/AsmParser.cpp
+++ b/lib/MC/MCParser/AsmParser.cpp
@@ -31,6 +31,7 @@
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/TargetAsmParser.h"
+#include <cctype>
 #include <vector>
 using namespace llvm;
 
diff --git a/lib/MC/MCSectionMachO.cpp b/lib/MC/MCSectionMachO.cpp
index 0b74636d42..853d990686 100644
--- a/lib/MC/MCSectionMachO.cpp
+++ b/lib/MC/MCSectionMachO.cpp
@@ -10,6 +10,7 @@
 #include "llvm/MC/MCSectionMachO.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/Support/raw_ostream.h"
+#include <ctype.h>
 using namespace llvm;
 
 /// SectionTypeDescriptors - These are strings that describe the various section