Skip to content

Commit 35a8b57

Browse files
committed
Address comments
1 parent 79a2109 commit 35a8b57

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,9 @@ CHECK_SIZE_AND_OFFSET(addrinfo, ai_protocol);
10931093
CHECK_SIZE_AND_OFFSET(addrinfo, ai_addrlen);
10941094
CHECK_SIZE_AND_OFFSET(addrinfo, ai_canonname);
10951095
CHECK_SIZE_AND_OFFSET(addrinfo, ai_addr);
1096+
#if SANITIZER_AIX
1097+
CHECK_SIZE_AND_OFFSET(addrinfo, ai_eflags);
1098+
#endif
10961099

10971100
CHECK_TYPE_SIZE(hostent);
10981101
CHECK_SIZE_AND_OFFSET(hostent, h_name);

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,11 +487,19 @@ struct __sanitizer_msghdr {
487487
struct __sanitizer_iovec *msg_iov;
488488
uptr msg_iovlen;
489489
void *msg_control;
490+
# if !SANITIZER_AIX
490491
uptr msg_controllen;
492+
# else
493+
unsigned msg_controllen;
494+
# endif
491495
int msg_flags;
492496
};
493497
struct __sanitizer_cmsghdr {
498+
# if !SANITIZER_AIX
494499
uptr cmsg_len;
500+
# else
501+
unsigned cmsg_len;
502+
# endif
495503
int cmsg_level;
496504
int cmsg_type;
497505
};
@@ -563,6 +571,8 @@ typedef long __sanitizer_clock_t;
563571
# if SANITIZER_LINUX || SANITIZER_HAIKU
564572
typedef int __sanitizer_clockid_t;
565573
typedef unsigned long long __sanitizer_eventfd_t;
574+
# elif SANITIZER_AIX
575+
typedef int __sanitizer_clockid_t;
566576
# endif
567577

568578
# if SANITIZER_LINUX
@@ -1148,6 +1158,13 @@ extern unsigned fpos_t_sz;
11481158
// when it can not be determined without including any system headers.
11491159
extern const unsigned IOCTL_NOT_PRESENT;
11501160

1161+
// On AIX, some variables are unsigned long types.
1162+
#if SANITIZER_AIX
1163+
using ioctl_alttype = uptr;
1164+
#else
1165+
using ioctl_alttype = unsigned;
1166+
#endif
1167+
11511168
extern ioctl_alttype IOCTL_FIOASYNC;
11521169
extern unsigned IOCTL_FIOCLEX;
11531170
extern unsigned IOCTL_FIOGETOWN;

compiler-rt/lib/sanitizer_common/sanitizer_posix.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#if SANITIZER_FREEBSD || SANITIZER_AIX
3131
// The MAP_NORESERVE define has been removed in FreeBSD 11.x, and even before
3232
// that, it was never implemented. So just define it to zero.
33+
// Similarly, AIX does not define MAP_NORESERVE.
3334
#undef MAP_NORESERVE
3435
#define MAP_NORESERVE 0
3536
#endif

0 commit comments

Comments
 (0)