diff --git a/external/gpl3/gcc.old/dist/libsanitizer/asan/asan_thread.cc b/external/gpl3/gcc.old/dist/libsanitizer/asan/asan_thread.cc
index 92f968bdee4a..405c9dada180 100644
--- a/external/gpl3/gcc.old/dist/libsanitizer/asan/asan_thread.cc
+++ b/external/gpl3/gcc.old/dist/libsanitizer/asan/asan_thread.cc
@@ -9,6 +9,10 @@
 //
 // Thread-related code.
 //===----------------------------------------------------------------------===//
+
+#define __EXPOSE_STACK
+#include <sys/param.h>
+
 #include "asan_allocator.h"
 #include "asan_interceptors.h"
 #include "asan_poisoning.h"
@@ -221,7 +225,10 @@ bool AsanThread::GetStackFrameAccessByAddr(uptr addr,
     access->frame_descr = (const char *)((uptr*)bottom)[1];
     return true;
   }
-  uptr aligned_addr = addr & ~(SANITIZER_WORDSIZE/8 - 1);  // align addr.
+#ifndef STACK_ALIGNBYTES
+# define STACK_ALIGNBYTES (~(SANITIZER_WORDSIZE/8 - 1))
+#endif
+  uptr aligned_addr = addr & STACK_ALIGNBYTES; // align addr.
   u8 *shadow_ptr = (u8*)MemToShadow(aligned_addr);
   u8 *shadow_bottom = (u8*)MemToShadow(bottom);
 
diff --git a/external/gpl3/gcc/dist/libsanitizer/asan/asan_thread.cc b/external/gpl3/gcc/dist/libsanitizer/asan/asan_thread.cc
index 92f968bdee4a..405c9dada180 100644
--- a/external/gpl3/gcc/dist/libsanitizer/asan/asan_thread.cc
+++ b/external/gpl3/gcc/dist/libsanitizer/asan/asan_thread.cc
@@ -9,6 +9,10 @@
 //
 // Thread-related code.
 //===----------------------------------------------------------------------===//
+
+#define __EXPOSE_STACK
+#include <sys/param.h>
+
 #include "asan_allocator.h"
 #include "asan_interceptors.h"
 #include "asan_poisoning.h"
@@ -221,7 +225,10 @@ bool AsanThread::GetStackFrameAccessByAddr(uptr addr,
     access->frame_descr = (const char *)((uptr*)bottom)[1];
     return true;
   }
-  uptr aligned_addr = addr & ~(SANITIZER_WORDSIZE/8 - 1);  // align addr.
+#ifndef STACK_ALIGNBYTES
+# define STACK_ALIGNBYTES (~(SANITIZER_WORDSIZE/8 - 1))
+#endif
+  uptr aligned_addr = addr & STACK_ALIGNBYTES; // align addr.
   u8 *shadow_ptr = (u8*)MemToShadow(aligned_addr);
   u8 *shadow_bottom = (u8*)MemToShadow(bottom);