[compiler-rt] r188369 - [sanitizer] Split platform_limits_posix into system- and kernel-dependent parts.

Chandler Carruth chandlerc at google.com
Sun Aug 18 01:49:28 PDT 2013


Sorry Evgeniy, but I needed to revert this patch in r188628.

It doesn't build for me on Linux -- it can't portably. The type
__kernel_sa_family_t was added to the installed header linux/socket.h in
version 3.1 based on my research. I don't know enough about how to code
against the kernel interface to suggest how to portably structure this
stuff, but the old versioned seem to work.

Your commit message doesn't explain why there is this new code here. I feel
like you've conflated a bunch of work that would be better as independent
patches -- first one to split the code without changing it. Then separate
patches to restructure stuff -- one for the ioctl stuff you mention, one
for the socket types that weren't mentioned but seem likely to be the cause
of my build break. That would make it easier to debug what exactly goes
wrong on different platforms.

-Chandler


On Wed, Aug 14, 2013 at 6:34 AM, Evgeniy Stepanov <eugeni.stepanov at gmail.com
> wrote:

> Author: eugenis
> Date: Wed Aug 14 08:34:14 2013
> New Revision: 188369
>
> URL: http://llvm.org/viewvc/llvm-project?rev=188369&view=rev
> Log:
> [sanitizer] Split platform_limits_posix into system- and kernel-dependent
> parts.
>
> This change moves everything depending on kernel headers (mostly ioctl
> types
> and ids) into a separate source file. This will reduce the possibility of
> header conflict on various platforms (most importantly, older glibc
> versions).
>
> This change also removes 2 deprecated ioctls, and symbolic ids for other
> bunch
> of ambiguous ioctls (i.e. same id is shared by ioctls with different memory
> behavior).
>
> Added:
>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
> (with props)
> Modified:
>     compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt
>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
>
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=188369&r1=188368&r2=188369&view=diff
>
> ==============================================================================
> --- compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt Wed Aug 14
> 08:34:14 2013
> @@ -8,6 +8,7 @@ set(SANITIZER_SOURCES
>    sanitizer_libc.cc
>    sanitizer_linux.cc
>    sanitizer_mac.cc
> +  sanitizer_platform_limits_linux.cc
>    sanitizer_platform_limits_posix.cc
>    sanitizer_posix.cc
>    sanitizer_printf.cc
> @@ -53,6 +54,7 @@ set(SANITIZER_HEADERS
>    sanitizer_mutex.h
>    sanitizer_placement_new.h
>    sanitizer_platform_interceptors.h
> +  sanitizer_platform_limits_posix.h
>    sanitizer_procmaps.h
>    sanitizer_quarantine.h
>    sanitizer_report_decorator.h
>
> Modified:
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc?rev=188369&r1=188368&r2=188369&view=diff
>
> ==============================================================================
> ---
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
> (original)
> +++
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
> Wed Aug 14 08:34:14 2013
> @@ -421,8 +421,6 @@ static void ioctl_table_fill() {
>    _(LPSETIRQ, NONE, 0);
>    _(LPTIME, NONE, 0);
>    _(LPWAIT, NONE, 0);
> -  _(MTIOCGETCONFIG, WRITE, struct_mtconfiginfo_sz);
> -  _(MTIOCSETCONFIG, READ, struct_mtconfiginfo_sz);
>    _(PIO_CMAP, NONE, 0);
>    _(PIO_FONT, READ, 8192);
>    _(PIO_SCRNMAP, READ, e_tabsz);
>
> Added:
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc?rev=188369&view=auto
>
> ==============================================================================
> ---
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
> (added)
> +++
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
> Wed Aug 14 08:34:14 2013
> @@ -0,0 +1,525 @@
> +//===-- sanitizer_platform_limits_posix.cc
> --------------------------------===//
> +//
> +//                     The LLVM Compiler Infrastructure
> +//
> +// This file is distributed under the University of Illinois Open Source
> +// License. See LICENSE.TXT for details.
> +//
>
> +//===----------------------------------------------------------------------===//
> +//
> +// This file is a part of Sanitizer common code.
> +//
> +// Sizes and layouts of platform-specific Linux kernel data structures.
>
> +//===----------------------------------------------------------------------===//
> +
> +// Only include headers under <linux/...> in this file.
> +// System includes belong to sanitizer_platform_limits_posix.cc.
> +
> +#include "sanitizer_platform.h"
> +#if SANITIZER_LINUX
> +
> +#include <linux/socket.h>
> +
> +#if !SANITIZER_ANDROID
> +// Missing from uapi kernel headers.
> +struct sockaddr {
> +  __kernel_sa_family_t sa_family;
> +  char sa_data[14];
> +};
> +#endif
> +
> +#if SANITIZER_ANDROID
> +// Android has its own quirks.
> +typedef __kernel_time_t time_t;
> +#include <linux/termios.h>
> +#endif
> +
> +#include <linux/ppp_defs.h>
> +
> +#include <linux/cdrom.h>
> +#include <linux/fd.h>
> +#include <linux/fs.h>
> +#include <linux/hdreg.h>
> +#include <linux/if.h>
> +#include <linux/if_ppp.h>
> +#include <linux/in.h>
> +#include <linux/in6.h>
> +#include <linux/input.h>
> +#include <linux/ioctl.h>
> +#include <linux/ipx.h>
> +#include <linux/kd.h>
> +#include <linux/mtio.h>
> +#include <linux/route.h>
> +#include <linux/soundcard.h>
> +#include <linux/vt.h>
> +
> +#if !SANITIZER_ANDROID
> +#include <linux/ax25.h>
> +#include <linux/cyclades.h>
> +#include <linux/if_eql.h>
> +#include <linux/if_plip.h>
> +#include <linux/lp.h>
> +#include <linux/mroute.h>
> +#include <linux/mroute6.h>
> +#include <linux/scc.h>
> +#include <linux/serial.h>
> +// This one is not a kernel header, but we need it for SCSI ioctl
> constants.
> +#include <scsi/scsi.h>
> +#endif
> +
> +namespace __sanitizer {
> +
> +  int e_tabsz = (int)E_TABSZ;
> +
> +  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);
> +#if SOUND_VERSION >= 0x040000
> +  unsigned struct_copr_buffer_sz = 0;
> +  unsigned struct_copr_debug_buf_sz = 0;
> +  unsigned struct_copr_msg_sz = 0;
> +#else
> +  unsigned struct_copr_buffer_sz = sizeof(struct copr_buffer);
> +  unsigned struct_copr_debug_buf_sz = sizeof(struct copr_debug_buf);
> +  unsigned struct_copr_msg_sz = sizeof(struct copr_msg);
> +#endif
> +  unsigned struct_ff_effect_sz = sizeof(struct ff_effect);
> +  unsigned struct_floppy_drive_params_sz = sizeof(struct
> floppy_drive_params);
> +  unsigned struct_floppy_drive_struct_sz = sizeof(struct
> floppy_drive_struct);
> +  unsigned struct_floppy_fdc_state_sz = sizeof(struct floppy_fdc_state);
> +  unsigned struct_floppy_max_errors_sz = sizeof(struct floppy_max_errors);
> +  unsigned struct_floppy_raw_cmd_sz = sizeof(struct floppy_raw_cmd);
> +  unsigned struct_floppy_struct_sz = sizeof(struct floppy_struct);
> +  unsigned struct_floppy_write_errors_sz = sizeof(struct
> floppy_write_errors);
> +  unsigned struct_format_descr_sz = sizeof(struct format_descr);
> +  unsigned struct_hd_driveid_sz = sizeof(struct hd_driveid);
> +  unsigned struct_hd_geometry_sz = sizeof(struct hd_geometry);
> +  unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo);
> +  unsigned struct_input_id_sz = sizeof(struct input_id);
> +  unsigned struct_midi_info_sz = sizeof(struct midi_info);
> +  unsigned struct_mtget_sz = sizeof(struct mtget);
> +  unsigned struct_mtop_sz = sizeof(struct mtop);
> +  unsigned struct_mtpos_sz = sizeof(struct mtpos);
> +  unsigned struct_rtentry_sz = sizeof(struct rtentry);
> +  unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument);
> +  unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
> +  unsigned struct_synth_info_sz = sizeof(struct synth_info);
> +  unsigned struct_termio_sz = sizeof(struct termio);
> +  unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
> +  unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
> +  unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
> +  unsigned struct_vt_stat_sz = sizeof(struct vt_stat);
> +
> +#if !SANITIZER_ANDROID
> +  unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
> +  unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
> +#if EV_VERSION > (0x010000)
> +  unsigned struct_input_keymap_entry_sz = sizeof(struct
> input_keymap_entry);
> +#else
> +  unsigned struct_input_keymap_entry_sz = 0;
> +#endif
> +  unsigned struct_ipx_config_data_sz = sizeof(struct ipx_config_data);
> +  unsigned struct_kbdiacrs_sz = sizeof(struct kbdiacrs);
> +  unsigned struct_kbentry_sz = sizeof(struct kbentry);
> +  unsigned struct_kbkeycode_sz = sizeof(struct kbkeycode);
> +  unsigned struct_kbsentry_sz = sizeof(struct kbsentry);
> +  unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
> +  unsigned struct_scc_modem_sz = sizeof(struct scc_modem);
> +  unsigned struct_scc_stat_sz = sizeof(struct scc_stat);
> +  unsigned struct_serial_multiport_struct_sz
> +      = sizeof(struct serial_multiport_struct);
> +  unsigned struct_serial_struct_sz = sizeof(struct serial_struct);
> +  unsigned struct_sockaddr_ax25_sz = sizeof(struct sockaddr_ax25);
> +  unsigned struct_unimapdesc_sz = sizeof(struct unimapdesc);
> +  unsigned struct_unimapinit_sz = sizeof(struct unimapinit);
> +#endif
> +
> +  // These two are also present on Mac, but defined in a different header.
> +#if !SANITIZER_ANDROID
> +  unsigned struct_sioc_sg_req_sz = sizeof(struct sioc_sg_req);
> +  unsigned struct_sioc_vif_req_sz = sizeof(struct sioc_vif_req);
> +#endif
> +
> +#if !SANITIZER_ANDROID
> +  unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT;
> +  unsigned IOCTL_SIOCGETVIFCNT = SIOCGETVIFCNT;
> +#endif
> +
> +  unsigned IOCTL_EVIOCGABS = EVIOCGABS(0);
> +  unsigned IOCTL_EVIOCGBIT = EVIOCGBIT(0, 0);
> +  unsigned IOCTL_EVIOCGEFFECTS = EVIOCGEFFECTS;
> +  unsigned IOCTL_EVIOCGID = EVIOCGID;
> +  unsigned IOCTL_EVIOCGKEY = EVIOCGKEY(0);
> +  unsigned IOCTL_EVIOCGKEYCODE = EVIOCGKEYCODE;
> +  unsigned IOCTL_EVIOCGLED = EVIOCGLED(0);
> +  unsigned IOCTL_EVIOCGNAME = EVIOCGNAME(0);
> +  unsigned IOCTL_EVIOCGPHYS = EVIOCGPHYS(0);
> +  unsigned IOCTL_EVIOCGRAB = EVIOCGRAB;
> +  unsigned IOCTL_EVIOCGREP = EVIOCGREP;
> +  unsigned IOCTL_EVIOCGSND = EVIOCGSND(0);
> +  unsigned IOCTL_EVIOCGSW = EVIOCGSW(0);
> +  unsigned IOCTL_EVIOCGUNIQ = EVIOCGUNIQ(0);
> +  unsigned IOCTL_EVIOCGVERSION = EVIOCGVERSION;
> +  unsigned IOCTL_EVIOCRMFF = EVIOCRMFF;
> +  unsigned IOCTL_EVIOCSABS = EVIOCSABS(0);
> +  unsigned IOCTL_EVIOCSFF = EVIOCSFF;
> +  unsigned IOCTL_EVIOCSKEYCODE = EVIOCSKEYCODE;
> +  unsigned IOCTL_EVIOCSREP = EVIOCSREP;
> +  unsigned IOCTL_BLKFLSBUF = BLKFLSBUF;
> +  unsigned IOCTL_BLKGETSIZE = BLKGETSIZE;
> +  unsigned IOCTL_BLKRAGET = BLKRAGET;
> +  unsigned IOCTL_BLKRASET = BLKRASET;
> +  unsigned IOCTL_BLKROGET = BLKROGET;
> +  unsigned IOCTL_BLKROSET = BLKROSET;
> +  unsigned IOCTL_BLKRRPART = BLKRRPART;
> +  unsigned IOCTL_CDROMAUDIOBUFSIZ = CDROMAUDIOBUFSIZ;
> +  unsigned IOCTL_CDROMEJECT = CDROMEJECT;
> +  unsigned IOCTL_CDROMEJECT_SW = CDROMEJECT_SW;
> +  unsigned IOCTL_CDROMMULTISESSION = CDROMMULTISESSION;
> +  unsigned IOCTL_CDROMPAUSE = CDROMPAUSE;
> +  unsigned IOCTL_CDROMPLAYMSF = CDROMPLAYMSF;
> +  unsigned IOCTL_CDROMPLAYTRKIND = CDROMPLAYTRKIND;
> +  unsigned IOCTL_CDROMREADAUDIO = CDROMREADAUDIO;
> +  unsigned IOCTL_CDROMREADCOOKED = CDROMREADCOOKED;
> +  unsigned IOCTL_CDROMREADMODE1 = CDROMREADMODE1;
> +  unsigned IOCTL_CDROMREADMODE2 = CDROMREADMODE2;
> +  unsigned IOCTL_CDROMREADRAW = CDROMREADRAW;
> +  unsigned IOCTL_CDROMREADTOCENTRY = CDROMREADTOCENTRY;
> +  unsigned IOCTL_CDROMREADTOCHDR = CDROMREADTOCHDR;
> +  unsigned IOCTL_CDROMRESET = CDROMRESET;
> +  unsigned IOCTL_CDROMRESUME = CDROMRESUME;
> +  unsigned IOCTL_CDROMSEEK = CDROMSEEK;
> +  unsigned IOCTL_CDROMSTART = CDROMSTART;
> +  unsigned IOCTL_CDROMSTOP = CDROMSTOP;
> +  unsigned IOCTL_CDROMSUBCHNL = CDROMSUBCHNL;
> +  unsigned IOCTL_CDROMVOLCTRL = CDROMVOLCTRL;
> +  unsigned IOCTL_CDROMVOLREAD = CDROMVOLREAD;
> +  unsigned IOCTL_CDROM_GET_UPC = CDROM_GET_UPC;
> +  unsigned IOCTL_FDCLRPRM = FDCLRPRM;
> +  unsigned IOCTL_FDDEFPRM = FDDEFPRM;
> +  unsigned IOCTL_FDFLUSH = FDFLUSH;
> +  unsigned IOCTL_FDFMTBEG = FDFMTBEG;
> +  unsigned IOCTL_FDFMTEND = FDFMTEND;
> +  unsigned IOCTL_FDFMTTRK = FDFMTTRK;
> +  unsigned IOCTL_FDGETDRVPRM = FDGETDRVPRM;
> +  unsigned IOCTL_FDGETDRVSTAT = FDGETDRVSTAT;
> +  unsigned IOCTL_FDGETDRVTYP = FDGETDRVTYP;
> +  unsigned IOCTL_FDGETFDCSTAT = FDGETFDCSTAT;
> +  unsigned IOCTL_FDGETMAXERRS = FDGETMAXERRS;
> +  unsigned IOCTL_FDGETPRM = FDGETPRM;
> +  unsigned IOCTL_FDMSGOFF = FDMSGOFF;
> +  unsigned IOCTL_FDMSGON = FDMSGON;
> +  unsigned IOCTL_FDPOLLDRVSTAT = FDPOLLDRVSTAT;
> +  unsigned IOCTL_FDRAWCMD = FDRAWCMD;
> +  unsigned IOCTL_FDRESET = FDRESET;
> +  unsigned IOCTL_FDSETDRVPRM = FDSETDRVPRM;
> +  unsigned IOCTL_FDSETEMSGTRESH = FDSETEMSGTRESH;
> +  unsigned IOCTL_FDSETMAXERRS = FDSETMAXERRS;
> +  unsigned IOCTL_FDSETPRM = FDSETPRM;
> +  unsigned IOCTL_FDTWADDLE = FDTWADDLE;
> +  unsigned IOCTL_FDWERRORCLR = FDWERRORCLR;
> +  unsigned IOCTL_FDWERRORGET = FDWERRORGET;
> +  unsigned IOCTL_HDIO_DRIVE_CMD = HDIO_DRIVE_CMD;
> +  unsigned IOCTL_HDIO_GETGEO = HDIO_GETGEO;
> +  unsigned IOCTL_HDIO_GET_32BIT = HDIO_GET_32BIT;
> +  unsigned IOCTL_HDIO_GET_DMA = HDIO_GET_DMA;
> +  unsigned IOCTL_HDIO_GET_IDENTITY = HDIO_GET_IDENTITY;
> +  unsigned IOCTL_HDIO_GET_KEEPSETTINGS = HDIO_GET_KEEPSETTINGS;
> +  unsigned IOCTL_HDIO_GET_MULTCOUNT = HDIO_GET_MULTCOUNT;
> +  unsigned IOCTL_HDIO_GET_NOWERR = HDIO_GET_NOWERR;
> +  unsigned IOCTL_HDIO_GET_UNMASKINTR = HDIO_GET_UNMASKINTR;
> +  unsigned IOCTL_HDIO_SET_32BIT = HDIO_SET_32BIT;
> +  unsigned IOCTL_HDIO_SET_DMA = HDIO_SET_DMA;
> +  unsigned IOCTL_HDIO_SET_KEEPSETTINGS = HDIO_SET_KEEPSETTINGS;
> +  unsigned IOCTL_HDIO_SET_MULTCOUNT = HDIO_SET_MULTCOUNT;
> +  unsigned IOCTL_HDIO_SET_NOWERR = HDIO_SET_NOWERR;
> +  unsigned IOCTL_HDIO_SET_UNMASKINTR = HDIO_SET_UNMASKINTR;
> +  unsigned IOCTL_MTIOCGET = MTIOCGET;
> +  unsigned IOCTL_MTIOCPOS = MTIOCPOS;
> +  unsigned IOCTL_MTIOCTOP = MTIOCTOP;
> +  unsigned IOCTL_PPPIOCGASYNCMAP = PPPIOCGASYNCMAP;
> +  unsigned IOCTL_PPPIOCGDEBUG = PPPIOCGDEBUG;
> +  unsigned IOCTL_PPPIOCGFLAGS = PPPIOCGFLAGS;
> +  unsigned IOCTL_PPPIOCGUNIT = PPPIOCGUNIT;
> +  unsigned IOCTL_PPPIOCGXASYNCMAP = PPPIOCGXASYNCMAP;
> +  unsigned IOCTL_PPPIOCSASYNCMAP = PPPIOCSASYNCMAP;
> +  unsigned IOCTL_PPPIOCSDEBUG = PPPIOCSDEBUG;
> +  unsigned IOCTL_PPPIOCSFLAGS = PPPIOCSFLAGS;
> +  unsigned IOCTL_PPPIOCSMAXCID = PPPIOCSMAXCID;
> +  unsigned IOCTL_PPPIOCSMRU = PPPIOCSMRU;
> +  unsigned IOCTL_PPPIOCSXASYNCMAP = PPPIOCSXASYNCMAP;
> +  unsigned IOCTL_SIOCADDRT = SIOCADDRT;
> +  unsigned IOCTL_SIOCDARP = SIOCDARP;
> +  unsigned IOCTL_SIOCDELRT = SIOCDELRT;
> +  unsigned IOCTL_SIOCDRARP = SIOCDRARP;
> +  unsigned IOCTL_SIOCGARP = SIOCGARP;
> +  unsigned IOCTL_SIOCGIFENCAP = SIOCGIFENCAP;
> +  unsigned IOCTL_SIOCGIFHWADDR = SIOCGIFHWADDR;
> +  unsigned IOCTL_SIOCGIFMAP = SIOCGIFMAP;
> +  unsigned IOCTL_SIOCGIFMEM = SIOCGIFMEM;
> +  unsigned IOCTL_SIOCGIFNAME = SIOCGIFNAME;
> +  unsigned IOCTL_SIOCGIFSLAVE = SIOCGIFSLAVE;
> +  unsigned IOCTL_SIOCGRARP = SIOCGRARP;
> +  unsigned IOCTL_SIOCGSTAMP = SIOCGSTAMP;
> +  unsigned IOCTL_SIOCSARP = SIOCSARP;
> +  unsigned IOCTL_SIOCSIFENCAP = SIOCSIFENCAP;
> +  unsigned IOCTL_SIOCSIFHWADDR = SIOCSIFHWADDR;
> +  unsigned IOCTL_SIOCSIFLINK = SIOCSIFLINK;
> +  unsigned IOCTL_SIOCSIFMAP = SIOCSIFMAP;
> +  unsigned IOCTL_SIOCSIFMEM = SIOCSIFMEM;
> +  unsigned IOCTL_SIOCSIFSLAVE = SIOCSIFSLAVE;
> +  unsigned IOCTL_SIOCSRARP = SIOCSRARP;
> +#if SOUND_VERSION >= 0x040000
> +  unsigned IOCTL_SNDCTL_COPR_HALT = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SNDCTL_COPR_LOAD = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SNDCTL_COPR_RCODE = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SNDCTL_COPR_RCVMSG = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SNDCTL_COPR_RDATA = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SNDCTL_COPR_RESET = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SNDCTL_COPR_RUN = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SNDCTL_COPR_SENDMSG = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SNDCTL_COPR_WCODE = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SNDCTL_COPR_WDATA = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SOUND_PCM_READ_BITS = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SOUND_PCM_READ_CHANNELS = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SOUND_PCM_READ_FILTER = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SOUND_PCM_READ_RATE = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SOUND_PCM_WRITE_CHANNELS = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_SOUND_PCM_WRITE_FILTER = IOCTL_NOT_PRESENT;
> +#else
> +  unsigned IOCTL_SNDCTL_COPR_HALT = SNDCTL_COPR_HALT;
> +  unsigned IOCTL_SNDCTL_COPR_LOAD = SNDCTL_COPR_LOAD;
> +  unsigned IOCTL_SNDCTL_COPR_RCODE = SNDCTL_COPR_RCODE;
> +  unsigned IOCTL_SNDCTL_COPR_RCVMSG = SNDCTL_COPR_RCVMSG;
> +  unsigned IOCTL_SNDCTL_COPR_RDATA = SNDCTL_COPR_RDATA;
> +  unsigned IOCTL_SNDCTL_COPR_RESET = SNDCTL_COPR_RESET;
> +  unsigned IOCTL_SNDCTL_COPR_RUN = SNDCTL_COPR_RUN;
> +  unsigned IOCTL_SNDCTL_COPR_SENDMSG = SNDCTL_COPR_SENDMSG;
> +  unsigned IOCTL_SNDCTL_COPR_WCODE = SNDCTL_COPR_WCODE;
> +  unsigned IOCTL_SNDCTL_COPR_WDATA = SNDCTL_COPR_WDATA;
> +  unsigned IOCTL_SOUND_PCM_READ_BITS = SOUND_PCM_READ_BITS;
> +  unsigned IOCTL_SOUND_PCM_READ_CHANNELS = SOUND_PCM_READ_CHANNELS;
> +  unsigned IOCTL_SOUND_PCM_READ_FILTER = SOUND_PCM_READ_FILTER;
> +  unsigned IOCTL_SOUND_PCM_READ_RATE = SOUND_PCM_READ_RATE;
> +  unsigned IOCTL_SOUND_PCM_WRITE_CHANNELS = SOUND_PCM_WRITE_CHANNELS;
> +  unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER;
> +#endif
> +  unsigned IOCTL_SNDCTL_DSP_GETBLKSIZE = SNDCTL_DSP_GETBLKSIZE;
> +  unsigned IOCTL_SNDCTL_DSP_GETFMTS = SNDCTL_DSP_GETFMTS;
> +  unsigned IOCTL_SNDCTL_DSP_NONBLOCK = SNDCTL_DSP_NONBLOCK;
> +  unsigned IOCTL_SNDCTL_DSP_POST = SNDCTL_DSP_POST;
> +  unsigned IOCTL_SNDCTL_DSP_RESET = SNDCTL_DSP_RESET;
> +  unsigned IOCTL_SNDCTL_DSP_SETFMT = SNDCTL_DSP_SETFMT;
> +  unsigned IOCTL_SNDCTL_DSP_SETFRAGMENT = SNDCTL_DSP_SETFRAGMENT;
> +  unsigned IOCTL_SNDCTL_DSP_SPEED = SNDCTL_DSP_SPEED;
> +  unsigned IOCTL_SNDCTL_DSP_STEREO = SNDCTL_DSP_STEREO;
> +  unsigned IOCTL_SNDCTL_DSP_SUBDIVIDE = SNDCTL_DSP_SUBDIVIDE;
> +  unsigned IOCTL_SNDCTL_DSP_SYNC = SNDCTL_DSP_SYNC;
> +  unsigned IOCTL_SNDCTL_FM_4OP_ENABLE = SNDCTL_FM_4OP_ENABLE;
> +  unsigned IOCTL_SNDCTL_FM_LOAD_INSTR = SNDCTL_FM_LOAD_INSTR;
> +  unsigned IOCTL_SNDCTL_MIDI_INFO = SNDCTL_MIDI_INFO;
> +  unsigned IOCTL_SNDCTL_MIDI_PRETIME = SNDCTL_MIDI_PRETIME;
> +  unsigned IOCTL_SNDCTL_SEQ_CTRLRATE = SNDCTL_SEQ_CTRLRATE;
> +  unsigned IOCTL_SNDCTL_SEQ_GETINCOUNT = SNDCTL_SEQ_GETINCOUNT;
> +  unsigned IOCTL_SNDCTL_SEQ_GETOUTCOUNT = SNDCTL_SEQ_GETOUTCOUNT;
> +  unsigned IOCTL_SNDCTL_SEQ_NRMIDIS = SNDCTL_SEQ_NRMIDIS;
> +  unsigned IOCTL_SNDCTL_SEQ_NRSYNTHS = SNDCTL_SEQ_NRSYNTHS;
> +  unsigned IOCTL_SNDCTL_SEQ_OUTOFBAND = SNDCTL_SEQ_OUTOFBAND;
> +  unsigned IOCTL_SNDCTL_SEQ_PANIC = SNDCTL_SEQ_PANIC;
> +  unsigned IOCTL_SNDCTL_SEQ_PERCMODE = SNDCTL_SEQ_PERCMODE;
> +  unsigned IOCTL_SNDCTL_SEQ_RESET = SNDCTL_SEQ_RESET;
> +  unsigned IOCTL_SNDCTL_SEQ_RESETSAMPLES = SNDCTL_SEQ_RESETSAMPLES;
> +  unsigned IOCTL_SNDCTL_SEQ_SYNC = SNDCTL_SEQ_SYNC;
> +  unsigned IOCTL_SNDCTL_SEQ_TESTMIDI = SNDCTL_SEQ_TESTMIDI;
> +  unsigned IOCTL_SNDCTL_SEQ_THRESHOLD = SNDCTL_SEQ_THRESHOLD;
> +  unsigned IOCTL_SNDCTL_SYNTH_INFO = SNDCTL_SYNTH_INFO;
> +  unsigned IOCTL_SNDCTL_SYNTH_MEMAVL = SNDCTL_SYNTH_MEMAVL;
> +  unsigned IOCTL_SNDCTL_TMR_CONTINUE = SNDCTL_TMR_CONTINUE;
> +  unsigned IOCTL_SNDCTL_TMR_METRONOME = SNDCTL_TMR_METRONOME;
> +  unsigned IOCTL_SNDCTL_TMR_SELECT = SNDCTL_TMR_SELECT;
> +  unsigned IOCTL_SNDCTL_TMR_SOURCE = SNDCTL_TMR_SOURCE;
> +  unsigned IOCTL_SNDCTL_TMR_START = SNDCTL_TMR_START;
> +  unsigned IOCTL_SNDCTL_TMR_STOP = SNDCTL_TMR_STOP;
> +  unsigned IOCTL_SNDCTL_TMR_TEMPO = SNDCTL_TMR_TEMPO;
> +  unsigned IOCTL_SNDCTL_TMR_TIMEBASE = SNDCTL_TMR_TIMEBASE;
> +  unsigned IOCTL_SOUND_MIXER_READ_ALTPCM = SOUND_MIXER_READ_ALTPCM;
> +  unsigned IOCTL_SOUND_MIXER_READ_BASS = SOUND_MIXER_READ_BASS;
> +  unsigned IOCTL_SOUND_MIXER_READ_CAPS = SOUND_MIXER_READ_CAPS;
> +  unsigned IOCTL_SOUND_MIXER_READ_CD = SOUND_MIXER_READ_CD;
> +  unsigned IOCTL_SOUND_MIXER_READ_DEVMASK = SOUND_MIXER_READ_DEVMASK;
> +  unsigned IOCTL_SOUND_MIXER_READ_ENHANCE = SOUND_MIXER_READ_ENHANCE;
> +  unsigned IOCTL_SOUND_MIXER_READ_IGAIN = SOUND_MIXER_READ_IGAIN;
> +  unsigned IOCTL_SOUND_MIXER_READ_IMIX = SOUND_MIXER_READ_IMIX;
> +  unsigned IOCTL_SOUND_MIXER_READ_LINE = SOUND_MIXER_READ_LINE;
> +  unsigned IOCTL_SOUND_MIXER_READ_LINE1 = SOUND_MIXER_READ_LINE1;
> +  unsigned IOCTL_SOUND_MIXER_READ_LINE2 = SOUND_MIXER_READ_LINE2;
> +  unsigned IOCTL_SOUND_MIXER_READ_LINE3 = SOUND_MIXER_READ_LINE3;
> +  unsigned IOCTL_SOUND_MIXER_READ_LOUD = SOUND_MIXER_READ_LOUD;
> +  unsigned IOCTL_SOUND_MIXER_READ_MIC = SOUND_MIXER_READ_MIC;
> +  unsigned IOCTL_SOUND_MIXER_READ_MUTE = SOUND_MIXER_READ_MUTE;
> +  unsigned IOCTL_SOUND_MIXER_READ_OGAIN = SOUND_MIXER_READ_OGAIN;
> +  unsigned IOCTL_SOUND_MIXER_READ_PCM = SOUND_MIXER_READ_PCM;
> +  unsigned IOCTL_SOUND_MIXER_READ_RECLEV = SOUND_MIXER_READ_RECLEV;
> +  unsigned IOCTL_SOUND_MIXER_READ_RECMASK = SOUND_MIXER_READ_RECMASK;
> +  unsigned IOCTL_SOUND_MIXER_READ_RECSRC = SOUND_MIXER_READ_RECSRC;
> +  unsigned IOCTL_SOUND_MIXER_READ_SPEAKER = SOUND_MIXER_READ_SPEAKER;
> +  unsigned IOCTL_SOUND_MIXER_READ_STEREODEVS =
> SOUND_MIXER_READ_STEREODEVS;
> +  unsigned IOCTL_SOUND_MIXER_READ_SYNTH = SOUND_MIXER_READ_SYNTH;
> +  unsigned IOCTL_SOUND_MIXER_READ_TREBLE = SOUND_MIXER_READ_TREBLE;
> +  unsigned IOCTL_SOUND_MIXER_READ_VOLUME = SOUND_MIXER_READ_VOLUME;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_ALTPCM = SOUND_MIXER_WRITE_ALTPCM;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_BASS = SOUND_MIXER_WRITE_BASS;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_CD = SOUND_MIXER_WRITE_CD;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_ENHANCE = SOUND_MIXER_WRITE_ENHANCE;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_IGAIN = SOUND_MIXER_WRITE_IGAIN;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_IMIX = SOUND_MIXER_WRITE_IMIX;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_LINE = SOUND_MIXER_WRITE_LINE;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_LINE1 = SOUND_MIXER_WRITE_LINE1;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_LINE2 = SOUND_MIXER_WRITE_LINE2;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_LINE3 = SOUND_MIXER_WRITE_LINE3;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_LOUD = SOUND_MIXER_WRITE_LOUD;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_MIC = SOUND_MIXER_WRITE_MIC;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_MUTE = SOUND_MIXER_WRITE_MUTE;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_OGAIN = SOUND_MIXER_WRITE_OGAIN;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_PCM = SOUND_MIXER_WRITE_PCM;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_RECLEV = SOUND_MIXER_WRITE_RECLEV;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_RECSRC = SOUND_MIXER_WRITE_RECSRC;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_SPEAKER = SOUND_MIXER_WRITE_SPEAKER;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_SYNTH = SOUND_MIXER_WRITE_SYNTH;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_TREBLE = SOUND_MIXER_WRITE_TREBLE;
> +  unsigned IOCTL_SOUND_MIXER_WRITE_VOLUME = SOUND_MIXER_WRITE_VOLUME;
> +  unsigned IOCTL_TCFLSH = TCFLSH;
> +  unsigned IOCTL_TCGETA = TCGETA;
> +  unsigned IOCTL_TCGETS = TCGETS;
> +  unsigned IOCTL_TCSBRK = TCSBRK;
> +  unsigned IOCTL_TCSBRKP = TCSBRKP;
> +  unsigned IOCTL_TCSETA = TCSETA;
> +  unsigned IOCTL_TCSETAF = TCSETAF;
> +  unsigned IOCTL_TCSETAW = TCSETAW;
> +  unsigned IOCTL_TCSETS = TCSETS;
> +  unsigned IOCTL_TCSETSF = TCSETSF;
> +  unsigned IOCTL_TCSETSW = TCSETSW;
> +  unsigned IOCTL_TCXONC = TCXONC;
> +  unsigned IOCTL_TIOCGLCKTRMIOS = TIOCGLCKTRMIOS;
> +  unsigned IOCTL_TIOCGSOFTCAR = TIOCGSOFTCAR;
> +  unsigned IOCTL_TIOCINQ = TIOCINQ;
> +  unsigned IOCTL_TIOCLINUX = TIOCLINUX;
> +  unsigned IOCTL_TIOCSERCONFIG = TIOCSERCONFIG;
> +  unsigned IOCTL_TIOCSERGETLSR = TIOCSERGETLSR;
> +  unsigned IOCTL_TIOCSERGWILD = TIOCSERGWILD;
> +  unsigned IOCTL_TIOCSERSWILD = TIOCSERSWILD;
> +  unsigned IOCTL_TIOCSLCKTRMIOS = TIOCSLCKTRMIOS;
> +  unsigned IOCTL_TIOCSSOFTCAR = TIOCSSOFTCAR;
> +  unsigned IOCTL_VT_ACTIVATE = VT_ACTIVATE;
> +  unsigned IOCTL_VT_DISALLOCATE = VT_DISALLOCATE;
> +  unsigned IOCTL_VT_GETMODE = VT_GETMODE;
> +  unsigned IOCTL_VT_GETSTATE = VT_GETSTATE;
> +  unsigned IOCTL_VT_OPENQRY = VT_OPENQRY;
> +  unsigned IOCTL_VT_RELDISP = VT_RELDISP;
> +  unsigned IOCTL_VT_RESIZE = VT_RESIZE;
> +  unsigned IOCTL_VT_RESIZEX = VT_RESIZEX;
> +  unsigned IOCTL_VT_SENDSIG = VT_SENDSIG;
> +  unsigned IOCTL_VT_SETMODE = VT_SETMODE;
> +  unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
> +
> +#if !SANITIZER_ANDROID
> +  unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
> +  unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
> +  unsigned IOCTL_CYGETMON = CYGETMON;
> +  unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
> +  unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
> +  unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
> +  unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
> +  unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
> +  unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
> +  unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
> +  unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
> +  unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
> +  unsigned IOCTL_EQL_GETSLAVECFG = EQL_GETSLAVECFG;
> +  unsigned IOCTL_EQL_SETMASTRCFG = EQL_SETMASTRCFG;
> +  unsigned IOCTL_EQL_SETSLAVECFG = EQL_SETSLAVECFG;
> +#if EV_VERSION > (0x010000)
> +  unsigned IOCTL_EVIOCGKEYCODE_V2 = EVIOCGKEYCODE_V2;
> +  unsigned IOCTL_EVIOCGPROP = EVIOCGPROP(0);
> +  unsigned IOCTL_EVIOCSKEYCODE_V2 = EVIOCSKEYCODE_V2;
> +#else
> +  unsigned IOCTL_EVIOCGKEYCODE_V2 = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
> +  unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
> +#endif
> +  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
> +  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
> +  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
> +  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
> +  unsigned IOCTL_GIO_CMAP = GIO_CMAP;
> +  unsigned IOCTL_GIO_FONT = GIO_FONT;
> +  unsigned IOCTL_GIO_SCRNMAP = GIO_SCRNMAP;
> +  unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
> +  unsigned IOCTL_GIO_UNISCRNMAP = GIO_UNISCRNMAP;
> +  unsigned IOCTL_KDADDIO = KDADDIO;
> +  unsigned IOCTL_KDDELIO = KDDELIO;
> +  unsigned IOCTL_KDDISABIO = KDDISABIO;
> +  unsigned IOCTL_KDENABIO = KDENABIO;
> +  unsigned IOCTL_KDGETKEYCODE = KDGETKEYCODE;
> +  unsigned IOCTL_KDGETLED = KDGETLED;
> +  unsigned IOCTL_KDGETMODE = KDGETMODE;
> +  unsigned IOCTL_KDGKBDIACR = KDGKBDIACR;
> +  unsigned IOCTL_KDGKBENT = KDGKBENT;
> +  unsigned IOCTL_KDGKBLED = KDGKBLED;
> +  unsigned IOCTL_KDGKBMETA = KDGKBMETA;
> +  unsigned IOCTL_KDGKBMODE = KDGKBMODE;
> +  unsigned IOCTL_KDGKBSENT = KDGKBSENT;
> +  unsigned IOCTL_KDGKBTYPE = KDGKBTYPE;
> +  unsigned IOCTL_KDMAPDISP = KDMAPDISP;
> +  unsigned IOCTL_KDMKTONE = KDMKTONE;
> +  unsigned IOCTL_KDSETKEYCODE = KDSETKEYCODE;
> +  unsigned IOCTL_KDSETLED = KDSETLED;
> +  unsigned IOCTL_KDSETMODE = KDSETMODE;
> +  unsigned IOCTL_KDSIGACCEPT = KDSIGACCEPT;
> +  unsigned IOCTL_KDSKBDIACR = KDSKBDIACR;
> +  unsigned IOCTL_KDSKBENT = KDSKBENT;
> +  unsigned IOCTL_KDSKBLED = KDSKBLED;
> +  unsigned IOCTL_KDSKBMETA = KDSKBMETA;
> +  unsigned IOCTL_KDSKBMODE = KDSKBMODE;
> +  unsigned IOCTL_KDSKBSENT = KDSKBSENT;
> +  unsigned IOCTL_KDUNMAPDISP = KDUNMAPDISP;
> +  unsigned IOCTL_KIOCSOUND = KIOCSOUND;
> +  unsigned IOCTL_LPABORT = LPABORT;
> +  unsigned IOCTL_LPABORTOPEN = LPABORTOPEN;
> +  unsigned IOCTL_LPCAREFUL = LPCAREFUL;
> +  unsigned IOCTL_LPCHAR = LPCHAR;
> +  unsigned IOCTL_LPGETIRQ = LPGETIRQ;
> +  unsigned IOCTL_LPGETSTATUS = LPGETSTATUS;
> +  unsigned IOCTL_LPRESET = LPRESET;
> +  unsigned IOCTL_LPSETIRQ = LPSETIRQ;
> +  unsigned IOCTL_LPTIME = LPTIME;
> +  unsigned IOCTL_LPWAIT = LPWAIT;
> +  unsigned IOCTL_PIO_CMAP = PIO_CMAP;
> +  unsigned IOCTL_PIO_FONT = PIO_FONT;
> +  unsigned IOCTL_PIO_SCRNMAP = PIO_SCRNMAP;
> +  unsigned IOCTL_PIO_UNIMAP = PIO_UNIMAP;
> +  unsigned IOCTL_PIO_UNIMAPCLR = PIO_UNIMAPCLR;
> +  unsigned IOCTL_PIO_UNISCRNMAP = PIO_UNISCRNMAP;
> +  unsigned IOCTL_SCSI_IOCTL_GET_IDLUN = SCSI_IOCTL_GET_IDLUN;
> +  unsigned IOCTL_SCSI_IOCTL_PROBE_HOST = SCSI_IOCTL_PROBE_HOST;
> +  unsigned IOCTL_SCSI_IOCTL_TAGGED_DISABLE = SCSI_IOCTL_TAGGED_DISABLE;
> +  unsigned IOCTL_SCSI_IOCTL_TAGGED_ENABLE = SCSI_IOCTL_TAGGED_ENABLE;
> +  unsigned IOCTL_SIOCAIPXITFCRT = SIOCAIPXITFCRT;
> +  unsigned IOCTL_SIOCAIPXPRISLT = SIOCAIPXPRISLT;
> +  unsigned IOCTL_SIOCDEVPLIP = SIOCDEVPLIP;
> +  unsigned IOCTL_SIOCIPXCFGDATA = SIOCIPXCFGDATA;
> +  unsigned IOCTL_SNDCTL_DSP_GETISPACE = SNDCTL_DSP_GETISPACE;
> +  unsigned IOCTL_SNDCTL_DSP_GETOSPACE = SNDCTL_DSP_GETOSPACE;
> +  unsigned IOCTL_TIOCGSERIAL = TIOCGSERIAL;
> +  unsigned IOCTL_TIOCSERGETMULTI = TIOCSERGETMULTI;
> +  unsigned IOCTL_TIOCSERSETMULTI = TIOCSERSETMULTI;
> +  unsigned IOCTL_TIOCSSERIAL = TIOCSSERIAL;
> +#endif
> +}
> +
> +#endif // SANITIZER_LINUX
>
> Propchange:
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_linux.cc
>
> ------------------------------------------------------------------------------
>     svn:eol-style = LF
>
> Modified:
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=188369&r1=188368&r2=188369&view=diff
>
> ==============================================================================
> ---
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
> (original)
> +++
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
> Wed Aug 14 08:34:14 2013
> @@ -43,17 +43,8 @@
>  #include <wchar.h>
>
>  #if SANITIZER_LINUX
> -#include <sys/mount.h>
>  #include <sys/ptrace.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>
>  #endif
>
>  #if !SANITIZER_ANDROID
> @@ -62,31 +53,11 @@
>
>  #if SANITIZER_LINUX && !SANITIZER_ANDROID
>  #include <glob.h>
> -#include <net/if_ppp.h>
> -#include <netax25/ax25.h>
> -#include <netipx/ipx.h>
> -#include <netrom/netrom.h>
> -#include <scsi/scsi.h>
>  #include <sys/mtio.h>
>  #include <sys/kd.h>
>  #include <sys/user.h>
> -#include <linux/cyclades.h>
> -#include <linux/if_eql.h>
> -#include <linux/if_plip.h>
> -#include <linux/lp.h>
> -#include <linux/mroute.h>
> -#include <linux/mroute6.h>
> -#include <linux/scc.h>
> -#include <linux/serial.h>
>  #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
>
> -#if SANITIZER_ANDROID
> -#include <linux/kd.h>
> -#include <linux/mtio.h>
> -#include <linux/ppp_defs.h>
> -#include <linux/if_ppp.h>
> -#endif
> -
>  #if SANITIZER_LINUX
>  #include <link.h>
>  #include <sys/vfs.h>
> @@ -137,10 +108,6 @@ namespace __sanitizer {
>    uptr sig_ign = (uptr)SIG_IGN;
>    uptr sig_dfl = (uptr)SIG_DFL;
>
> -#if SANITIZER_LINUX
> -  int e_tabsz = (int)E_TABSZ;
> -#endif
> -
>    uptr __sanitizer_get_sigaction_sa_sigaction(void *act) {
>      struct sigaction *a = (struct sigaction *)act;
>      // Check that sa_sigaction and sa_handler are the same.
> @@ -208,80 +175,7 @@ namespace __sanitizer {
>    unsigned struct_termios_sz = sizeof(struct termios);
>    unsigned struct_winsize_sz = sizeof(struct winsize);
>
> -#if SANITIZER_LINUX
> -  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);
> -#if SOUND_VERSION >= 0x040000
> -  unsigned struct_copr_buffer_sz = 0;
> -  unsigned struct_copr_debug_buf_sz = 0;
> -  unsigned struct_copr_msg_sz = 0;
> -#else
> -  unsigned struct_copr_buffer_sz = sizeof(struct copr_buffer);
> -  unsigned struct_copr_debug_buf_sz = sizeof(struct copr_debug_buf);
> -  unsigned struct_copr_msg_sz = sizeof(struct copr_msg);
> -#endif
> -  unsigned struct_ff_effect_sz = sizeof(struct ff_effect);
> -  unsigned struct_floppy_drive_params_sz = sizeof(struct
> floppy_drive_params);
> -  unsigned struct_floppy_drive_struct_sz = sizeof(struct
> floppy_drive_struct);
> -  unsigned struct_floppy_fdc_state_sz = sizeof(struct floppy_fdc_state);
> -  unsigned struct_floppy_max_errors_sz = sizeof(struct floppy_max_errors);
> -  unsigned struct_floppy_raw_cmd_sz = sizeof(struct floppy_raw_cmd);
> -  unsigned struct_floppy_struct_sz = sizeof(struct floppy_struct);
> -  unsigned struct_floppy_write_errors_sz = sizeof(struct
> floppy_write_errors);
> -  unsigned struct_format_descr_sz = sizeof(struct format_descr);
> -  unsigned struct_hd_driveid_sz = sizeof(struct hd_driveid);
> -  unsigned struct_hd_geometry_sz = sizeof(struct hd_geometry);
> -  unsigned struct_input_absinfo_sz = sizeof(struct input_absinfo);
> -  unsigned struct_input_id_sz = sizeof(struct input_id);
> -  unsigned struct_midi_info_sz = sizeof(struct midi_info);
> -  unsigned struct_mtget_sz = sizeof(struct mtget);
> -  unsigned struct_mtop_sz = sizeof(struct mtop);
> -  unsigned struct_mtpos_sz = sizeof(struct mtpos);
> -  unsigned struct_rtentry_sz = sizeof(struct rtentry);
> -  unsigned struct_sbi_instrument_sz = sizeof(struct sbi_instrument);
> -  unsigned struct_seq_event_rec_sz = sizeof(struct seq_event_rec);
> -  unsigned struct_synth_info_sz = sizeof(struct synth_info);
> -  unsigned struct_termio_sz = sizeof(struct termio);
> -  unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
> -  unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
> -  unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
> -  unsigned struct_vt_stat_sz = sizeof(struct vt_stat);
> -#endif
> -
> -#if SANITIZER_LINUX && !SANITIZER_ANDROID
> -  unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
> -  unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
> -  unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
> -#if EV_VERSION > (0x010000)
> -  unsigned struct_input_keymap_entry_sz = sizeof(struct
> input_keymap_entry);
> -#else
> -  unsigned struct_input_keymap_entry_sz = 0;
> -#endif
> -  unsigned struct_ipx_config_data_sz = sizeof(struct ipx_config_data);
> -  unsigned struct_kbdiacrs_sz = sizeof(struct kbdiacrs);
> -  unsigned struct_kbentry_sz = sizeof(struct kbentry);
> -  unsigned struct_kbkeycode_sz = sizeof(struct kbkeycode);
> -  unsigned struct_kbsentry_sz = sizeof(struct kbsentry);
> -  unsigned struct_mtconfiginfo_sz = sizeof(struct mtconfiginfo);
> -  unsigned struct_nr_parms_struct_sz = sizeof(struct nr_parms_struct);
> -  unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
> -  unsigned struct_scc_modem_sz = sizeof(struct scc_modem);
> -  unsigned struct_scc_stat_sz = sizeof(struct scc_stat);
> -  unsigned struct_serial_multiport_struct_sz
> -      = sizeof(struct serial_multiport_struct);
> -  unsigned struct_serial_struct_sz = sizeof(struct serial_struct);
> -  unsigned struct_sockaddr_ax25_sz = sizeof(struct sockaddr_ax25);
> -  unsigned struct_unimapdesc_sz = sizeof(struct unimapdesc);
> -  unsigned struct_unimapinit_sz = sizeof(struct unimapinit);
> -#endif
> -
> -#if !SANITIZER_ANDROID
> +#if SANITIZER_MAC
>    unsigned struct_sioc_sg_req_sz = sizeof(struct sioc_sg_req);
>    unsigned struct_sioc_vif_req_sz = sizeof(struct sioc_vif_req);
>  #endif
> @@ -332,393 +226,12 @@ namespace __sanitizer {
>    unsigned IOCTL_TIOCSPGRP = TIOCSPGRP;
>    unsigned IOCTL_TIOCSTI = TIOCSTI;
>    unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ;
> -#if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_MAC
> +#if SANITIZER_MAC
>    unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT;
>    unsigned IOCTL_SIOCGETVIFCNT = SIOCGETVIFCNT;
>  #endif
> -#if SANITIZER_LINUX
> -  unsigned IOCTL_EVIOCGABS = EVIOCGABS(0);
> -  unsigned IOCTL_EVIOCGBIT = EVIOCGBIT(0, 0);
> -  unsigned IOCTL_EVIOCGEFFECTS = EVIOCGEFFECTS;
> -  unsigned IOCTL_EVIOCGID = EVIOCGID;
> -  unsigned IOCTL_EVIOCGKEY = EVIOCGKEY(0);
> -  unsigned IOCTL_EVIOCGKEYCODE = EVIOCGKEYCODE;
> -  unsigned IOCTL_EVIOCGLED = EVIOCGLED(0);
> -  unsigned IOCTL_EVIOCGNAME = EVIOCGNAME(0);
> -  unsigned IOCTL_EVIOCGPHYS = EVIOCGPHYS(0);
> -  unsigned IOCTL_EVIOCGRAB = EVIOCGRAB;
> -  unsigned IOCTL_EVIOCGREP = EVIOCGREP;
> -  unsigned IOCTL_EVIOCGSND = EVIOCGSND(0);
> -  unsigned IOCTL_EVIOCGSW = EVIOCGSW(0);
> -  unsigned IOCTL_EVIOCGUNIQ = EVIOCGUNIQ(0);
> -  unsigned IOCTL_EVIOCGVERSION = EVIOCGVERSION;
> -  unsigned IOCTL_EVIOCRMFF = EVIOCRMFF;
> -  unsigned IOCTL_EVIOCSABS = EVIOCSABS(0);
> -  unsigned IOCTL_EVIOCSFF = EVIOCSFF;
> -  unsigned IOCTL_EVIOCSKEYCODE = EVIOCSKEYCODE;
> -  unsigned IOCTL_EVIOCSREP = EVIOCSREP;
> -  unsigned IOCTL_BLKFLSBUF = BLKFLSBUF;
> -  unsigned IOCTL_BLKGETSIZE = BLKGETSIZE;
> -  unsigned IOCTL_BLKRAGET = BLKRAGET;
> -  unsigned IOCTL_BLKRASET = BLKRASET;
> -  unsigned IOCTL_BLKROGET = BLKROGET;
> -  unsigned IOCTL_BLKROSET = BLKROSET;
> -  unsigned IOCTL_BLKRRPART = BLKRRPART;
> -  unsigned IOCTL_CDROMAUDIOBUFSIZ = CDROMAUDIOBUFSIZ;
> -  unsigned IOCTL_CDROMEJECT = CDROMEJECT;
> -  unsigned IOCTL_CDROMEJECT_SW = CDROMEJECT_SW;
> -  unsigned IOCTL_CDROMMULTISESSION = CDROMMULTISESSION;
> -  unsigned IOCTL_CDROMPAUSE = CDROMPAUSE;
> -  unsigned IOCTL_CDROMPLAYMSF = CDROMPLAYMSF;
> -  unsigned IOCTL_CDROMPLAYTRKIND = CDROMPLAYTRKIND;
> -  unsigned IOCTL_CDROMREADAUDIO = CDROMREADAUDIO;
> -  unsigned IOCTL_CDROMREADCOOKED = CDROMREADCOOKED;
> -  unsigned IOCTL_CDROMREADMODE1 = CDROMREADMODE1;
> -  unsigned IOCTL_CDROMREADMODE2 = CDROMREADMODE2;
> -  unsigned IOCTL_CDROMREADRAW = CDROMREADRAW;
> -  unsigned IOCTL_CDROMREADTOCENTRY = CDROMREADTOCENTRY;
> -  unsigned IOCTL_CDROMREADTOCHDR = CDROMREADTOCHDR;
> -  unsigned IOCTL_CDROMRESET = CDROMRESET;
> -  unsigned IOCTL_CDROMRESUME = CDROMRESUME;
> -  unsigned IOCTL_CDROMSEEK = CDROMSEEK;
> -  unsigned IOCTL_CDROMSTART = CDROMSTART;
> -  unsigned IOCTL_CDROMSTOP = CDROMSTOP;
> -  unsigned IOCTL_CDROMSUBCHNL = CDROMSUBCHNL;
> -  unsigned IOCTL_CDROMVOLCTRL = CDROMVOLCTRL;
> -  unsigned IOCTL_CDROMVOLREAD = CDROMVOLREAD;
> -  unsigned IOCTL_CDROM_GET_UPC = CDROM_GET_UPC;
> -  unsigned IOCTL_FDCLRPRM = FDCLRPRM;
> -  unsigned IOCTL_FDDEFPRM = FDDEFPRM;
> -  unsigned IOCTL_FDFLUSH = FDFLUSH;
> -  unsigned IOCTL_FDFMTBEG = FDFMTBEG;
> -  unsigned IOCTL_FDFMTEND = FDFMTEND;
> -  unsigned IOCTL_FDFMTTRK = FDFMTTRK;
> -  unsigned IOCTL_FDGETDRVPRM = FDGETDRVPRM;
> -  unsigned IOCTL_FDGETDRVSTAT = FDGETDRVSTAT;
> -  unsigned IOCTL_FDGETDRVTYP = FDGETDRVTYP;
> -  unsigned IOCTL_FDGETFDCSTAT = FDGETFDCSTAT;
> -  unsigned IOCTL_FDGETMAXERRS = FDGETMAXERRS;
> -  unsigned IOCTL_FDGETPRM = FDGETPRM;
> -  unsigned IOCTL_FDMSGOFF = FDMSGOFF;
> -  unsigned IOCTL_FDMSGON = FDMSGON;
> -  unsigned IOCTL_FDPOLLDRVSTAT = FDPOLLDRVSTAT;
> -  unsigned IOCTL_FDRAWCMD = FDRAWCMD;
> -  unsigned IOCTL_FDRESET = FDRESET;
> -  unsigned IOCTL_FDSETDRVPRM = FDSETDRVPRM;
> -  unsigned IOCTL_FDSETEMSGTRESH = FDSETEMSGTRESH;
> -  unsigned IOCTL_FDSETMAXERRS = FDSETMAXERRS;
> -  unsigned IOCTL_FDSETPRM = FDSETPRM;
> -  unsigned IOCTL_FDTWADDLE = FDTWADDLE;
> -  unsigned IOCTL_FDWERRORCLR = FDWERRORCLR;
> -  unsigned IOCTL_FDWERRORGET = FDWERRORGET;
> -  unsigned IOCTL_HDIO_DRIVE_CMD = HDIO_DRIVE_CMD;
> -  unsigned IOCTL_HDIO_GETGEO = HDIO_GETGEO;
> -  unsigned IOCTL_HDIO_GET_32BIT = HDIO_GET_32BIT;
> -  unsigned IOCTL_HDIO_GET_DMA = HDIO_GET_DMA;
> -  unsigned IOCTL_HDIO_GET_IDENTITY = HDIO_GET_IDENTITY;
> -  unsigned IOCTL_HDIO_GET_KEEPSETTINGS = HDIO_GET_KEEPSETTINGS;
> -  unsigned IOCTL_HDIO_GET_MULTCOUNT = HDIO_GET_MULTCOUNT;
> -  unsigned IOCTL_HDIO_GET_NOWERR = HDIO_GET_NOWERR;
> -  unsigned IOCTL_HDIO_GET_UNMASKINTR = HDIO_GET_UNMASKINTR;
> -  unsigned IOCTL_HDIO_SET_32BIT = HDIO_SET_32BIT;
> -  unsigned IOCTL_HDIO_SET_DMA = HDIO_SET_DMA;
> -  unsigned IOCTL_HDIO_SET_KEEPSETTINGS = HDIO_SET_KEEPSETTINGS;
> -  unsigned IOCTL_HDIO_SET_MULTCOUNT = HDIO_SET_MULTCOUNT;
> -  unsigned IOCTL_HDIO_SET_NOWERR = HDIO_SET_NOWERR;
> -  unsigned IOCTL_HDIO_SET_UNMASKINTR = HDIO_SET_UNMASKINTR;
> -  unsigned IOCTL_MTIOCGET = MTIOCGET;
> -  unsigned IOCTL_MTIOCPOS = MTIOCPOS;
> -  unsigned IOCTL_MTIOCTOP = MTIOCTOP;
> -  unsigned IOCTL_PPPIOCGASYNCMAP = PPPIOCGASYNCMAP;
> -  unsigned IOCTL_PPPIOCGDEBUG = PPPIOCGDEBUG;
> -  unsigned IOCTL_PPPIOCGFLAGS = PPPIOCGFLAGS;
> -  unsigned IOCTL_PPPIOCGUNIT = PPPIOCGUNIT;
> -  unsigned IOCTL_PPPIOCGXASYNCMAP = PPPIOCGXASYNCMAP;
> -  unsigned IOCTL_PPPIOCSASYNCMAP = PPPIOCSASYNCMAP;
> -  unsigned IOCTL_PPPIOCSDEBUG = PPPIOCSDEBUG;
> -  unsigned IOCTL_PPPIOCSFLAGS = PPPIOCSFLAGS;
> -  unsigned IOCTL_PPPIOCSMAXCID = PPPIOCSMAXCID;
> -  unsigned IOCTL_PPPIOCSMRU = PPPIOCSMRU;
> -  unsigned IOCTL_PPPIOCSXASYNCMAP = PPPIOCSXASYNCMAP;
> -  unsigned IOCTL_SIOCADDRT = SIOCADDRT;
> -  unsigned IOCTL_SIOCDARP = SIOCDARP;
> -  unsigned IOCTL_SIOCDELRT = SIOCDELRT;
> -  unsigned IOCTL_SIOCDRARP = SIOCDRARP;
> -  unsigned IOCTL_SIOCGARP = SIOCGARP;
> -  unsigned IOCTL_SIOCGIFENCAP = SIOCGIFENCAP;
> -  unsigned IOCTL_SIOCGIFHWADDR = SIOCGIFHWADDR;
> -  unsigned IOCTL_SIOCGIFMAP = SIOCGIFMAP;
> -  unsigned IOCTL_SIOCGIFMEM = SIOCGIFMEM;
> -  unsigned IOCTL_SIOCGIFNAME = SIOCGIFNAME;
> -  unsigned IOCTL_SIOCGIFSLAVE = SIOCGIFSLAVE;
> -  unsigned IOCTL_SIOCGRARP = SIOCGRARP;
> -  unsigned IOCTL_SIOCGSTAMP = SIOCGSTAMP;
> -  unsigned IOCTL_SIOCSARP = SIOCSARP;
> -  unsigned IOCTL_SIOCSIFENCAP = SIOCSIFENCAP;
> -  unsigned IOCTL_SIOCSIFHWADDR = SIOCSIFHWADDR;
> -  unsigned IOCTL_SIOCSIFLINK = SIOCSIFLINK;
> -  unsigned IOCTL_SIOCSIFMAP = SIOCSIFMAP;
> -  unsigned IOCTL_SIOCSIFMEM = SIOCSIFMEM;
> -  unsigned IOCTL_SIOCSIFSLAVE = SIOCSIFSLAVE;
> -  unsigned IOCTL_SIOCSRARP = SIOCSRARP;
> -#if SOUND_VERSION >= 0x040000
> -  unsigned IOCTL_SNDCTL_COPR_HALT = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SNDCTL_COPR_LOAD = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SNDCTL_COPR_RCODE = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SNDCTL_COPR_RCVMSG = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SNDCTL_COPR_RDATA = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SNDCTL_COPR_RESET = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SNDCTL_COPR_RUN = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SNDCTL_COPR_SENDMSG = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SNDCTL_COPR_WCODE = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SNDCTL_COPR_WDATA = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SOUND_PCM_READ_BITS = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SOUND_PCM_READ_CHANNELS = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SOUND_PCM_READ_FILTER = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SOUND_PCM_READ_RATE = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SOUND_PCM_WRITE_CHANNELS = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_SOUND_PCM_WRITE_FILTER = IOCTL_NOT_PRESENT;
> -#else
> -  unsigned IOCTL_SNDCTL_COPR_HALT = SNDCTL_COPR_HALT;
> -  unsigned IOCTL_SNDCTL_COPR_LOAD = SNDCTL_COPR_LOAD;
> -  unsigned IOCTL_SNDCTL_COPR_RCODE = SNDCTL_COPR_RCODE;
> -  unsigned IOCTL_SNDCTL_COPR_RCVMSG = SNDCTL_COPR_RCVMSG;
> -  unsigned IOCTL_SNDCTL_COPR_RDATA = SNDCTL_COPR_RDATA;
> -  unsigned IOCTL_SNDCTL_COPR_RESET = SNDCTL_COPR_RESET;
> -  unsigned IOCTL_SNDCTL_COPR_RUN = SNDCTL_COPR_RUN;
> -  unsigned IOCTL_SNDCTL_COPR_SENDMSG = SNDCTL_COPR_SENDMSG;
> -  unsigned IOCTL_SNDCTL_COPR_WCODE = SNDCTL_COPR_WCODE;
> -  unsigned IOCTL_SNDCTL_COPR_WDATA = SNDCTL_COPR_WDATA;
> -  unsigned IOCTL_SOUND_PCM_READ_BITS = SOUND_PCM_READ_BITS;
> -  unsigned IOCTL_SOUND_PCM_READ_CHANNELS = SOUND_PCM_READ_CHANNELS;
> -  unsigned IOCTL_SOUND_PCM_READ_FILTER = SOUND_PCM_READ_FILTER;
> -  unsigned IOCTL_SOUND_PCM_READ_RATE = SOUND_PCM_READ_RATE;
> -  unsigned IOCTL_SOUND_PCM_WRITE_CHANNELS = SOUND_PCM_WRITE_CHANNELS;
> -  unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER;
> -#endif
> -  unsigned IOCTL_SNDCTL_DSP_GETBLKSIZE = SNDCTL_DSP_GETBLKSIZE;
> -  unsigned IOCTL_SNDCTL_DSP_GETFMTS = SNDCTL_DSP_GETFMTS;
> -  unsigned IOCTL_SNDCTL_DSP_NONBLOCK = SNDCTL_DSP_NONBLOCK;
> -  unsigned IOCTL_SNDCTL_DSP_POST = SNDCTL_DSP_POST;
> -  unsigned IOCTL_SNDCTL_DSP_RESET = SNDCTL_DSP_RESET;
> -  unsigned IOCTL_SNDCTL_DSP_SETFMT = SNDCTL_DSP_SETFMT;
> -  unsigned IOCTL_SNDCTL_DSP_SETFRAGMENT = SNDCTL_DSP_SETFRAGMENT;
> -  unsigned IOCTL_SNDCTL_DSP_SPEED = SNDCTL_DSP_SPEED;
> -  unsigned IOCTL_SNDCTL_DSP_STEREO = SNDCTL_DSP_STEREO;
> -  unsigned IOCTL_SNDCTL_DSP_SUBDIVIDE = SNDCTL_DSP_SUBDIVIDE;
> -  unsigned IOCTL_SNDCTL_DSP_SYNC = SNDCTL_DSP_SYNC;
> -  unsigned IOCTL_SNDCTL_FM_4OP_ENABLE = SNDCTL_FM_4OP_ENABLE;
> -  unsigned IOCTL_SNDCTL_FM_LOAD_INSTR = SNDCTL_FM_LOAD_INSTR;
> -  unsigned IOCTL_SNDCTL_MIDI_INFO = SNDCTL_MIDI_INFO;
> -  unsigned IOCTL_SNDCTL_MIDI_PRETIME = SNDCTL_MIDI_PRETIME;
> -  unsigned IOCTL_SNDCTL_SEQ_CTRLRATE = SNDCTL_SEQ_CTRLRATE;
> -  unsigned IOCTL_SNDCTL_SEQ_GETINCOUNT = SNDCTL_SEQ_GETINCOUNT;
> -  unsigned IOCTL_SNDCTL_SEQ_GETOUTCOUNT = SNDCTL_SEQ_GETOUTCOUNT;
> -  unsigned IOCTL_SNDCTL_SEQ_NRMIDIS = SNDCTL_SEQ_NRMIDIS;
> -  unsigned IOCTL_SNDCTL_SEQ_NRSYNTHS = SNDCTL_SEQ_NRSYNTHS;
> -  unsigned IOCTL_SNDCTL_SEQ_OUTOFBAND = SNDCTL_SEQ_OUTOFBAND;
> -  unsigned IOCTL_SNDCTL_SEQ_PANIC = SNDCTL_SEQ_PANIC;
> -  unsigned IOCTL_SNDCTL_SEQ_PERCMODE = SNDCTL_SEQ_PERCMODE;
> -  unsigned IOCTL_SNDCTL_SEQ_RESET = SNDCTL_SEQ_RESET;
> -  unsigned IOCTL_SNDCTL_SEQ_RESETSAMPLES = SNDCTL_SEQ_RESETSAMPLES;
> -  unsigned IOCTL_SNDCTL_SEQ_SYNC = SNDCTL_SEQ_SYNC;
> -  unsigned IOCTL_SNDCTL_SEQ_TESTMIDI = SNDCTL_SEQ_TESTMIDI;
> -  unsigned IOCTL_SNDCTL_SEQ_THRESHOLD = SNDCTL_SEQ_THRESHOLD;
> -  unsigned IOCTL_SNDCTL_SYNTH_INFO = SNDCTL_SYNTH_INFO;
> -  unsigned IOCTL_SNDCTL_SYNTH_MEMAVL = SNDCTL_SYNTH_MEMAVL;
> -  unsigned IOCTL_SNDCTL_TMR_CONTINUE = SNDCTL_TMR_CONTINUE;
> -  unsigned IOCTL_SNDCTL_TMR_METRONOME = SNDCTL_TMR_METRONOME;
> -  unsigned IOCTL_SNDCTL_TMR_SELECT = SNDCTL_TMR_SELECT;
> -  unsigned IOCTL_SNDCTL_TMR_SOURCE = SNDCTL_TMR_SOURCE;
> -  unsigned IOCTL_SNDCTL_TMR_START = SNDCTL_TMR_START;
> -  unsigned IOCTL_SNDCTL_TMR_STOP = SNDCTL_TMR_STOP;
> -  unsigned IOCTL_SNDCTL_TMR_TEMPO = SNDCTL_TMR_TEMPO;
> -  unsigned IOCTL_SNDCTL_TMR_TIMEBASE = SNDCTL_TMR_TIMEBASE;
> -  unsigned IOCTL_SOUND_MIXER_READ_ALTPCM = SOUND_MIXER_READ_ALTPCM;
> -  unsigned IOCTL_SOUND_MIXER_READ_BASS = SOUND_MIXER_READ_BASS;
> -  unsigned IOCTL_SOUND_MIXER_READ_CAPS = SOUND_MIXER_READ_CAPS;
> -  unsigned IOCTL_SOUND_MIXER_READ_CD = SOUND_MIXER_READ_CD;
> -  unsigned IOCTL_SOUND_MIXER_READ_DEVMASK = SOUND_MIXER_READ_DEVMASK;
> -  unsigned IOCTL_SOUND_MIXER_READ_ENHANCE = SOUND_MIXER_READ_ENHANCE;
> -  unsigned IOCTL_SOUND_MIXER_READ_IGAIN = SOUND_MIXER_READ_IGAIN;
> -  unsigned IOCTL_SOUND_MIXER_READ_IMIX = SOUND_MIXER_READ_IMIX;
> -  unsigned IOCTL_SOUND_MIXER_READ_LINE = SOUND_MIXER_READ_LINE;
> -  unsigned IOCTL_SOUND_MIXER_READ_LINE1 = SOUND_MIXER_READ_LINE1;
> -  unsigned IOCTL_SOUND_MIXER_READ_LINE2 = SOUND_MIXER_READ_LINE2;
> -  unsigned IOCTL_SOUND_MIXER_READ_LINE3 = SOUND_MIXER_READ_LINE3;
> -  unsigned IOCTL_SOUND_MIXER_READ_LOUD = SOUND_MIXER_READ_LOUD;
> -  unsigned IOCTL_SOUND_MIXER_READ_MIC = SOUND_MIXER_READ_MIC;
> -  unsigned IOCTL_SOUND_MIXER_READ_MUTE = SOUND_MIXER_READ_MUTE;
> -  unsigned IOCTL_SOUND_MIXER_READ_OGAIN = SOUND_MIXER_READ_OGAIN;
> -  unsigned IOCTL_SOUND_MIXER_READ_PCM = SOUND_MIXER_READ_PCM;
> -  unsigned IOCTL_SOUND_MIXER_READ_RECLEV = SOUND_MIXER_READ_RECLEV;
> -  unsigned IOCTL_SOUND_MIXER_READ_RECMASK = SOUND_MIXER_READ_RECMASK;
> -  unsigned IOCTL_SOUND_MIXER_READ_RECSRC = SOUND_MIXER_READ_RECSRC;
> -  unsigned IOCTL_SOUND_MIXER_READ_SPEAKER = SOUND_MIXER_READ_SPEAKER;
> -  unsigned IOCTL_SOUND_MIXER_READ_STEREODEVS =
> SOUND_MIXER_READ_STEREODEVS;
> -  unsigned IOCTL_SOUND_MIXER_READ_SYNTH = SOUND_MIXER_READ_SYNTH;
> -  unsigned IOCTL_SOUND_MIXER_READ_TREBLE = SOUND_MIXER_READ_TREBLE;
> -  unsigned IOCTL_SOUND_MIXER_READ_VOLUME = SOUND_MIXER_READ_VOLUME;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_ALTPCM = SOUND_MIXER_WRITE_ALTPCM;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_BASS = SOUND_MIXER_WRITE_BASS;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_CD = SOUND_MIXER_WRITE_CD;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_ENHANCE = SOUND_MIXER_WRITE_ENHANCE;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_IGAIN = SOUND_MIXER_WRITE_IGAIN;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_IMIX = SOUND_MIXER_WRITE_IMIX;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_LINE = SOUND_MIXER_WRITE_LINE;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_LINE1 = SOUND_MIXER_WRITE_LINE1;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_LINE2 = SOUND_MIXER_WRITE_LINE2;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_LINE3 = SOUND_MIXER_WRITE_LINE3;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_LOUD = SOUND_MIXER_WRITE_LOUD;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_MIC = SOUND_MIXER_WRITE_MIC;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_MUTE = SOUND_MIXER_WRITE_MUTE;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_OGAIN = SOUND_MIXER_WRITE_OGAIN;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_PCM = SOUND_MIXER_WRITE_PCM;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_RECLEV = SOUND_MIXER_WRITE_RECLEV;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_RECSRC = SOUND_MIXER_WRITE_RECSRC;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_SPEAKER = SOUND_MIXER_WRITE_SPEAKER;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_SYNTH = SOUND_MIXER_WRITE_SYNTH;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_TREBLE = SOUND_MIXER_WRITE_TREBLE;
> -  unsigned IOCTL_SOUND_MIXER_WRITE_VOLUME = SOUND_MIXER_WRITE_VOLUME;
> -  unsigned IOCTL_TCFLSH = TCFLSH;
> -  unsigned IOCTL_TCGETA = TCGETA;
> -  unsigned IOCTL_TCGETS = TCGETS;
> -  unsigned IOCTL_TCSBRK = TCSBRK;
> -  unsigned IOCTL_TCSBRKP = TCSBRKP;
> -  unsigned IOCTL_TCSETA = TCSETA;
> -  unsigned IOCTL_TCSETAF = TCSETAF;
> -  unsigned IOCTL_TCSETAW = TCSETAW;
> -  unsigned IOCTL_TCSETS = TCSETS;
> -  unsigned IOCTL_TCSETSF = TCSETSF;
> -  unsigned IOCTL_TCSETSW = TCSETSW;
> -  unsigned IOCTL_TCXONC = TCXONC;
> -  unsigned IOCTL_TIOCGLCKTRMIOS = TIOCGLCKTRMIOS;
> -  unsigned IOCTL_TIOCGSOFTCAR = TIOCGSOFTCAR;
> -  unsigned IOCTL_TIOCINQ = TIOCINQ;
> -  unsigned IOCTL_TIOCLINUX = TIOCLINUX;
> -  unsigned IOCTL_TIOCSERCONFIG = TIOCSERCONFIG;
> -  unsigned IOCTL_TIOCSERGETLSR = TIOCSERGETLSR;
> -  unsigned IOCTL_TIOCSERGWILD = TIOCSERGWILD;
> -  unsigned IOCTL_TIOCSERSWILD = TIOCSERSWILD;
> -  unsigned IOCTL_TIOCSLCKTRMIOS = TIOCSLCKTRMIOS;
> -  unsigned IOCTL_TIOCSSOFTCAR = TIOCSSOFTCAR;
> -  unsigned IOCTL_VT_ACTIVATE = VT_ACTIVATE;
> -  unsigned IOCTL_VT_DISALLOCATE = VT_DISALLOCATE;
> -  unsigned IOCTL_VT_GETMODE = VT_GETMODE;
> -  unsigned IOCTL_VT_GETSTATE = VT_GETSTATE;
> -  unsigned IOCTL_VT_OPENQRY = VT_OPENQRY;
> -  unsigned IOCTL_VT_RELDISP = VT_RELDISP;
> -  unsigned IOCTL_VT_RESIZE = VT_RESIZE;
> -  unsigned IOCTL_VT_RESIZEX = VT_RESIZEX;
> -  unsigned IOCTL_VT_SENDSIG = VT_SENDSIG;
> -  unsigned IOCTL_VT_SETMODE = VT_SETMODE;
> -  unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
> -#endif
> -#if SANITIZER_LINUX && !SANITIZER_ANDROID
> -  unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
> -  unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
> -  unsigned IOCTL_CYGETMON = CYGETMON;
> -  unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
> -  unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
> -  unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
> -  unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
> -  unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
> -  unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
> -  unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
> -  unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
> -  unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
> -  unsigned IOCTL_EQL_GETSLAVECFG = EQL_GETSLAVECFG;
> -  unsigned IOCTL_EQL_SETMASTRCFG = EQL_SETMASTRCFG;
> -  unsigned IOCTL_EQL_SETSLAVECFG = EQL_SETSLAVECFG;
> -#if EV_VERSION > (0x010000)
> -  unsigned IOCTL_EVIOCGKEYCODE_V2 = EVIOCGKEYCODE_V2;
> -  unsigned IOCTL_EVIOCGPROP = EVIOCGPROP(0);
> -  unsigned IOCTL_EVIOCSKEYCODE_V2 = EVIOCSKEYCODE_V2;
> -#else
> -  unsigned IOCTL_EVIOCGKEYCODE_V2 = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
> -  unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
> -#endif
> -  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
> -  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
> -  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
> -  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
> -  unsigned IOCTL_GIO_CMAP = GIO_CMAP;
> -  unsigned IOCTL_GIO_FONT = GIO_FONT;
> -  unsigned IOCTL_GIO_SCRNMAP = GIO_SCRNMAP;
> -  unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
> -  unsigned IOCTL_GIO_UNISCRNMAP = GIO_UNISCRNMAP;
> -  unsigned IOCTL_KDADDIO = KDADDIO;
> -  unsigned IOCTL_KDDELIO = KDDELIO;
> -  unsigned IOCTL_KDDISABIO = KDDISABIO;
> -  unsigned IOCTL_KDENABIO = KDENABIO;
> -  unsigned IOCTL_KDGETKEYCODE = KDGETKEYCODE;
> -  unsigned IOCTL_KDGETLED = KDGETLED;
> -  unsigned IOCTL_KDGETMODE = KDGETMODE;
> -  unsigned IOCTL_KDGKBDIACR = KDGKBDIACR;
> -  unsigned IOCTL_KDGKBENT = KDGKBENT;
> -  unsigned IOCTL_KDGKBLED = KDGKBLED;
> -  unsigned IOCTL_KDGKBMETA = KDGKBMETA;
> -  unsigned IOCTL_KDGKBMODE = KDGKBMODE;
> -  unsigned IOCTL_KDGKBSENT = KDGKBSENT;
> -  unsigned IOCTL_KDGKBTYPE = KDGKBTYPE;
> -  unsigned IOCTL_KDMAPDISP = KDMAPDISP;
> -  unsigned IOCTL_KDMKTONE = KDMKTONE;
> -  unsigned IOCTL_KDSETKEYCODE = KDSETKEYCODE;
> -  unsigned IOCTL_KDSETLED = KDSETLED;
> -  unsigned IOCTL_KDSETMODE = KDSETMODE;
> -  unsigned IOCTL_KDSIGACCEPT = KDSIGACCEPT;
> -  unsigned IOCTL_KDSKBDIACR = KDSKBDIACR;
> -  unsigned IOCTL_KDSKBENT = KDSKBENT;
> -  unsigned IOCTL_KDSKBLED = KDSKBLED;
> -  unsigned IOCTL_KDSKBMETA = KDSKBMETA;
> -  unsigned IOCTL_KDSKBMODE = KDSKBMODE;
> -  unsigned IOCTL_KDSKBSENT = KDSKBSENT;
> -  unsigned IOCTL_KDUNMAPDISP = KDUNMAPDISP;
> -  unsigned IOCTL_KIOCSOUND = KIOCSOUND;
> -  unsigned IOCTL_LPABORT = LPABORT;
> -  unsigned IOCTL_LPABORTOPEN = LPABORTOPEN;
> -  unsigned IOCTL_LPCAREFUL = LPCAREFUL;
> -  unsigned IOCTL_LPCHAR = LPCHAR;
> -  unsigned IOCTL_LPGETIRQ = LPGETIRQ;
> -  unsigned IOCTL_LPGETSTATUS = LPGETSTATUS;
> -  unsigned IOCTL_LPRESET = LPRESET;
> -  unsigned IOCTL_LPSETIRQ = LPSETIRQ;
> -  unsigned IOCTL_LPTIME = LPTIME;
> -  unsigned IOCTL_LPWAIT = LPWAIT;
> -  unsigned IOCTL_MTIOCGETCONFIG = MTIOCGETCONFIG;
> -  unsigned IOCTL_MTIOCSETCONFIG = MTIOCSETCONFIG;
> -  unsigned IOCTL_PIO_CMAP = PIO_CMAP;
> -  unsigned IOCTL_PIO_FONT = PIO_FONT;
> -  unsigned IOCTL_PIO_SCRNMAP = PIO_SCRNMAP;
> -  unsigned IOCTL_PIO_UNIMAP = PIO_UNIMAP;
> -  unsigned IOCTL_PIO_UNIMAPCLR = PIO_UNIMAPCLR;
> -  unsigned IOCTL_PIO_UNISCRNMAP = PIO_UNISCRNMAP;
> -  unsigned IOCTL_SCSI_IOCTL_GET_IDLUN = SCSI_IOCTL_GET_IDLUN;
> -  unsigned IOCTL_SCSI_IOCTL_PROBE_HOST = SCSI_IOCTL_PROBE_HOST;
> -  unsigned IOCTL_SCSI_IOCTL_TAGGED_DISABLE = SCSI_IOCTL_TAGGED_DISABLE;
> -  unsigned IOCTL_SCSI_IOCTL_TAGGED_ENABLE = SCSI_IOCTL_TAGGED_ENABLE;
> -  unsigned IOCTL_SIOCAIPXITFCRT = SIOCAIPXITFCRT;
> -  unsigned IOCTL_SIOCAIPXPRISLT = SIOCAIPXPRISLT;
> -  unsigned IOCTL_SIOCAX25ADDUID = SIOCAX25ADDUID;
> -  unsigned IOCTL_SIOCAX25DELUID = SIOCAX25DELUID;
> -  unsigned IOCTL_SIOCAX25GETPARMS = SIOCAX25GETPARMS;
> -  unsigned IOCTL_SIOCAX25GETUID = SIOCAX25GETUID;
> -  unsigned IOCTL_SIOCAX25NOUID = SIOCAX25NOUID;
> -  unsigned IOCTL_SIOCAX25SETPARMS = SIOCAX25SETPARMS;
> -  unsigned IOCTL_SIOCDEVPLIP = SIOCDEVPLIP;
> -  unsigned IOCTL_SIOCIPXCFGDATA = SIOCIPXCFGDATA;
> -  unsigned IOCTL_SIOCNRDECOBS = SIOCNRDECOBS;
> -  unsigned IOCTL_SIOCNRGETPARMS = SIOCNRGETPARMS;
> -  unsigned IOCTL_SIOCNRRTCTL = SIOCNRRTCTL;
> -  unsigned IOCTL_SIOCNRSETPARMS = SIOCNRSETPARMS;
> -  unsigned IOCTL_SNDCTL_DSP_GETISPACE = SNDCTL_DSP_GETISPACE;
> -  unsigned IOCTL_SNDCTL_DSP_GETOSPACE = SNDCTL_DSP_GETOSPACE;
> -  unsigned IOCTL_TIOCGSERIAL = TIOCGSERIAL;
> -  unsigned IOCTL_TIOCSERGETMULTI = TIOCSERGETMULTI;
> -  unsigned IOCTL_TIOCSERSETMULTI = TIOCSERSETMULTI;
> -  unsigned IOCTL_TIOCSSERIAL = TIOCSSERIAL;
> -#endif
> +
> +
>  }  // namespace __sanitizer
>
>  #define CHECK_TYPE_SIZE(TYPE) \
>
> Modified:
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
> URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=188369&r1=188368&r2=188369&view=diff
>
> ==============================================================================
> ---
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
> (original)
> +++
> compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
> Wed Aug 14 08:34:14 2013
> @@ -704,8 +704,6 @@ namespace __sanitizer {
>    extern unsigned IOCTL_LPSETIRQ;
>    extern unsigned IOCTL_LPTIME;
>    extern unsigned IOCTL_LPWAIT;
> -  extern unsigned IOCTL_MTIOCGETCONFIG;
> -  extern unsigned IOCTL_MTIOCSETCONFIG;
>    extern unsigned IOCTL_PIO_CMAP;
>    extern unsigned IOCTL_PIO_FONT;
>    extern unsigned IOCTL_PIO_SCRNMAP;
> @@ -718,18 +716,8 @@ namespace __sanitizer {
>    extern unsigned IOCTL_SCSI_IOCTL_TAGGED_ENABLE;
>    extern unsigned IOCTL_SIOCAIPXITFCRT;
>    extern unsigned IOCTL_SIOCAIPXPRISLT;
> -  extern unsigned IOCTL_SIOCAX25ADDUID;
> -  extern unsigned IOCTL_SIOCAX25DELUID;
> -  extern unsigned IOCTL_SIOCAX25GETPARMS;
> -  extern unsigned IOCTL_SIOCAX25GETUID;
> -  extern unsigned IOCTL_SIOCAX25NOUID;
> -  extern unsigned IOCTL_SIOCAX25SETPARMS;
>    extern unsigned IOCTL_SIOCDEVPLIP;
>    extern unsigned IOCTL_SIOCIPXCFGDATA;
> -  extern unsigned IOCTL_SIOCNRDECOBS;
> -  extern unsigned IOCTL_SIOCNRGETPARMS;
> -  extern unsigned IOCTL_SIOCNRRTCTL;
> -  extern unsigned IOCTL_SIOCNRSETPARMS;
>    extern unsigned IOCTL_SNDCTL_DSP_GETISPACE;
>    extern unsigned IOCTL_SNDCTL_DSP_GETOSPACE;
>    extern unsigned IOCTL_TIOCGSERIAL;
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130818/50550cf3/attachment.html>


More information about the llvm-commits mailing list