maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[sanitizer] Attempt to fix Android build. 

llvm-svn: 200547
This commit is contained in:
Sergey Matveev 2014-01-31 14:28:32 +00:00
parent 66e2b70e59
commit dffda4cfec
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
compiler-rt/lib/msan/lit_tests/ioctl_sound.cc → compiler-rt/lib/msan/lit_tests/Linux/ioctl_sound.cc
View File

4
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
View File

@ -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));

5
compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
View File

@ -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;

3
compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
View File

@ -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;