commit 2d3bcbb6f84af84555912f11a7abea5cb66b1a79
author Logan Chien <loganchien@google.com> Fri Jul 06 09:37:26 2012 +0800
committer Shih-wei Liao <sliao@google.com> Wed Jul 11 10:29:43 2012 -0700
tree 68193cdcefbac42be3d4d77dc794a30b12458b90
parent c9965d7090fec7c0d0fb4da5c77078d4a12d6c32

Declare correct prototype for compiler-rt.

Change-Id: Idd5236d90a032339519c861a1aa2fd7d55fa4da7

src/compiler_llvm/runtime_support_llvm.cc

diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc
index 4566995..bf3c9ba 100644
--- a/src/compiler_llvm/runtime_support_llvm.cc
+++ b/src/compiler_llvm/runtime_support_llvm.cc
@@ -34,8 +34,10 @@
 #include "well_known_classes.h"
 
 #include <algorithm>
-#include <cstdarg>
+#include <math.h>
+#include <stdarg.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 #include "asm_support.h"
 
@@ -605,21 +607,22 @@
 // Runtime Support Function Lookup Callback
 //----------------------------------------------------------------------------
 
-#define EXTERNAL_LINKAGE(NAME) \
-extern "C" void NAME(...);
+#define EXTERNAL_LINKAGE(NAME, RETURN_TYPE, ...) \
+extern "C" RETURN_TYPE NAME(__VA_ARGS__);
 COMPILER_RUNTIME_FUNC_LIST_NATIVE(EXTERNAL_LINKAGE)
 #undef EXTERNAL_LINKAGE
 
 static void* art_find_compiler_runtime_func(const char* name) {
 // TODO: If target support some math func, use the target's version. (e.g. art_d2i -> __aeabi_d2iz)
   static const char* const names[] = {
-#define DEFINE_ENTRY(NAME) #NAME ,
+#define DEFINE_ENTRY(NAME, RETURN_TYPE, ...) #NAME ,
     COMPILER_RUNTIME_FUNC_LIST_NATIVE(DEFINE_ENTRY)
 #undef DEFINE_ENTRY
   };
 
   static void* const funcs[] = {
-#define DEFINE_ENTRY(NAME) reinterpret_cast<void*>(NAME) ,
+#define DEFINE_ENTRY(NAME, RETURN_TYPE, ...) \
+    reinterpret_cast<void*>(static_cast<RETURN_TYPE (*)(__VA_ARGS__)>(NAME)) ,
     COMPILER_RUNTIME_FUNC_LIST_NATIVE(DEFINE_ENTRY)
 #undef DEFINE_ENTRY
   };