[sanitizer] Attempt to fix Android build.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@200547 91177308-0d34-0410-b5e6-96231b3b80d8
rust-lang · Jan 31, 2014 · 9968a9f · 9968a9f
1 parent 01b385f
commit 9968a9f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/lib/msan/lit_tests/ioctl_sound.cc → lib/msan/lit_tests/Linux/ioctl_sound.cc b/lib/msan/lit_tests/ioctl_sound.cc → lib/msan/lit_tests/Linux/ioctl_sound.cc
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
@@ -356,7 +356,9 @@ static void ioctl_table_fill() {
   _(VT_SENDSIG, NONE, 0);
   _(VT_SETMODE, READ, struct_vt_mode_sz);
   _(VT_WAITACTIVE, NONE, 0);
+#endif
 
+#if SANITIZER_LINUX && !SANITIZER_ANDROID
   // <sound/asound.h>. READWRITE is used correctly in this group.
   _(SNDRV_HWDEP_IOCTL_PVERSION, WRITE, sizeof(int))
   _(SNDRV_HWDEP_IOCTL_INFO, WRITE, struct_snd_hwdep_info_sz)
@@ -479,9 +481,7 @@ static void ioctl_table_fill() {
   _(SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES, NONE, 0)
   _(SNDRV_EMUX_IOCTL_MEM_AVAIL, READ, sizeof(int))
   _(SNDRV_EMUX_IOCTL_MISC_MODE, READWRITE, struct_snd_emux_misc_mode_sz)
-#endif
 
-#if SANITIZER_LINUX && !SANITIZER_ANDROID
   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
   _(CYGETDEFTHRESH, WRITE, sizeof(int));
   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));

diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -119,7 +119,7 @@
 #include <sys/sockio.h>
 #endif
 
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX && !SANITIZER_ANDROID
 #include <sound/asound.h>
 #include <sound/asound_fm.h>
 #include <sound/hdsp.h>
@@ -825,8 +825,7 @@ namespace __sanitizer {
   unsigned IOCTL_TIOCSERGETMULTI = TIOCSERGETMULTI;
   unsigned IOCTL_TIOCSERSETMULTI = TIOCSERSETMULTI;
   unsigned IOCTL_TIOCSSERIAL = TIOCSSERIAL;
-#endif
-#if SANITIZER_LINUX
+
   unsigned IOCTL_SNDRV_HWDEP_IOCTL_PVERSION = SNDRV_HWDEP_IOCTL_PVERSION;
   unsigned IOCTL_SNDRV_HWDEP_IOCTL_INFO = SNDRV_HWDEP_IOCTL_INFO;
   unsigned IOCTL_SNDRV_HWDEP_IOCTL_DSP_STATUS = SNDRV_HWDEP_IOCTL_DSP_STATUS;

diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -1055,8 +1055,7 @@ namespace __sanitizer {
   extern unsigned IOCTL_TIOCSERGETMULTI;
   extern unsigned IOCTL_TIOCSERSETMULTI;
   extern unsigned IOCTL_TIOCSSERIAL;
-#endif
-#if SANITIZER_LINUX
+
   extern unsigned IOCTL_SNDRV_HWDEP_IOCTL_PVERSION;
   extern unsigned IOCTL_SNDRV_HWDEP_IOCTL_INFO;
   extern unsigned IOCTL_SNDRV_HWDEP_IOCTL_DSP_STATUS;