aboutsummaryrefslogtreecommitdiff
path: root/src/etc
diff options
context:
space:
mode:
authorOr Brostovski <[email protected]>2010-08-07 16:43:08 +0300
committerOr Brostovski <[email protected]>2010-08-07 16:43:08 +0300
commit4467d7683dae87d6d4c55e446910f7a5b85abd13 (patch)
treee2578dbe8e2350eb4e82ae2941fc2efb7478253b /src/etc
parentAdded AST pretty printing for communication alt statement, closes issue 19. (diff)
parentAdd Or to the AUTHORS file. (diff)
downloadrust-4467d7683dae87d6d4c55e446910f7a5b85abd13.tar.xz
rust-4467d7683dae87d6d4c55e446910f7a5b85abd13.zip
Merge branch 'master' of git://github.com/graydon/rust
Conflicts: src/boot/fe/ast.ml
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/x86.supp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/etc/x86.supp b/src/etc/x86.supp
index f829f2ad..beb48223 100644
--- a/src/etc/x86.supp
+++ b/src/etc/x86.supp
@@ -11,4 +11,14 @@
Memcheck:Leak
fun:calloc
fun:_dl_allocate_tls
-} \ No newline at end of file
+}
+
+{
+ mac-dyld-oddity
+ Memcheck:Cond
+ fun:_ZN4dyld5_mainEPK12macho_headermiPPKcS5_S5_
+ fun:_ZN13dyldbootstrap5startEPK12macho_headeriPPKcl
+ fun:_dyld_start
+ obj:*
+}
+