Working on reconciling out-of-tree patches to compiler-rt for building for iOS.

[beanz]

Summary

This is one of many changes needed for compiler-rt to get it building on iOS.

This change ifdefs out headers and functionality that aren't available on iOS.

Note: this change does not enable building for iOS, as there are more changes to come.

[beanz]

Looping in Alexander Potapenko because git blame :-).

[beanz]

Adding Kuba and Justin for review.

[samsonov]

lib/sanitizer_common/sanitizer_platform.h

48 ↗

(On Diff #27863)

You also need to define SANITIZER_IOSSIM to 0 here.

lib/sanitizer_common/sanitizer_platform_limits_posix.cc

55 ↗

(On Diff #27863)

Any specific reason to move #include directives down here?

344 ↗

(On Diff #27863)

Where do you get this constant from on iOS?

[beanz]

lib/sanitizer_common/sanitizer_platform_limits_posix.cc

55 ↗

(On Diff #27863)

It was moved down for consistency with how Android and Linux handled special include handling.

344 ↗

(On Diff #27863)

These patches are about making it build, not function. Anna will be working on patches to make it function, but that is outside of what I'm able to handle here.

[beanz]

Updating based on feedback from samsonov.

[samsonov]

lib/sanitizer_common/sanitizer_platform_limits_posix.cc

55 ↗

(On Diff #27863)

Fine. Hope it won't break non-iOS platforms because of include order.

344 ↗

(On Diff #27863)

The changes still need to be reasonable. Please either provide the correct value for struct_arpreq_sz on iOS, or remove its declaration from header on iOS.

[beanz]

lib/sanitizer_common/sanitizer_platform_limits_posix.cc

344 ↗

(On Diff #27863)

The value is only ever used on Linux, is there a reason not to move it into the #if SANITIZER_LINUX block in the header and source?

[beanz]

Updating based on feedback from samsonov.

[samsonov]

LGTM

lib/sanitizer_common/sanitizer_platform.h

41 ↗

(On Diff #28277)

Can this be #defined together with TARGET_OS_IPHONE?

[beanz]

lib/sanitizer_common/sanitizer_platform.h

41 ↗

(On Diff #28277)

Yes. TARGET_OS_IPHONE is always 1 when TARGET_IPHONE_SIMULATOR is 1.

The iOS simulator platform conditionals are designed to be additive on top of the OS.

compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform.h

 #if defined(__APPLE__)
 # define SANITIZER_MAC     1
 # include <TargetConditionals.h>
 # if TARGET_OS_IPHONE
 #  define SANITIZER_IOS    1
 # else
 #  define SANITIZER_IOS    0
 # endif
+# if TARGET_IPHONE_SIMULATOR
+#  define SANITIZER_IOSSIM 1
+# else
+#  define SANITIZER_IOSSIM 0
+# endif
 #else
 # define SANITIZER_MAC     0
 # define SANITIZER_IOS     0
+# define SANITIZER_IOSSIM  0
 #endif
 
 #if defined(_WIN32)
 # define SANITIZER_WINDOWS 1
 #else
 # define SANITIZER_WINDOWS 0
 #endif
 

compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h

 #define EVIOC_EV_MAX 0x1f
 #define EVIOC_ABS_MAX 0x3f
 
 #define IOC_DIR(nr) (((nr) >> IOC_DIRSHIFT) & IOC_DIRMASK)
 #define IOC_TYPE(nr) (((nr) >> IOC_TYPESHIFT) & IOC_TYPEMASK)
 #define IOC_NR(nr) (((nr) >> IOC_NRSHIFT) & IOC_NRMASK)
 #define IOC_SIZE(nr) (((nr) >> IOC_SIZESHIFT) & IOC_SIZEMASK)
 
-  extern unsigned struct_arpreq_sz;
   extern unsigned struct_ifreq_sz;
   extern unsigned struct_termios_sz;
   extern unsigned struct_winsize_sz;
 
 #if SANITIZER_LINUX
+  extern unsigned struct_arpreq_sz;
   extern unsigned struct_cdrom_msf_sz;
   extern unsigned struct_cdrom_multisession_sz;
   extern unsigned struct_cdrom_read_audio_sz;
   extern unsigned struct_cdrom_subchnl_sz;
   extern unsigned struct_cdrom_ti_sz;
   extern unsigned struct_cdrom_tocentry_sz;
   extern unsigned struct_cdrom_tochdr_sz;
   extern unsigned struct_cdrom_volctrl_sz;

compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

 #include <sys/socketvar.h>
 #endif
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <errno.h>
 #include <grp.h>
 #include <limits.h>
 #include <net/if.h>
-#include <net/if_arp.h>
-#include <net/route.h>
 #include <netdb.h>
 #include <poll.h>
 #include <pthread.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stddef.h>
 #include <sys/mman.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/times.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <termios.h>
 #include <time.h>
 #include <wchar.h>
 
+#if !SANITIZER_IOS
+#include <net/route.h>
+#endif
+
 #if !SANITIZER_ANDROID
 #include <sys/mount.h>
 #include <sys/timeb.h>
 #endif
 
 #if SANITIZER_LINUX
 #include <malloc.h>
 #include <mntent.h>
 #include <netinet/ether.h>
 #include <sys/sysinfo.h>
 #include <sys/vt.h>
 #include <linux/cdrom.h>
 #include <linux/fd.h>
 #include <linux/fs.h>
 #include <linux/hdreg.h>
 #include <linux/input.h>
 #include <linux/ioctl.h>
 #include <linux/soundcard.h>
 #include <linux/sysctl.h>
 #include <linux/utsname.h>
 #include <linux/posix_types.h>
+#include <net/if_arp.h>
 #endif
 
 #if SANITIZER_FREEBSD
 # include <sys/mount.h>
 # include <sys/sockio.h>
 # include <sys/socket.h>
 # include <sys/filio.h>
 # include <sys/signal.h>
#else
   int ptrace_getregset = -1;
   int ptrace_setregset = -1;
 #endif  // PTRACE_GETREGSET/PTRACE_SETREGSET
 #endif
 
   unsigned path_max = PATH_MAX;
 
   // ioctl arguments
-  unsigned struct_arpreq_sz = sizeof(struct arpreq);
   unsigned struct_ifreq_sz = sizeof(struct ifreq);
   unsigned struct_termios_sz = sizeof(struct termios);
   unsigned struct_winsize_sz = sizeof(struct winsize);
 
 #if SANITIZER_LINUX
+  unsigned struct_arpreq_sz = sizeof(struct arpreq);
   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
   unsigned struct_cdrom_read_audio_sz = sizeof(struct cdrom_read_audio);
   unsigned struct_cdrom_subchnl_sz = sizeof(struct cdrom_subchnl);
   unsigned struct_cdrom_ti_sz = sizeof(struct cdrom_ti);
   unsigned struct_cdrom_tocentry_sz = sizeof(struct cdrom_tocentry);
   unsigned struct_cdrom_tochdr_sz = sizeof(struct cdrom_tochdr);
   unsigned struct_cdrom_volctrl_sz = sizeof(struct cdrom_volctrl);