Skip to content

Commit ecd468e

Browse files
committed
Auto merge of rust-lang#710 - marmistrz:android, r=alexcrichton
Port rust-lang#672 and rust-lang#686 to Android. I'd rather avoid the duplication, but this is discussed in rust-lang#707.
2 parents 3c2bd77 + 4702102 commit ecd468e

File tree

4 files changed

+775
-3
lines changed

4 files changed

+775
-3
lines changed

libc-test/build.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ fn main() {
119119
cfg.header("arpa/inet.h");
120120
cfg.header("xlocale.h");
121121
cfg.header("utmp.h");
122+
if i686 || x86_64 {
123+
cfg.header("sys/reg.h");
124+
}
122125
} else if !windows {
123126
cfg.header("glob.h");
124127
cfg.header("ifaddrs.h");

src/unix/notbsd/android/b32/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ pub const PTRACE_SETFPREGS: ::c_int = 15;
141141
pub const PTRACE_GETREGS: ::c_int = 12;
142142
pub const PTRACE_SETREGS: ::c_int = 13;
143143

144-
pub const SYS_gettid: ::c_long = 224;
145144
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
146145
value: 0,
147146
};

0 commit comments

Comments
 (0)