Skip to content

Commit b6d23ed

Browse files
committed
Auto merge of #1028 - est31:master, r=alexcrichton
Re-add aarch64 stuff removed by previous PR Previous PR #1023 has removed stuff from mod.rs and added it to some submodules, but missed the aarch64 submodule. This caused a build failure for rust on aarch64, see rust-lang/rust#51864. This copies the stuff that that commit added to the x86_64.rs submodule and puts it into aarch64.rs. It's been tested in the rust-lang/rust PR above: https://travis-ci.org/rust-lang/rust/builds/398750336
2 parents a9666f6 + 90c01fa commit b6d23ed

File tree

1 file changed

+135
-0
lines changed

1 file changed

+135
-0
lines changed

src/unix/notbsd/linux/musl/b64/aarch64.rs

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,3 +339,138 @@ pub const SYS_pwritev2: ::c_long = 287;
339339
pub const SYS_pkey_mprotect: ::c_long = 288;
340340
pub const SYS_pkey_alloc: ::c_long = 289;
341341
pub const SYS_pkey_free: ::c_long = 290;
342+
343+
pub const RLIMIT_NLIMITS: ::c_int = 16;
344+
pub const TIOCINQ: ::c_int = ::FIONREAD;
345+
pub const MCL_CURRENT: ::c_int = 0x0001;
346+
pub const MCL_FUTURE: ::c_int = 0x0002;
347+
pub const CBAUD: ::tcflag_t = 0o0010017;
348+
pub const TAB1: ::c_int = 0x00000800;
349+
pub const TAB2: ::c_int = 0x00001000;
350+
pub const TAB3: ::c_int = 0x00001800;
351+
pub const CR1: ::c_int = 0x00000200;
352+
pub const CR2: ::c_int = 0x00000400;
353+
pub const CR3: ::c_int = 0x00000600;
354+
pub const FF1: ::c_int = 0x00008000;
355+
pub const BS1: ::c_int = 0x00002000;
356+
pub const VT1: ::c_int = 0x00004000;
357+
pub const VWERASE: usize = 14;
358+
pub const VREPRINT: usize = 12;
359+
pub const VSUSP: usize = 10;
360+
pub const VSTART: usize = 8;
361+
pub const VSTOP: usize = 9;
362+
pub const VDISCARD: usize = 13;
363+
pub const VTIME: usize = 5;
364+
pub const IXON: ::tcflag_t = 0x00000400;
365+
pub const IXOFF: ::tcflag_t = 0x00001000;
366+
pub const ONLCR: ::tcflag_t = 0x4;
367+
pub const CSIZE: ::tcflag_t = 0x00000030;
368+
pub const CS6: ::tcflag_t = 0x00000010;
369+
pub const CS7: ::tcflag_t = 0x00000020;
370+
pub const CS8: ::tcflag_t = 0x00000030;
371+
pub const CSTOPB: ::tcflag_t = 0x00000040;
372+
pub const CREAD: ::tcflag_t = 0x00000080;
373+
pub const PARENB: ::tcflag_t = 0x00000100;
374+
pub const PARODD: ::tcflag_t = 0x00000200;
375+
pub const HUPCL: ::tcflag_t = 0x00000400;
376+
pub const CLOCAL: ::tcflag_t = 0x00000800;
377+
pub const ECHOKE: ::tcflag_t = 0x00000800;
378+
pub const ECHOE: ::tcflag_t = 0x00000010;
379+
pub const ECHOK: ::tcflag_t = 0x00000020;
380+
pub const ECHONL: ::tcflag_t = 0x00000040;
381+
pub const ECHOPRT: ::tcflag_t = 0x00000400;
382+
pub const ECHOCTL: ::tcflag_t = 0x00000200;
383+
pub const ISIG: ::tcflag_t = 0x00000001;
384+
pub const ICANON: ::tcflag_t = 0x00000002;
385+
pub const PENDIN: ::tcflag_t = 0x00004000;
386+
pub const NOFLSH: ::tcflag_t = 0x00000080;
387+
pub const CIBAUD: ::tcflag_t = 0o02003600000;
388+
pub const CBAUDEX: ::tcflag_t = 0o010000;
389+
pub const VSWTC: usize = 7;
390+
pub const OLCUC: ::tcflag_t = 0o000002;
391+
pub const NLDLY: ::tcflag_t = 0o000400;
392+
pub const CRDLY: ::tcflag_t = 0o003000;
393+
pub const TABDLY: ::tcflag_t = 0o014000;
394+
pub const BSDLY: ::tcflag_t = 0o020000;
395+
pub const FFDLY: ::tcflag_t = 0o100000;
396+
pub const VTDLY: ::tcflag_t = 0o040000;
397+
pub const XTABS: ::tcflag_t = 0o014000;
398+
pub const B57600: ::speed_t = 0o010001;
399+
pub const B115200: ::speed_t = 0o010002;
400+
pub const B230400: ::speed_t = 0o010003;
401+
pub const B460800: ::speed_t = 0o010004;
402+
pub const B500000: ::speed_t = 0o010005;
403+
pub const B576000: ::speed_t = 0o010006;
404+
pub const B921600: ::speed_t = 0o010007;
405+
pub const B1000000: ::speed_t = 0o010010;
406+
pub const B1152000: ::speed_t = 0o010011;
407+
pub const B1500000: ::speed_t = 0o010012;
408+
pub const B2000000: ::speed_t = 0o010013;
409+
pub const B2500000: ::speed_t = 0o010014;
410+
pub const B3000000: ::speed_t = 0o010015;
411+
pub const B3500000: ::speed_t = 0o010016;
412+
pub const B4000000: ::speed_t = 0o010017;
413+
414+
pub const FIOCLEX: ::c_int = 0x5451;
415+
pub const FIONBIO: ::c_int = 0x5421;
416+
pub const EDEADLK: ::c_int = 35;
417+
pub const EDEADLOCK: ::c_int = EDEADLK;
418+
pub const SO_PASSCRED: ::c_int = 16;
419+
pub const SO_PEERCRED: ::c_int = 17;
420+
pub const SO_RCVLOWAT: ::c_int = 18;
421+
pub const SO_SNDLOWAT: ::c_int = 19;
422+
pub const SO_RCVTIMEO: ::c_int = 20;
423+
pub const SO_SNDTIMEO: ::c_int = 21;
424+
pub const EXTPROC: ::tcflag_t = 0x00010000;
425+
pub const VEOL: usize = 11;
426+
pub const VEOL2: usize = 16;
427+
pub const VMIN: usize = 6;
428+
pub const IEXTEN: ::tcflag_t = 0x00008000;
429+
pub const TOSTOP: ::tcflag_t = 0x00000100;
430+
pub const FLUSHO: ::tcflag_t = 0x00001000;
431+
pub const TCGETS: ::c_int = 0x5401;
432+
pub const TCSETS: ::c_int = 0x5402;
433+
pub const TCSETSW: ::c_int = 0x5403;
434+
pub const TCSETSF: ::c_int = 0x5404;
435+
pub const TCGETA: ::c_int = 0x5405;
436+
pub const TCSETA: ::c_int = 0x5406;
437+
pub const TCSETAW: ::c_int = 0x5407;
438+
pub const TCSETAF: ::c_int = 0x5408;
439+
pub const TCSBRK: ::c_int = 0x5409;
440+
pub const TCXONC: ::c_int = 0x540A;
441+
pub const TCFLSH: ::c_int = 0x540B;
442+
pub const TIOCGSOFTCAR: ::c_int = 0x5419;
443+
pub const TIOCSSOFTCAR: ::c_int = 0x541A;
444+
pub const TIOCLINUX: ::c_int = 0x541C;
445+
pub const TIOCGSERIAL: ::c_int = 0x541E;
446+
pub const TIOCEXCL: ::c_int = 0x540C;
447+
pub const TIOCNXCL: ::c_int = 0x540D;
448+
pub const TIOCSCTTY: ::c_int = 0x540E;
449+
pub const TIOCGPGRP: ::c_int = 0x540F;
450+
pub const TIOCSPGRP: ::c_int = 0x5410;
451+
pub const TIOCOUTQ: ::c_int = 0x5411;
452+
pub const TIOCSTI: ::c_int = 0x5412;
453+
pub const TIOCGWINSZ: ::c_int = 0x5413;
454+
pub const TIOCSWINSZ: ::c_int = 0x5414;
455+
pub const TIOCMGET: ::c_int = 0x5415;
456+
pub const TIOCMBIS: ::c_int = 0x5416;
457+
pub const TIOCMBIC: ::c_int = 0x5417;
458+
pub const TIOCMSET: ::c_int = 0x5418;
459+
pub const FIONREAD: ::c_int = 0x541B;
460+
pub const TIOCCONS: ::c_int = 0x541D;
461+
462+
pub const TIOCM_LE: ::c_int = 0x001;
463+
pub const TIOCM_DTR: ::c_int = 0x002;
464+
pub const TIOCM_RTS: ::c_int = 0x004;
465+
pub const TIOCM_ST: ::c_int = 0x008;
466+
pub const TIOCM_SR: ::c_int = 0x010;
467+
pub const TIOCM_CTS: ::c_int = 0x020;
468+
pub const TIOCM_CAR: ::c_int = 0x040;
469+
pub const TIOCM_RNG: ::c_int = 0x080;
470+
pub const TIOCM_DSR: ::c_int = 0x100;
471+
pub const TIOCM_CD: ::c_int = TIOCM_CAR;
472+
pub const TIOCM_RI: ::c_int = TIOCM_RNG;
473+
474+
extern {
475+
pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
476+
}

0 commit comments

Comments
 (0)