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