re PR sanitizer/78992 (Incorrect sigaction definition on 32-bit sparc)

	PR sanitizer/78992
	* sanitizer_common/sanitizer_platform_limits_posix.h
	(struct __sanitizer_sigaction): Cherry-pick upstream r291561.

From-SVN: r244275

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 3dc49d3ebb04ee86a3c6f65730f30c6edf5a5eae..db9221c138470b408f6d0979ac46ae0c9678faef 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-10  James Clarke  <jrtc27@jrtc27.com>
+
+       PR sanitizer/78992
+       * sanitizer_common/sanitizer_platform_limits_posix.h
+       (struct __sanitizer_sigaction): Cherry-pick upstream r291561.
+
 2016-11-30  Maxim Ostapenko  <m.ostapenko@samsung.com>
 
        * LOCAL_PATCHES: Add revision.

diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
index 066bf41ffef7979111732da137253874b91de6c2..c139322839aa81221e164f1ac2ccaa2507bfb8f3 100644 (file)
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -633,9 +633,12 @@ namespace __sanitizer {
 #ifndef __mips__
 #if defined(__sparc__)
 #if __GLIBC_PREREQ (2, 20)
-    // On sparc glibc 2.19 and earlier sa_flags was unsigned long, and
-    // __glibc_reserved0 didn't exist.
+    // On sparc glibc 2.19 and earlier sa_flags was unsigned long.
+#if defined(__arch64__)
+    // To maintain ABI compatibility on sparc64 when switching to an int,
+    // __glibc_reserved0 was added.
     int __glibc_reserved0;
+#endif
     int sa_flags;
 #else
     unsigned long sa_flags;