[PATCH] D21285: [sanitizer] Revert new GLIBC msghdr/cmsghdr definitions

[Adhemerval Zanella via llvm-commits]

zatrazz created this revision.
zatrazz added reviewers: samsonov, pcc, dvyukov, eugenis.
zatrazz added subscribers: rengolin, llvm-commits.
zatrazz set the repository for this revision to rL LLVM.
zatrazz added a project: Sanitizers.
Herald added a subscriber: kubabrecka.

GLIBC reverted the POSIX conformance changes for msghdr/cmsghdr [1],
so there is no need to provide the um sanitizers.

[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=78880cc185dc521855a58001a28e3059722d8e85

Repository:
  rL LLVM

http://reviews.llvm.org/D21285

Files:
  lib/sanitizer_common/sanitizer_platform_limits_posix.h

Index: lib/sanitizer_common/sanitizer_platform_limits_posix.h
===================================================================
--- lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -415,49 +415,6 @@
     int cmsg_type;
   };
 #else
-# ifndef __GLIBC_PREREQ
-# define __GLIBC_PREREQ(x, y) 0
-# endif
-// GLIBC 2.24 follows msghdr and cmsghdr POSIX definition for internal
-// member size and adds padding where required.
-# if __GLIBC_PREREQ(2, 24) && defined(_LP64)
-#  if __BYTE_ORDER == __BIG_ENDIAN
-  struct __sanitizer_msghdr {
-    void *msg_name;
-    unsigned msg_namelen;
-    struct __sanitizer_iovec *msg_iov;
-    int __padding1;
-    unsigned msg_iovlen;
-    void *msg_control;
-    int __padding2;
-    unsigned msg_controllen;
-    int msg_flags;
-  };
-  struct __sanitizer_cmsghdr {
-    uptr cmsg_len;
-    int cmsg_level;
-    int cmsg_type;
-  };
-#  else
-  struct __sanitizer_msghdr {
-    void *msg_name;
-    unsigned msg_namelen;
-    struct __sanitizer_iovec *msg_iov;
-    int msg_iovlen;
-    int __padding1;
-    void *msg_control;
-    int msg_controllen;
-    int __padding2;
-    int msg_flags;
-  };
-  struct __sanitizer_cmsghdr {
-    unsigned cmsg_len;
-    int __padding1;
-    int cmsg_level;
-    int cmsg_type;
-  };
-#  endif // __BYTE_ORDER == __BIG_ENDIAN
-# else
   struct __sanitizer_msghdr {
     void *msg_name;
     unsigned msg_namelen;
@@ -472,7 +429,6 @@
     int cmsg_level;
     int cmsg_type;
   };
-# endif // __GLIBC_PREREQ (2, 24) && __WORDSIZE == 64
 #endif
 
 #if SANITIZER_MAC


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D21285.60510.patch
Type: text/x-patch
Size: 1608 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160613/37da807f/attachment.bin>