[gcc(refs/vendors/redhat/heads/gcc-8-branch)] backport: re PR sanitizer/92154 (new glibc breaks arm bootstrap due to libsanitizer)

[gcc(refs/vendors/redhat/heads/gcc-8-branch)] backport: re PR sanitizer/92154 (new glibc breaks arm bootstrap due to libsanitizer)

[Jakub Jelinek]

https://gcc.gnu.org/g:8f59542594a629069c6040abb44444ff2e0bd43c

commit 8f59542594a629069c6040abb44444ff2e0bd43c
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Fri Feb 14 12:33:27 2020 +0100

    backport: re PR sanitizer/92154 (new glibc breaks arm bootstrap due to libsanitizer)
    
            Backported from mainline
            2019-10-22  Tamar Christina  <tamar.christina@arm.com>
    
            PR sanitizer/92154
            * sanitizer_common/sanitizer_platform_limits_posix.cc:
            Cherry-pick compiler-rt revision r375220.

Diff:
---
 libsanitizer/ChangeLog                                           | 9 +++++++++
 libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index e9e4fc51828..70056ab8aec 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,12 @@
+2020-02-14  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from mainline
+	2019-10-22  Tamar Christina  <tamar.christina@arm.com>
+
+	PR sanitizer/92154
+	* sanitizer_common/sanitizer_platform_limits_posix.cc:
+	Cherry-pick compiler-rt revision r375220.
+
 2019-02-22  Release Manager
 
 	* GCC 8.3.0 released.
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
index a915d37cdfe..e85aaf51928 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -1147,8 +1147,12 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
+#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
+    !defined(__arm__)
 /* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
+/* On Arm glibc 2.31 and later provide a different mode field, this field is
+   never used by libsanitizer so we can simply ignore this assert for all glibc
+   versions.  */
 CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
 #endif

[gcc(refs/vendors/redhat/heads/gcc-8-branch)] backport: re PR sanitizer/92154 (new glibc breaks arm bootstrap due to libsanitizer)

[Jakub Jelinek]

https://gcc.gnu.org/g:e70808cbc5646998d370c35c189f9d7caa90270f

commit e70808cbc5646998d370c35c189f9d7caa90270f
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Fri Feb 14 12:38:30 2020 +0100

    backport: re PR sanitizer/92154 (new glibc breaks arm bootstrap due to libsanitizer)
    
            Backported from mainline
            2019-11-26  Jakub Jelinek  <jakub@redhat.com>
    
            PR sanitizer/92154
            * sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
            llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
            * sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.

Diff:
---
 libsanitizer/ChangeLog                                    |  7 +++++++
 .../sanitizer_common/sanitizer_platform_limits_posix.cc   |  9 +++------
 .../sanitizer_common/sanitizer_platform_limits_posix.h    | 15 +--------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 70056ab8aec..df0c9449136 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,6 +1,13 @@
 2020-02-14  Jakub Jelinek  <jakub@redhat.com>
 
 	Backported from mainline
+	2019-11-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/92154
+	* sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
+	llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
+	* sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.
+
 	2019-10-22  Tamar Christina  <tamar.christina@arm.com>
 
 	PR sanitizer/92154
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
index e85aaf51928..5c720b2e700 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -1147,12 +1147,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
-#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
-    !defined(__arm__)
-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
-/* On Arm glibc 2.31 and later provide a different mode field, this field is
-   never used by libsanitizer so we can simply ignore this assert for all glibc
-   versions.  */
+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
+   on many architectures.  */
 CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
 #endif
 
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
index 4d11d071776..9c1429623ab 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -210,26 +210,13 @@ namespace __sanitizer {
     u64 __unused1;
     u64 __unused2;
 #elif defined(__sparc__)
-#if defined(__arch64__)
     unsigned mode;
-    unsigned short __pad1;
-#else
-    unsigned short __pad1;
-    unsigned short mode;
     unsigned short __pad2;
-#endif
     unsigned short __seq;
     unsigned long long __unused1;
     unsigned long long __unused2;
-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
-    unsigned int mode;
-    unsigned short __seq;
-    unsigned short __pad1;
-    unsigned long __unused1;
-    unsigned long __unused2;
 #else
-    unsigned short mode;
-    unsigned short __pad1;
+    unsigned int mode;
     unsigned short __seq;
     unsigned short __pad2;
 #if defined(__x86_64__) && !defined(_LP64)