[valgrind-variant] r143 committed - disable the check for a mandatory interceptor in ld.so

[valgrind...@googlecode.com]

Revision: 143
Author: konstantin....@gmail.com
Date: Wed May 29 02:17:23 2013
Log: disable the check for a mandatory interceptor in ld.so
http://code.google.com/p/valgrind-variant/source/detail?r=143

Modified:
/trunk/valgrind/coregrind/m_redir.c
/trunk/valgrind/exp-sgcheck/Makefile.in
/trunk/valgrind/exp-sgcheck/tests/Makefile.in

=======================================
--- /trunk/valgrind/coregrind/m_redir.c Thu Nov 22 04:55:39 2012
+++ /trunk/valgrind/coregrind/m_redir.c Wed May 29 02:17:23 2013
@@ -799,7 +799,7 @@
if (sp->mark && (!sp->done) && sp->mandatory)
break;
}
- if (sp) {
+ if (0 && sp) { // Valgrind-variant: this does not work in our
environment.
const HChar** strp;
HChar* v = "valgrind: ";
vg_assert(sp->mark);
=======================================
--- /trunk/valgrind/exp-sgcheck/Makefile.in Thu Nov 22 04:55:39 2012
+++ /trunk/valgrind/exp-sgcheck/Makefile.in Wed May 29 02:17:23 2013
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -703,6 +703,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.tool.am $(top_srcdir)/Makefile.all.am:

$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -715,16 +716,16 @@

clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@$(EXEEXT):
$(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_OBJECTS)
$(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES)
+exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@$(EXEEXT):
$(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_OBJECTS)
$(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES)
$(EXTRA_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES)
@rm -f exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@$(EXEEXT)
$(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK)
$(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_OBJECTS)
$(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD) $(LIBS)
-exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@$(EXEEXT):
$(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_OBJECTS)
$(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES)
+exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@$(EXEEXT):
$(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_OBJECTS)
$(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES)
$(EXTRA_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES)
@rm -f exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@$(EXEEXT)
$(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK)
$(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_OBJECTS)
$(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD) $(LIBS)
-vgpreload_exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so$(EXEEXT):
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_OBJECTS)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES)
+vgpreload_exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so$(EXEEXT):
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_OBJECTS)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES)
$(EXTRA_vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES)
@rm -f vgpreload_exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so$(EXEEXT)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LINK)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_OBJECTS)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDADD) $(LIBS)
-vgpreload_exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so$(EXEEXT):
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_OBJECTS)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES)
+vgpreload_exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so$(EXEEXT):
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_OBJECTS)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES)
$(EXTRA_vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES)
@rm -f vgpreload_exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so$(EXEEXT)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LINK)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_OBJECTS)
$(vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDADD) $(LIBS)

@@ -1107,10 +1108,15 @@

installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:

clean-generic:
=======================================
--- /trunk/valgrind/exp-sgcheck/tests/Makefile.in Thu Nov 22 04:55:39 2012
+++ /trunk/valgrind/exp-sgcheck/tests/Makefile.in Wed May 29 02:17:23 2013
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -461,6 +461,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/Makefile.tool-tests.am $(top_srcdir)/Makefile.all.am:

$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -473,25 +474,25 @@

clean-checkPROGRAMS:
-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
-bad_percentify$(EXEEXT): $(bad_percentify_OBJECTS)
$(bad_percentify_DEPENDENCIES)
+bad_percentify$(EXEEXT): $(bad_percentify_OBJECTS)
$(bad_percentify_DEPENDENCIES) $(EXTRA_bad_percentify_DEPENDENCIES)
@rm -f bad_percentify$(EXEEXT)
$(LINK) $(bad_percentify_OBJECTS) $(bad_percentify_LDADD) $(LIBS)
-globalerr$(EXEEXT): $(globalerr_OBJECTS) $(globalerr_DEPENDENCIES)
+globalerr$(EXEEXT): $(globalerr_OBJECTS) $(globalerr_DEPENDENCIES)
$(EXTRA_globalerr_DEPENDENCIES)
@rm -f globalerr$(EXEEXT)
$(LINK) $(globalerr_OBJECTS) $(globalerr_LDADD) $(LIBS)
-hackedbz2$(EXEEXT): $(hackedbz2_OBJECTS) $(hackedbz2_DEPENDENCIES)
+hackedbz2$(EXEEXT): $(hackedbz2_OBJECTS) $(hackedbz2_DEPENDENCIES)
$(EXTRA_hackedbz2_DEPENDENCIES)
@rm -f hackedbz2$(EXEEXT)
$(hackedbz2_LINK) $(hackedbz2_OBJECTS) $(hackedbz2_LDADD) $(LIBS)
-hsg$(EXEEXT): $(hsg_OBJECTS) $(hsg_DEPENDENCIES)
+hsg$(EXEEXT): $(hsg_OBJECTS) $(hsg_DEPENDENCIES) $(EXTRA_hsg_DEPENDENCIES)
@rm -f hsg$(EXEEXT)
$(LINK) $(hsg_OBJECTS) $(hsg_LDADD) $(LIBS)
-preen_invars$(EXEEXT): $(preen_invars_OBJECTS) $(preen_invars_DEPENDENCIES)
+preen_invars$(EXEEXT): $(preen_invars_OBJECTS)
$(preen_invars_DEPENDENCIES) $(EXTRA_preen_invars_DEPENDENCIES)
@rm -f preen_invars$(EXEEXT)
$(preen_invars_LINK) $(preen_invars_OBJECTS) $(preen_invars_LDADD) $(LIBS)
-preen_invars_so.so$(EXEEXT): $(preen_invars_so_so_OBJECTS)
$(preen_invars_so_so_DEPENDENCIES)
+preen_invars_so.so$(EXEEXT): $(preen_invars_so_so_OBJECTS)
$(preen_invars_so_so_DEPENDENCIES) $(EXTRA_preen_invars_so_so_DEPENDENCIES)
@rm -f preen_invars_so.so$(EXEEXT)
$(preen_invars_so_so_LINK) $(preen_invars_so_so_OBJECTS)
$(preen_invars_so_so_LDADD) $(LIBS)
-stackerr$(EXEEXT): $(stackerr_OBJECTS) $(stackerr_DEPENDENCIES)
+stackerr$(EXEEXT): $(stackerr_OBJECTS) $(stackerr_DEPENDENCIES)
$(EXTRA_stackerr_DEPENDENCIES)
@rm -f stackerr$(EXEEXT)
$(LINK) $(stackerr_OBJECTS) $(stackerr_LDADD) $(LIBS)

@@ -649,10 +650,15 @@

installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:

clean-generic: