Fri Jun 3 15:53:18 2016 UTC ()

Fix compilation on non-x86


(christos)

diff -r1.2 -r1.3 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc

--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc 2016/05/31 20:47:25	1.2
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc 2016/06/03 15:53:18	1.3

 @@ -226,70 +226,80 @@ uptr ThreadSelfOffset() {
 uptr ThreadSelf() {
   uptr descr_addr;
 # if defined(__i386__)
   asm("mov %%gs:%c1,%0" : "=r"(descr_addr) : "i"(kThreadSelfOffset));
 # elif defined(__x86_64__)
   asm("mov %%fs:%c1,%0" : "=r"(descr_addr) : "i"(kThreadSelfOffset));
 # else
 #  error "unsupported CPU arch"
 # endif
   return descr_addr;
+}
 #endif  // (defined(__x86_64__) || defined(__i386__)) && SANITIZER_LINUX
-#if SANITIZER_FREEBSD || SANITIZER_NETBSD
+#if SANITIZER_FREEBSD
 static void **ThreadSelfSegbase() {
   void **segbase = 0;
 # if defined(__i386__)
   // sysarch(I386_GET_GSBASE, segbase);
   __asm __volatile("mov %%gs:0, %0" : "=r" (segbase));
 # elif defined(__x86_64__)
   // sysarch(AMD64_GET_FSBASE, segbase);
   __asm __volatile("movq %%fs:0, %0" : "=r" (segbase));
 # else
 #  error "unsupported CPU arch for FreeBSD platform"
 # endif
   return segbase;
+}
 uptr ThreadSelf() {
   return (uptr)ThreadSelfSegbase()[2];
+}
-#endif  // SANITIZER_FREEBSD || SANITIZER_NETBSD
+#endif  // SANITIZER_FREEBSD
 #if SANITIZER_NETBSD
 uptr ThreadSelf() {
   return (uptr)pthread_self();
+}
 #endif // SANITIZER_NETBSD
 static void GetTls(uptr *addr, uptr *size) {
 #if SANITIZER_LINUX
 # if defined(__x86_64__) || defined(__i386__)
   *addr = ThreadSelf();
   *size = GetTlsSize();
   *addr -= *size;
   *addr += ThreadDescriptorSize();
 # else
   *addr = 0;
   *size = 0;
 # endif
-#elif SANITIZER_FREEBSD || SANITIZER_NETBSD
+#elif SANITIZER_FREEBSD
   void** segbase = ThreadSelfSegbase();
   *addr = 0;
   *size = 0;
   if (segbase != 0) {
     // tcbalign = 16
     // tls_size = round(tls_static_space, tcbalign);
     // dtv = segbase[1];
     // dtv[2] = segbase - tls_static_space;
     void **dtv = (void**) segbase[1];
     *addr = (uptr) dtv[2];
     *size = (*addr == 0) ? 0 : ((uptr) segbase[0] - (uptr) dtv[2]);
+  }
 #elif SANITIZER_NETBSD
   // XXX: for now
   *addr = 0;
   *size = 0;
 #else
 # error "Unknown OS"
 #endif
+}
 uptr GetTlsSize() {
 #if SANITIZER_FREEBSD || SANITIZER_NETBSD
   uptr addr, size;
   GetTls(&addr, &size);
   return size;
 #else
   return g_tls_size;
 #endif