am 0576bbbb: (-s ours) am a10bdf76: Merge "Update aosp/master LLVM for rebase to...

* commit '0576bbbb7bd656cef01f5a4822b0fc1c5c38174f':

diff --git a/Android.mk b/Android.mk
index 132e1ec..b7b8f00 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -27,6 +27,7 @@ subdirs := \
   lib/ExecutionEngine/MCJIT \
   lib/ExecutionEngine/Orc \
   lib/ExecutionEngine/Interpreter \
+  lib/Fuzzer \
   lib/CodeGen \
   lib/CodeGen/AsmPrinter \
   lib/CodeGen/MIRParser \

diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h
index 9579848..5b80649 100644 (file)
--- a/include/llvm/Analysis/TargetLibraryInfo.h
+++ b/include/llvm/Analysis/TargetLibraryInfo.h
@@ -19,14 +19,14 @@
 #include "llvm/Pass.h"
 
 // BEGIN ANDROID-SPECIFIC
-#ifdef WIN32
+#ifdef _WIN32
 #ifdef fseeko
 #undef fseeko
 #endif
 #ifdef ftello
 #undef ftello
 #endif
-#endif  // WIN32
+#endif  // _WIN32
 // END ANDROID-SPECIFIC
 
 namespace llvm {

diff --git a/lib/Fuzzer/Android.mk b/lib/Fuzzer/Android.mk
new file mode 100644 (file)
index 0000000..ba59d64
--- /dev/null
+++ b/lib/Fuzzer/Android.mk
@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+libfuzzer_srcs := \
+    FuzzerCrossOver.cpp \
+    FuzzerInterface.cpp \
+    FuzzerTraceState.cpp \
+    FuzzerDriver.cpp \
+    FuzzerIO.cpp \
+    FuzzerLoop.cpp \
+    FuzzerMutate.cpp \
+    FuzzerSanitizerOptions.cpp \
+    FuzzerSHA1.cpp \
+    FuzzerUtil.cpp \
+
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+LOCAL_MODULE := libLLVMFuzzerNoMain
+LOCAL_C_INCLUDES := external/compiler-rt/include
+LOCAL_SRC_FILES := $(libfuzzer_srcs)
+LOCAL_SANITIZE := never
+LOCAL_MULTILIB := both
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+LOCAL_MODULE := libLLVMFuzzer
+LOCAL_SRC_FILES := FuzzerMain.cpp
+LOCAL_WHOLE_STATIC_LIBRARIES := libLLVMFuzzerNoMain
+LOCAL_SANITIZE := never
+LOCAL_MULTILIB := both
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+LOCAL_MODULE := libLLVMFuzzerNoMain
+LOCAL_C_INCLUDES := external/compiler-rt/include
+LOCAL_SRC_FILES := $(libfuzzer_srcs)
+LOCAL_SANITIZE := never
+LOCAL_MULTILIB := both
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_CLANG := true
+LOCAL_MODULE := libLLVMFuzzer
+LOCAL_SRC_FILES := FuzzerMain.cpp
+LOCAL_WHOLE_STATIC_LIBRARIES := libLLVMFuzzerNoMain
+LOCAL_SANITIZE := never
+LOCAL_MULTILIB := both
+include $(BUILD_HOST_STATIC_LIBRARY)

diff --git a/shared_llvm.mk b/shared_llvm.mk
index daf9781..183618c 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -93,7 +93,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
   $(llvm_post_static_libraries)
 
 ifeq ($(HOST_OS),windows)
-  LOCAL_LDLIBS := -limagehlp -lpsapi
+  LOCAL_LDLIBS := -limagehlp -lpsapi -lole32
 else
   LOCAL_LDLIBS := -ldl -lpthread
 endif