Rename 'exp-ptrcheck' to 'exp-sgcheck' and hope this does not cause

too much build carnage.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11745

Makefile.am

@@ -12,7 +12,7 @@ TOOLS =		memcheck \
 		helgrind \
 		drd
 
-EXP_TOOLS = 	exp-ptrcheck \
+EXP_TOOLS = 	exp-sgcheck \
 		exp-bbv \
 		exp-dhat
 
@@ -50,7 +50,7 @@ SUPP_FILES = \
 	glibc-2.34567-NPTL-helgrind.supp \
 	glibc-2.2-LinuxThreads-helgrind.supp \
 	glibc-2.X-drd.supp \
-	exp-ptrcheck.supp \
+	exp-sgcheck.supp \
 	darwin9.supp darwin9-drd.supp \
 	darwin10.supp darwin10-drd.supp
 DEFAULT_SUPP_FILES = @DEFAULT_SUPP@

configure.in

@@ -808,8 +808,8 @@ AC_SUBST(GLIBC_VERSION)
 DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}"
 DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}"
 
-# Add glibc and X11 suppressions for exp-ptrcheck
-DEFAULT_SUPP="exp-ptrcheck.supp ${DEFAULT_SUPP}"
+# Add glibc and X11 suppressions for exp-sgcheck
+DEFAULT_SUPP="exp-sgcheck.supp ${DEFAULT_SUPP}"
 
 
 #----------------------------------------------------------------------------
