aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-05-25 15:25:27 +0200
committerSverker Eriksson <[email protected]>2012-05-25 15:25:27 +0200
commit0fa2bbda2ae3736bf52b0e95bf4042055344a6de (patch)
tree7fbae6d4e74c05fa13cb1f01c4a780d1308ae53b /erts
parent2d261318a5dce1c38ab9689ffe2548d8f1026577 (diff)
parent987a5e8f1180da637dcf697222941f1c14ea2c93 (diff)
downloadotp-0fa2bbda2ae3736bf52b0e95bf4042055344a6de.tar.gz
otp-0fa2bbda2ae3736bf52b0e95bf4042055344a6de.tar.bz2
otp-0fa2bbda2ae3736bf52b0e95bf4042055344a6de.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/valgrind/suppress.patched.3.6.018
-rw-r--r--erts/emulator/valgrind/suppress.standard18
2 files changed, 16 insertions, 20 deletions
diff --git a/erts/emulator/valgrind/suppress.patched.3.6.0 b/erts/emulator/valgrind/suppress.patched.3.6.0
index 8cf4cba2c8..61d23529ba 100644
--- a/erts/emulator/valgrind/suppress.patched.3.6.0
+++ b/erts/emulator/valgrind/suppress.patched.3.6.0
@@ -57,18 +57,16 @@
fun:putenv
fun:erts_sys_putenv
fun:os_putenv_2
- fun:process_main
+ ...
}
{
-Leak in libc putenv
-Memcheck:Leak
-fun:malloc
-fun:erts_sys_alloc
-...
-fun:erts_alloc
-fun:erts_sys_putenv
-fun:os_putenv_2
-fun:process_main
+ Leak in libc putenv
+ Memcheck:Leak
+ ...
+ fun:erts_alloc
+ fun:erts_sys_putenv
+ fun:os_putenv_2
+ ...
}
{
erronous warning
diff --git a/erts/emulator/valgrind/suppress.standard b/erts/emulator/valgrind/suppress.standard
index 26e34e3757..ca7b804cb9 100644
--- a/erts/emulator/valgrind/suppress.standard
+++ b/erts/emulator/valgrind/suppress.standard
@@ -54,18 +54,16 @@
fun:putenv
fun:erts_sys_putenv
fun:os_putenv_2
- fun:process_main
+ ...
}
{
-Leak in libc putenv
-Memcheck:Leak
-fun:malloc
-fun:erts_sys_alloc
-...
-fun:erts_alloc
-fun:erts_sys_putenv
-fun:os_putenv_2
-fun:process_main
+ Leak in libc putenv
+ Memcheck:Leak
+ ...
+ fun:erts_alloc
+ fun:erts_sys_putenv
+ fun:os_putenv_2
+ ...
}
{
erronous warning