PERFORCE change 151778 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=151778

Change 151778 by peter at peter_cheese on 2008/10/23 05:47:08

	Catch up with vendor changes, or revert.

Affected files ...

.. //depot/projects/valgrind/cachegrind/Makefile.am#4 edit
.. //depot/projects/valgrind/cachegrind/tests/Makefile.am#4 edit
.. //depot/projects/valgrind/callgrind/tests/Makefile.am#3 edit
.. //depot/projects/valgrind/helgrind/tests/Makefile.am#4 edit
.. //depot/projects/valgrind/memcheck/tests/Makefile.am#4 edit
.. //depot/projects/valgrind/none/tests/Makefile.am#4 edit
.. //depot/projects/valgrind/none/tests/x86/Makefile.am#4 edit

Differences ...

==== //depot/projects/valgrind/cachegrind/Makefile.am#4 (text+ko) ====

@@ -4,6 +4,7 @@
 
 noinst_HEADERS = cg_arch.h cg_sim.c cg_branchpred.c
 
+noinst_PROGRAMS = 
 if VGP_X86_FREEBSD
 noinst_PROGRAMS += cachegrind-x86-freebsd
 endif

==== //depot/projects/valgrind/cachegrind/tests/Makefile.am#4 (text+ko) ====

@@ -39,7 +39,7 @@
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
 
 # C ones
-if !VG_X86_FREEBSD
+if !VGP_X86_FREEBSD
 dlclose_LDADD		= -ldl
 endif
 myprint_so_SOURCES	= myprint.c

==== //depot/projects/valgrind/callgrind/tests/Makefile.am#3 (text+ko) ====

@@ -15,7 +15,7 @@
 
 check_PROGRAMS = clreq simwork
 
-if !VG_X86_FREEBSD
+if !VGP_X86_FREEBSD
 check_PROGRAMS += threads
 endif
 

==== //depot/projects/valgrind/helgrind/tests/Makefile.am#4 (text+ko) ====

@@ -86,7 +86,7 @@
 	tc24_nonzero_sem.vgtest tc24_nonzero_sem.stdout.exp \
 		tc24_nonzero_sem.stderr.exp-glibc25-amd64
 
-if !VG_X86_FREEBSD
+if !VGP_X86_FREEBSD
 check_PROGRAMS = \
 	hg01_all_ok \
 	hg02_deadlock \

==== //depot/projects/valgrind/memcheck/tests/Makefile.am#4 (text+ko) ====

@@ -232,7 +232,7 @@
 	wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \
 	writev zeropage
 
-if !VG_X86_FREEBSD
+if !VGP_X86_FREEBSD
 check_PROGRAMS += stack_switch
 endif
 

==== //depot/projects/valgrind/none/tests/Makefile.am#4 (text+ko) ====

@@ -147,28 +147,21 @@
 	fdleak_cmsg fdleak_creat fdleak_dup fdleak_dup2 \
 	fdleak_fcntl fdleak_ipv4 fdleak_open fdleak_pipe \
 	fdleak_socketpair \
-	floored fork fucomip \
-	munmap_exe map_unaligned map_unmap \
+	floored fork fucomip manythreads \
+	munmap_exe map_unaligned map_unmap mq mremap mremap2 \
 	nestedfns \
 	pending \
-	rcrl readline1 resolv \
-	rlimit_nofile selfrun sem sha1_test \
-	shortpush shorts stackgrowth sigstackgrowth \
+	pth_atfork1 pth_blockedsig pth_cancel1 pth_cancel2 pth_cvsimple \
+	pth_empty pth_exit pth_exit2 pth_mutexspeed pth_once pth_rwlock \
+	pth_stackalign \
+	rcrl readline1 res_search resolv \
+	rlimit_nofile selfrun sem semlimit sha1_test \
+	shortpush shorts stackgrowth sigstackgrowth susphello \
 	syscall-restart1 syscall-restart2 system \
-	vgprintf \
+	thread-exits threaded-fork threadederrno \
+	tls tls.so tls2.so vgprintf \
 	coolo_sigaction gxx304
 
-#if !VG_X86_FREEBSD
-#check_PROGRAMS += manythreads mq mremap mremap2 \
-#	pth_atfork1 pth_blockedsig pth_cancel1 pth_cancel2 pth_cvsimple \
-#	pth_empty pth_exit pth_exit2 pth_mutexspeed pth_once pth_rwlock \
-#	pth_stackalign \
-#	res_search \
-#	semlimit susphello \
-#	thread-exits threaded-fork threadederrno \
-#	tls.so tls2.so \
-#endif
-
 AM_CFLAGS   = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CXXFLAGS = $(AM_CFLAGS)

==== //depot/projects/valgrind/none/tests/x86/Makefile.am#4 (text+ko) ====

@@ -1,7 +1,6 @@
 noinst_SCRIPTS = filter_cpuid filter_stderr gen_insn_test.pl
 
 CLEANFILES = $(addsuffix .c,$(INSN_TESTS))
-INSN_TESTS = insn_basic insn_cmov 
 
 INSN_TESTS = insn_basic insn_fpu insn_cmov insn_mmx insn_mmxext \
 		insn_sse insn_sse2