[compiler-rt] r199873 - [msan] Fix GCC warnings.

Evgeniy Stepanov eugeni.stepanov at gmail.com
Thu Jan 23 00:43:12 PST 2014


Author: eugenis
Date: Thu Jan 23 02:43:12 2014
New Revision: 199873

URL: http://llvm.org/viewvc/llvm-project?rev=199873&view=rev
Log:
[msan] Fix GCC warnings.

warning: ISO C99 requires rest arguments to be used [enabled by default]
 INTERCEPTOR(char *, dlerror) {

warning: invoking macro INTERCEPTOR argument 3: empty macro arguments are undefined in ISO C90 and ISO C++98 [enabled by default]


Modified:
    compiler-rt/trunk/lib/msan/msan_interceptors.cc

Modified: compiler-rt/trunk/lib/msan/msan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/msan/msan_interceptors.cc?rev=199873&r1=199872&r2=199873&view=diff
==============================================================================
--- compiler-rt/trunk/lib/msan/msan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/msan/msan_interceptors.cc Thu Jan 23 02:43:12 2014
@@ -905,9 +905,9 @@ INTERCEPTOR(int, dladdr, void *addr, dli
   return res;
 }
 
-INTERCEPTOR(char *, dlerror) {
+INTERCEPTOR(char *, dlerror, int fake) {
   ENSURE_MSAN_INITED();
-  char *res = REAL(dlerror)();
+  char *res = REAL(dlerror)(fake);
   if (res != 0) __msan_unpoison(res, REAL(strlen)(res) + 1);
   return res;
 }
@@ -1149,9 +1149,9 @@ INTERCEPTOR(int, pthread_join, void *th,
 
 extern char *tzname[2];
 
-INTERCEPTOR(void, tzset) {
+INTERCEPTOR(void, tzset, int fake) {
   ENSURE_MSAN_INITED();
-  REAL(tzset)();
+  REAL(tzset)(fake);
   if (tzname[0])
     __msan_unpoison(tzname[0], REAL(strlen)(tzname[0]) + 1);
   if (tzname[1])





More information about the llvm-commits mailing list