Skip to content

Commit 182044b

Browse files
committed
rollup merge of #17706 : thestinger/supp
2 parents f40767a + 618e418 commit 182044b

File tree

4 files changed

+1
-193
lines changed

4 files changed

+1
-193
lines changed

mk/rt.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# that's per-target so you're allowed to conditionally add files based on the
3636
# target.
3737
################################################################################
38-
NATIVE_LIBS := rust_builtin hoedown uv_support morestack miniz context_switch \
38+
NATIVE_LIBS := rust_builtin hoedown morestack miniz context_switch \
3939
rustrt_native rust_test_helpers
4040

4141
# $(1) is the target triple
@@ -50,7 +50,6 @@ NATIVE_DEPS_hoedown_$(1) := hoedown/src/autolink.c \
5050
hoedown/src/html_smartypants.c \
5151
hoedown/src/stack.c \
5252
hoedown/src/version.c
53-
NATIVE_DEPS_uv_support_$(1) := rust_uv.c
5453
NATIVE_DEPS_miniz_$(1) = miniz.c
5554
NATIVE_DEPS_rust_builtin_$(1) := rust_builtin.c \
5655
rust_android_dummy.c

src/etc/x86.supp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -373,14 +373,6 @@
373373
fun:_ZN4llvm4UsernwEjj
374374
}
375375

376-
{
377-
libuv-0-byte-realloc
378-
Memcheck:Leak
379-
fun:malloc
380-
...
381-
fun:*uv_loop_delete*
382-
}
383-
384376
{
385377
race-or-something-ask-pcwalton-0
386378
Memcheck:Value4
@@ -502,15 +494,3 @@
502494
fun:*
503495
...
504496
}
505-
506-
{
507-
libuv-mac-no-thread-join
508-
Memcheck:Leak
509-
fun:malloc_zone_malloc
510-
fun:_CFRuntimeCreateInstance
511-
fun:CFRunLoopSourceCreate
512-
fun:uv__platform_loop_init
513-
fun:uv__loop_init
514-
fun:uv_loop_new
515-
...
516-
}

src/rt/libuv-auto-clean-trigger

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/rt/rust_uv.c

Lines changed: 0 additions & 169 deletions
This file was deleted.

0 commit comments

Comments
 (0)