[compiler-rt] r185144 - Pass --default-arch flag to external symbolizer. Fix line lengths.

[Alexey Samsonov]

Author: samsonov
Date: Fri Jun 28 07:13:31 2013
New Revision: 185144

URL: http://llvm.org/viewvc/llvm-project?rev=185144&view=rev
Log:
Pass --default-arch flag to external symbolizer. Fix line lengths.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=185144&r1=185143&r2=185144&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc Fri Jun 28 07:13:31 2013
@@ -1278,7 +1278,8 @@ INTERCEPTOR(__sanitizer_dirent *, readdi
   return res;
 }
 
-INTERCEPTOR(int, readdir_r, void *dirp, __sanitizer_dirent *entry, __sanitizer_dirent **result) {
+INTERCEPTOR(int, readdir_r, void *dirp, __sanitizer_dirent *entry,
+            __sanitizer_dirent **result) {
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, readdir_r, dirp, entry, result);
   int res = REAL(readdir_r)(dirp, entry, result);
@@ -1308,7 +1309,8 @@ INTERCEPTOR(__sanitizer_dirent64 *, read
   return res;
 }
 
-INTERCEPTOR(int, readdir64_r, void *dirp, __sanitizer_dirent64 *entry, __sanitizer_dirent64 **result) {
+INTERCEPTOR(int, readdir64_r, void *dirp, __sanitizer_dirent64 *entry,
+            __sanitizer_dirent64 **result) {
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, readdir64_r, dirp, entry, result);
   int res = REAL(readdir64_r)(dirp, entry, result);

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc?rev=185144&r1=185143&r2=185144&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc Fri Jun 28 07:13:31 2013
@@ -24,6 +24,14 @@
 
 namespace __sanitizer {
 
+#if defined(__x86_64__)
+static const char* const kSymbolizerArch = "--default-arch=x86_64";
+#elif defined(__i386__)
+static const char* const kSymbolizerArch = "--default-arch=i386";
+#else
+static const char* const kSymbolizerArch = "";
+#endif
+
 bool StartSymbolizerSubprocess(const char *path_to_symbolizer,
                                int *input_fd, int *output_fd) {
   if (!FileExists(path_to_symbolizer)) {
@@ -88,7 +96,7 @@ bool StartSymbolizerSubprocess(const cha
     internal_close(infd[1]);
     for (int fd = getdtablesize(); fd > 2; fd--)
       internal_close(fd);
-    execl(path_to_symbolizer, path_to_symbolizer, (char*)0);
+    execl(path_to_symbolizer, path_to_symbolizer, kSymbolizerArch, (char*)0);
     internal__exit(1);
   }