|
From: <sv...@va...> - 2005-07-02 18:25:07
|
Author: njn Date: 2005-07-02 19:24:58 +0100 (Sat, 02 Jul 2005) New Revision: 4086 Log: Don't need a foo_SOURCES line if the program has only a single source fil= e named foo.c. Now again using the right flags for building fpu_lazy_eflags.c, too. Modified: trunk/cachegrind/tests/Makefile.am trunk/helgrind/tests/Makefile.am trunk/memcheck/tests/Makefile.am trunk/memcheck/tests/x86/Makefile.am trunk/none/tests/Makefile.am trunk/none/tests/x86/Makefile.am Modified: trunk/cachegrind/tests/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cachegrind/tests/Makefile.am 2005-07-02 17:36:11 UTC (rev 4085) +++ trunk/cachegrind/tests/Makefile.am 2005-07-02 18:24:58 UTC (rev 4086) @@ -13,8 +13,6 @@ AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -g =20 # C ones -chdir_SOURCES =3D chdir.c -dlclose_SOURCES =3D dlclose.c dlclose_LDADD =3D -ldl myprint_so_SOURCES =3D myprint.c myprint_so_LDFLAGS =3D -shared -fPIC Modified: trunk/helgrind/tests/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/helgrind/tests/Makefile.am 2005-07-02 17:36:11 UTC (rev 4085) +++ trunk/helgrind/tests/Makefile.am 2005-07-02 18:24:58 UTC (rev 4086) @@ -12,13 +12,6 @@ check_PROGRAMS =3D \ allok deadlock inherit race race2 readshared =20 -allok_SOURCES =3D allok.c -deadlock_SOURCES =3D deadlock.c -inherit_SOURCES =3D inherit.c -race_SOURCES =3D race.c -race2_SOURCES =3D race2.c -readshared_SOURCES =3D readshared.c - # force -gstabs, because we don't print symaddr for DWARF yet AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -gstabs LDADD =3D -lpthread Modified: trunk/memcheck/tests/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/memcheck/tests/Makefile.am 2005-07-02 17:36:11 UTC (rev 4085) +++ trunk/memcheck/tests/Makefile.am 2005-07-02 18:24:58 UTC (rev 4086) @@ -115,84 +115,20 @@ AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -g=20 AM_CXXFLAGS =3D $(AM_CFLAGS) =20 -# C ones -#addressable_SOURCES =3D addressable.c -#badaddrvalue_SOURCES =3D badaddrvalue.c -#badfree_SOURCES =3D badfree.c -#badjump_SOURCES =3D badjump.c -#badjump2_SOURCES =3D badjump2.c -#badloop_SOURCES =3D badloop.c -#badpoll_SOURCES =3D badpoll.c -#badrw_SOURCES =3D badrw.c -#brk_SOURCES =3D brk.c -#brk2_SOURCES =3D brk2.c -#buflen_check_SOURCES =3D buflen_check.c -#clientperm_SOURCES =3D clientperm.c -custom_alloc_SOURCES =3D custom_alloc.c -describe_block_SOURCES =3D describe-block.c -doublefree_SOURCES =3D doublefree.c -error_counts_SOURCES =3D error_counts.c -errs1_SOURCES =3D errs1.c -execve_SOURCES =3D execve.c -execve2_SOURCES =3D execve2.c -exitprog_SOURCES =3D exitprog.c -fprw_SOURCES =3D fprw.c -fwrite_SOURCES =3D fwrite.c -inits_SOURCES =3D inits.c -inline_SOURCES =3D inline.c -leak_0_SOURCES =3D leak-0.c -leak_cycle_SOURCES =3D leak-cycle.c -leak_tree_SOURCES =3D leak-tree.c -leak_regroot_SOURCES =3D leak-regroot.c -leakotron_SOURCES =3D leakotron.c -malloc1_SOURCES =3D malloc1.c -malloc2_SOURCES =3D malloc2.c -malloc3_SOURCES =3D malloc3.c -manuel1_SOURCES =3D manuel1.c -manuel2_SOURCES =3D manuel2.c -manuel3_SOURCES =3D manuel3.c -match_overrun_SOURCES =3D match-overrun.c -mmaptest_SOURCES =3D mmaptest.c -memalign_test_SOURCES =3D memalign_test.c -memalign2_SOURCES =3D memalign2.c -memcmptest_SOURCES =3D memcmptest.c +# Extra stuff for C tests memcmptest_CFLAGS =3D $(AM_CFLAGS) -fno-builtin-memcmp -mempool_SOURCES =3D mempool.c -nanoleak_SOURCES =3D nanoleak.c -null_socket_SOURCES =3D null_socket.c -overlap_SOURCES =3D overlap.c # Don't allow GCC to inline memcpy(), because then we can't intercept it overlap_CFLAGS =3D $(AM_CFLAGS) -fno-builtin-memcpy -#pointer_trace_SOURCES =3D pointer-trace.c -post_syscall_SOURCES =3D post-syscall.c -realloc1_SOURCES =3D realloc1.c -realloc2_SOURCES =3D realloc2.c -realloc3_SOURCES =3D realloc3.c -sigkill_SOURCES =3D sigkill.c -signal2_SOURCES =3D signal2.c -sigprocmask_SOURCES =3D sigprocmask.c -stack_changes_SOURCES =3D stack_changes.c -supp1_SOURCES =3D supp.c -supp2_SOURCES =3D supp.c -suppfree_SOURCES =3D suppfree.c -sigaltstack_SOURCES =3D sigaltstack.c -trivialleak_SOURCES =3D trivialleak.c -weirdioctl_SOURCES =3D weirdioctl.c -metadata_SOURCES =3D metadata.c -strchr_SOURCES =3D strchr.c -str_tester_SOURCES =3D str_tester.c str_tester_CFLAGS =3D $(AM_CFLAGS) -Wno-shadow -writev_SOURCES =3D writev.c -xml1_SOURCES =3D xml1.c -zeropage_SOURCES =3D zeropage.c +supp1_SOURCES =3D supp.c +supp2_SOURCES =3D supp.c =20 -# C++ ones +# C++ tests mismatches_SOURCES =3D mismatches.cpp new_nothrow_SOURCES =3D new_nothrow.cpp new_override_SOURCES =3D new_override.cpp =20 # Valgrind unit self-tests -hello_SOURCES =3D hello.c ## If we support PIE, build hello as a PIE, otherwise vgtest_ume cannot = load ## (I'm not completely sure why, since stage2 can load both PIEs and non= -PIEs, ## maybe it's because stage2 is loaded up high; anyway, it doesn't real= ly @@ -207,6 +143,5 @@ endif =20 vgtest_ume_CFLAGS =3D -DVGA_$(VG_ARCH) -DVGO_$(VG_OS) -vgtest_ume_SOURCES =3D vgtest_ume.c vgtest_ume_LDADD =3D ../../coregrind/m_ume.o =20 Modified: trunk/memcheck/tests/x86/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/memcheck/tests/x86/Makefile.am 2005-07-02 17:36:11 UTC (rev 408= 5) +++ trunk/memcheck/tests/x86/Makefile.am 2005-07-02 18:24:58 UTC (rev 408= 6) @@ -22,13 +22,7 @@ AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow -g=20 AM_CXXFLAGS =3D $(AM_CFLAGS) =20 -fpeflags_SOURCES =3D fpeflags.c # must be built with these flags -- bug only occurred with them fpeflags_CFLAGS =3D $(AM_CFLAGS) -march=3Di686 pushfpopf_SOURCES =3D pushfpopf_c.c pushfpopf_s.s -scalar_SOURCES =3D scalar.c -scalar_exit_group_SOURCES =3D scalar_exit_group.c -scalar_fork_SOURCES =3D scalar_fork.c -scalar_supp_SOURCES =3D scalar_supp.c -scalar_vfork_SOURCES =3D scalar_vfork.c tronical_SOURCES =3D tronical.S Modified: trunk/none/tests/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/none/tests/Makefile.am 2005-07-02 17:36:11 UTC (rev 4085) +++ trunk/none/tests/Makefile.am 2005-07-02 18:24:58 UTC (rev 4086) @@ -125,94 +125,28 @@ AM_CPPFLAGS =3D -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir= )/include AM_CXXFLAGS =3D $(AM_CFLAGS) =20 -# generic C ones -ansi_SOURCES =3D ansi.c +# Extra stuff for C tests ansi_CFLAGS =3D -ansi -args_SOURCES =3D args.c -as_mmap_SOURCES =3D as_mmap.c -as_shm_SOURCES =3D as_shm.c -async_sigs_SOURCES =3D async-sigs.c -bitfield1_SOURCES =3D bitfield1.c -blockfault_SOURCES =3D blockfault.c -closeall_SOURCES =3D closeall.c -coolo_strlen_SOURCES =3D coolo_strlen.c -discard_SOURCES =3D discard.c -exec_sigmask_SOURCES =3D exec-sigmask.c -execve_SOURCES =3D execve.c -faultstatus_SOURCES =3D faultstatus.c -fcntl_setown_SOURCES =3D fcntl_setown.c -fdleak_cmsg_SOURCES =3D fdleak_cmsg.c -fdleak_creat_SOURCES =3D fdleak_creat.c -fdleak_dup_SOURCES =3D fdleak_dup.c -fdleak_dup2_SOURCES =3D fdleak_dup2.c -fdleak_fcntl_SOURCES =3D fdleak_fcntl.c -fdleak_ipv4_SOURCES =3D fdleak_ipv4.c -fdleak_open_SOURCES =3D fdleak_open.c -fdleak_pipe_SOURCES =3D fdleak_pipe.c -fdleak_socketpair_SOURCES =3D fdleak_socketpair.c -fork_SOURCES =3D fork.c -floored_SOURCES =3D floored.c floored_LDADD =3D -lm -fucomip_SOURCES =3D fucomip.c -pending_SOURCES =3D pending.c -manythreads_SOURCES =3D manythreads.c manythreads_LDADD =3D -lpthread -map_unaligned_SOURCES =3D map_unaligned.c -map_unmap_SOURCES =3D map_unmap.c -mq_SOURCES =3D mq.c mq_LDADD =3D -lrt -mremap_SOURCES =3D mremap.c -munmap_exe_SOURCES =3D munmap_exe.c -pth_atfork1_SOURCES =3D pth_atfork1.c pth_atfork1_LDADD =3D -lpthread -pth_blockedsig_SOURCES =3D pth_blockedsig.c pth_blockedsig_LDADD =3D -lpthread -pth_cancel1_SOURCES =3D pth_cancel1.c pth_cancel1_LDADD =3D -lpthread -pth_cancel2_SOURCES =3D pth_cancel2.c pth_cancel2_LDADD =3D -lpthread -pth_cvsimple_SOURCES =3D pth_cvsimple.c pth_cvsimple_LDADD =3D -lpthread -pth_empty_SOURCES =3D pth_empty.c pth_empty_LDADD =3D -lpthread -pth_exit_SOURCES =3D pth_exit.c pth_exit_LDADD =3D -lpthread -pth_exit2_SOURCES =3D pth_exit2.c pth_exit2_LDADD =3D -lpthread -pth_mutexspeed_SOURCES =3D pth_mutexspeed.c pth_mutexspeed_LDADD =3D -lpthread -pth_once_SOURCES =3D pth_once.c pth_once_LDADD =3D -lpthread -pth_rwlock_SOURCES =3D pth_rwlock.c pth_rwlock_LDADD =3D -lpthread -pth_stackalign_SOURCES =3D pth_stackalign.c pth_stackalign_LDADD =3D -lpthread -rcrl_SOURCES =3D rcrl.c -readline1_SOURCES =3D readline1.c -res_search_SOURCES =3D res_search.c res_search_LDADD =3D -lresolv -lpthread -resolv_SOURCES =3D resolv.c -rlimit_nofile_SOURCES =3D rlimit_nofile.c -selfrun_SOURCES =3D selfrun.c -sem_SOURCES =3D sem.c -semlimit_SOURCES =3D semlimit.c semlimit_LDADD =3D -lpthread -smc1_SOURCES =3D smc1.c -sha1_test_SOURCES =3D sha1_test.c -shortpush_SOURCES =3D shortpush.c -shorts_SOURCES =3D shorts.c -sigstackgrowth_SOURCES =3D sigstackgrowth.c -susphello_SOURCES =3D susphello.c susphello_LDADD =3D -lpthread -stackgrowth_SOURCES =3D stackgrowth.c -syscall_restart1_SOURCES =3D syscall-restart1.c -syscall_restart2_SOURCES =3D syscall-restart2.c -system_SOURCES =3D system.c -thread_exits_SOURCES =3D thread-exits.c thread_exits_LDADD =3D -lpthread -threaded_fork_SOURCES =3D threaded-fork.c threaded_fork_LDADD =3D -lpthread -threadederrno_SOURCES =3D threadederrno.c threadederrno_LDADD =3D -lpthread tls_SOURCES =3D tls.c tls2.c tls_DEPENDENCIES =3D tls.so @@ -225,15 +159,10 @@ tls_so_CFLAGS =3D -fPIC tls2_so_SOURCES =3D tls2_so.c tls2_so_LDFLAGS =3D -shared -vgprintf_SOURCES =3D vgprintf.c -yield_SOURCES =3D yield.c yield_CFLAGS =3D $(AM_CFLAGS) -D__$(VG_ARCH)__ yield_LDADD =3D -lpthread =20 -# generic C++ ones +# C++ tests coolo_sigaction_SOURCES =3D coolo_sigaction.cpp gxx304_SOURCES =3D gxx304.cpp =20 -# must be built with these flags -- bug only occurred with them -fpu_lazy_eflags.o: CFLAGS +=3D -O2 -mcpu=3Dpentiumpro -march=3Dpentiumpr= o - Modified: trunk/none/tests/x86/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/none/tests/x86/Makefile.am 2005-07-02 17:36:11 UTC (rev 4085) +++ trunk/none/tests/x86/Makefile.am 2005-07-02 18:24:58 UTC (rev 4086) @@ -28,12 +28,9 @@ AM_CXXFLAGS =3D $(AM_CFLAGS) =20 # generic C ones -badseg_SOURCES =3D badseg.c -bt_everything_SOURCES =3D bt_everything.c -bt_literal_SOURCES =3D bt_literal.c cpuid_SOURCES =3D cpuid_c.c cpuid_s.s -fpu_lazy_eflags_SOURCES =3D fpu_lazy_eflags.c -getseg_SOURCES =3D getseg.c +# fpu_lazy_eflags must use these flags -- the bug only occurred with the= m +fpu_lazy_eflags_CFLAGS =3D -O2 -march=3Dpentiumpro insn_basic_SOURCES =3D insn_basic.def insn_basic_LDADD =3D -lm insn_fpu_SOURCES =3D insn_fpu.def @@ -48,10 +45,6 @@ insn_sse_LDADD =3D -lm insn_sse2_SOURCES =3D insn_sse2.def insn_sse2_LDADD =3D -lm -int_SOURCES =3D int.c -pushpopseg_SOURCES =3D pushpopseg.c -seg_override_SOURCES =3D seg_override.c -sigcontext_SOURCES =3D sigcontext.c =20 .def.c: $(srcdir)/gen_insn_test.pl $(PERL) $(srcdir)/gen_insn_test.pl < $< > $@ |