@@ -1951,8 +1951,8 @@ AC_CONFIG_FILES([
    none/tests/linux/Makefile
    none/tests/darwin/Makefile
    none/tests/x86-linux/Makefile
-   exp-ptrcheck/Makefile
-   exp-ptrcheck/tests/Makefile
+   exp-sgcheck/Makefile
+   exp-sgcheck/tests/Makefile
    drd/Makefile
    drd/scripts/download-and-build-splash2
    drd/tests/Makefile

docs/xml/manual.xml

@@ -38,7 +38,7 @@
       xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="../../exp-dhat/docs/dh-manual.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="../../exp-ptrcheck/docs/pc-manual.xml" parse="xml"  
+  <xi:include href="../../exp-sgcheck/docs/sg-manual.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="../../exp-bbv/docs/bbv-manual.xml" parse="xml"  
       xmlns:xi="http://www.w3.org/2001/XInclude" />      

exp-ptrcheck.supp

@@ -1,87 +0,0 @@
-{
-   lib-X11-used-old-pointer-after-realloc-1
-   exp-ptrcheck:Heap
-   fun:strlen
-   obj:/usr/lib*/libX11.so*
-   obj:/usr/lib*/libX11.so*
-}
-{
-   lib-X11-used-old-pointer-after-realloc-2
-   exp-ptrcheck:Heap
-   obj:/usr/lib*/libX11.so*
-   obj:/usr/lib*/libX11.so*
-}
-
-{
-   ld-2.X-invalid-Add32/64-who-knows
-   exp-ptrcheck:Arith
-   obj:/*lib*/ld-2.*so*
-   obj:/*lib*/ld-2.*so*
-}
-
-{
-   ld-2.X possibly applying relocations
-   exp-ptrcheck:SorG
-   obj:/*lib*/ld-2.*so*
-   obj:/*lib*/ld-2.*so*
-}
-
-# I'm pretty sure this is a false positive caused by the sg_ stuff
-{
-   glibc realpath false positive
-   exp-ptrcheck:SorG
-   fun:realpath
-   fun:*
-}
-
-{
-   If I had to guess, inlined or nameless strlen etc in ld.so
-   exp-ptrcheck:Heap
-   obj:/*lib*/ld-2.*so*
-   obj:/*lib*/ld-2.*so*
-}
-
-{
-   I think this is glibc's ultra optimised getenv doing 2 byte reads
-   exp-ptrcheck:SorG
-   fun:getenv
-}
-
-{
-   Occurs on Fedora 7--9?
-   exp-ptrcheck:Heap
-   fun:_dl_fini
-   fun:exit
-   fun:(below main)
-}
-
-
-# Invalid read of size 16
-#    at 0x5643A5C: ??? (strcpy.S:94)
-#    by 0x50C6A99: XtResolvePathname (in /usr/lib/libXt.so.6.0.0)
-#    by 0x50C3856: XtScreenDatabase (in /usr/lib/libXt.so.6.0.0)
-#    by 0x50C4386: _XtDisplayInitialize (in /usr/lib/libXt.so.6.0.0)
-{
-   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept
-   exp-ptrcheck:Heap
-   obj:/*lib*/libc-2.*so*
-   obj:/*lib*/libX*so*
-}
-{
-   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 2
-   exp-ptrcheck:Heap
-   obj:/*lib*/libc-2.*so*
-   obj:/*lib*/libICE*so*
-}
-{
-   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 3
-   exp-ptrcheck:Heap
-   obj:/*lib*/libc-2.*so*
-   obj:/*lib*/libglib*so*
-}
-{
-   Ubuntu 10.04 x86_64, SSEised strcpy, can't intercept - 4
-   exp-ptrcheck:Heap
-   obj:/*lib*/libc-2.*so*
-   obj:/*lib*/libfontconfig*so*
-}

exp-sgcheck.supp

@@ -0,0 +1,20 @@
+{
+   ld-2.X possibly applying relocations
+   exp-sgcheck:SorG
+   obj:/*lib*/ld-2.*so*
+   obj:/*lib*/ld-2.*so*
+}
+
+# I'm pretty sure this is a false positive caused by the sg_ stuff
+{
+   glibc realpath false positive
+   exp-sgcheck:SorG
+   fun:realpath
+   fun:*
+}
+
+{
+   I think this is glibc's ultra optimised getenv doing 2 byte reads
+   exp-sgcheck:SorG
+   fun:getenv
+}

exp-sgcheck/Makefile.am

@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.tool.am
 
-EXTRA_DIST = docs/pc-manual.xml
+EXTRA_DIST = docs/sg-manual.xml
 
 #----------------------------------------------------------------------------
 # Headers, etc
@@ -12,12 +12,12 @@ noinst_HEADERS = \
 	sg_main.h
 
 #----------------------------------------------------------------------------
-# exp-ptrcheck-<platform>
+# exp-sgcheck-<platform>
 #----------------------------------------------------------------------------
 
-noinst_PROGRAMS  = exp-ptrcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@
+noinst_PROGRAMS  = exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@
 if VGCONF_HAVE_PLATFORM_SEC
-noinst_PROGRAMS += exp-ptrcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@
+noinst_PROGRAMS += exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@
 endif
 
 EXP_PTRCHECK_SOURCES_COMMON = \
@@ -26,53 +26,53 @@ EXP_PTRCHECK_SOURCES_COMMON = \
 	pc_main.c \
 	sg_main.c
 
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES      = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES      = \
 	$(EXP_PTRCHECK_SOURCES_COMMON)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS     = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS     = \
 	$(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS       = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS       = \
 	$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_DEPENDENCIES = \
 	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD        = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD        = \
 	$(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS      = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS      = \
 	$(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \
+exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \
 	$(top_builddir)/coregrind/link_tool_exe_@VGCONF_OS@ \
 	@VALT_LOAD_ADDRESS_PRI@ \
 	$(LINK) \
-	$(exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \
-	$(exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS)
+	$(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \
+	$(exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS)
 
 if VGCONF_HAVE_PLATFORM_SEC
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES      = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES      = \
 	$(EXP_PTRCHECK_SOURCES_COMMON)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS     = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS     = \
 	$(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS       = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS       = \
 	$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_DEPENDENCIES = \
 	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD        = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD        = \
 	$(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS      = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS      = \
 	$(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
-exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \
+exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \
 	$(top_builddir)/coregrind/link_tool_exe_@VGCONF_OS@ \
 	@VALT_LOAD_ADDRESS_SEC@ \
 	$(LINK) \
-	$(exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \
-	$(exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS)
+	$(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \
+	$(exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS)
 endif
 
 #----------------------------------------------------------------------------
-# vgpreload_exp-ptrcheck-<platform>.so
+# vgpreload_exp-sgcheck-<platform>.so
 #----------------------------------------------------------------------------
 
-noinst_PROGRAMS += vgpreload_exp-ptrcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so
+noinst_PROGRAMS += vgpreload_exp-sgcheck-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so
 if VGCONF_HAVE_PLATFORM_SEC
-noinst_PROGRAMS += vgpreload_exp-ptrcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so
+noinst_PROGRAMS += vgpreload_exp-sgcheck-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so
 endif
 
 if VGCONF_OS_IS_DARWIN
@@ -81,28 +81,28 @@ endif
 
 VGPRELOAD_EXP_PTRCHECK_SOURCES_COMMON = h_intercepts.c
 
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES      = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES      = \
 	$(VGPRELOAD_EXP_PTRCHECK_SOURCES_COMMON)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS     = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS     = \
 	$(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS       = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS       = \
 	$(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) -O2
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \
 	$(LIBREPLACEMALLOC_@VGCONF_PLATFORM_PRI_CAPS@)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS      = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS      = \
 	$(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \
 	$(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@)
 
 if VGCONF_HAVE_PLATFORM_SEC
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES      = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES      = \
 	$(VGPRELOAD_EXP_PTRCHECK_SOURCES_COMMON)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS     = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS     = \
 	$(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS       = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS       = \
 	$(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) -O2
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_DEPENDENCIES = \
 	$(LIBREPLACEMALLOC_@VGCONF_PLATFORM_SEC_CAPS@)
-vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS      = \
+vgpreload_exp_sgcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS      = \
 	$(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) \
 	$(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@)
 endif

exp-sgcheck/pc_main.c

@@ -57,18 +57,18 @@ static void pc_pre_clo_init(void)
 {
 #if defined(VGO_darwin)
    // This makes the (all-failing) regtests run much faster.
-   VG_(printf)("Ptrcheck doesn't work on Darwin yet, sorry.\n");
+   VG_(printf)("SGCheck doesn't work on Darwin yet, sorry.\n");
    VG_(exit)(1);
 #endif
 #if defined(VGA_s390x)
    /* fixs390: to be done. */
-   VG_(printf)("Ptrcheck doesn't work s390x yet, sorry.\n");
+   VG_(printf)("SGCheck doesn't work s390x yet, sorry.\n");
    VG_(exit)(1);
 #endif
 
    // Can't change the name until we change the names in suppressions
    // too.
-   VG_(details_name)            ("exp-ptrcheck");
+   VG_(details_name)            ("exp-sgcheck");
    VG_(details_version)         (NULL);
    VG_(details_description)     ("a stack and global array "
                                  "overrun detector");