From: Julian Seward Date: Wed, 23 Mar 2005 13:32:27 +0000 (+0000) Subject: Make the regtests buildable on amd64, by moving various x86 specific X-Git-Tag: svn/VALGRIND_3_0_0~902 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a92e30c3debc489e1b951d7f13197a29d544d3;p=thirdparty%2Fvalgrind.git Make the regtests buildable on amd64, by moving various x86 specific programs to the right place. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3416 --- diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index fc3d3f3759..3abf2331f6 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -29,7 +29,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ floored.vgtest \ fork.stderr.exp fork.stdout.exp fork.vgtest \ fucomip.stderr.exp fucomip.vgtest \ - getseg.stdout.exp getseg.stderr.exp getseg.vgtest \ gxx304.stderr.exp gxx304.vgtest \ manythreads.stdout.exp manythreads.stderr.exp manythreads.vgtest \ map_unaligned.stderr.exp map_unaligned.vgtest \ @@ -54,7 +53,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ sha1_test.stderr.exp sha1_test.vgtest \ shortpush.stderr.exp shortpush.vgtest \ shorts.stderr.exp shorts.vgtest \ - sigcontext.stdout.exp sigcontext.stderr.exp sigcontext.vgtest \ sigstackgrowth.stdout.exp sigstackgrowth.stderr.exp sigstackgrowth.vgtest \ smc1.stderr.exp smc1.stdout.exp smc1.vgtest \ stackgrowth.stdout.exp stackgrowth.stderr.exp stackgrowth.vgtest \ @@ -69,11 +67,11 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ check_PROGRAMS = \ args async-sigs bitfield1 blockfault closeall coolo_strlen \ discard exec-sigmask execve faultstatus fcntl_setown floored fork \ - fucomip getseg \ + fucomip \ manythreads \ munmap_exe map_unaligned map_unmap mq mremap rcrl readline1 \ resolv rlimit_nofile selfrun sem semlimit sha1_test \ - shortpush shorts sigcontext \ + shortpush shorts \ stackgrowth sigstackgrowth \ smc1 susphello pending pth_blockedsig pth_stackalign \ syscall-restart1 syscall-restart2 system \ @@ -101,7 +99,6 @@ fork_SOURCES = fork.c floored_SOURCES = floored.c floored_LDADD = -lm fucomip_SOURCES = fucomip.c -getseg_SOURCES = getseg.c pending_SOURCES = pending.c manythreads_SOURCES = manythreads.c manythreads_LDADD = -lpthread @@ -127,7 +124,6 @@ smc1_SOURCES = smc1.c sha1_test_SOURCES = sha1_test.c shortpush_SOURCES = shortpush.c shorts_SOURCES = shorts.c -sigcontext_SOURCES = sigcontext.c sigstackgrowth_SOURCES = sigstackgrowth.c susphello_SOURCES = susphello.c susphello_LDADD = -lpthread @@ -146,7 +142,8 @@ tls_LDADD = tls.so -lpthread tls_so_SOURCES = tls_so.c tls_so_LDADD = tls2.so tls_so_DEPENDENCIES = tls2.so -tls_so_LDFLAGS = -Wl,-rpath,$(top_builddir)/none/tests -shared +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 yield_SOURCES = yield.c diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am index b4e2ac334c..fb08b89852 100644 --- a/none/tests/x86/Makefile.am +++ b/none/tests/x86/Makefile.am @@ -10,17 +10,19 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ cpuid.stderr.exp cpuid.stdout.exp cpuid.vgtest \ fpu_lazy_eflags.stderr.exp fpu_lazy_eflags.stdout.exp \ fpu_lazy_eflags.vgtest \ + getseg.stdout.exp getseg.stderr.exp getseg.vgtest \ int.stderr.exp int.stdout.exp int.vgtest \ $(addsuffix .stderr.exp,$(INSN_TESTS)) \ $(addsuffix .stdout.exp,$(INSN_TESTS)) \ $(addsuffix .vgtest,$(INSN_TESTS)) \ pushpopseg.stderr.exp pushpopseg.stdout.exp pushpopseg.vgtest \ - seg_override.stderr.exp seg_override.stdout.exp seg_override.vgtest + seg_override.stderr.exp seg_override.stdout.exp seg_override.vgtest \ + sigcontext.stdout.exp sigcontext.stderr.exp sigcontext.vgtest check_PROGRAMS = \ badseg bt_everything bt_literal cpuid fpu_lazy_eflags \ - $(INSN_TESTS) \ - int pushpopseg seg_override + getseg $(INSN_TESTS) \ + int pushpopseg seg_override sigcontext AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g -I$(top_srcdir)/include AM_CXXFLAGS = $(AM_CFLAGS) @@ -31,6 +33,7 @@ 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 insn_basic_SOURCES = insn_basic.def insn_basic_LDADD = -lm insn_fpu_SOURCES = insn_fpu.def @@ -48,6 +51,7 @@ 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 < $< > $@ diff --git a/none/tests/getseg.c b/none/tests/x86/getseg.c similarity index 100% rename from none/tests/getseg.c rename to none/tests/x86/getseg.c diff --git a/none/tests/getseg.stderr.exp b/none/tests/x86/getseg.stderr.exp similarity index 100% rename from none/tests/getseg.stderr.exp rename to none/tests/x86/getseg.stderr.exp diff --git a/none/tests/getseg.stdout.exp b/none/tests/x86/getseg.stdout.exp similarity index 100% rename from none/tests/getseg.stdout.exp rename to none/tests/x86/getseg.stdout.exp diff --git a/none/tests/getseg.vgtest b/none/tests/x86/getseg.vgtest similarity index 100% rename from none/tests/getseg.vgtest rename to none/tests/x86/getseg.vgtest diff --git a/none/tests/sigcontext.c b/none/tests/x86/sigcontext.c similarity index 100% rename from none/tests/sigcontext.c rename to none/tests/x86/sigcontext.c diff --git a/none/tests/sigcontext.stderr.exp b/none/tests/x86/sigcontext.stderr.exp similarity index 100% rename from none/tests/sigcontext.stderr.exp rename to none/tests/x86/sigcontext.stderr.exp diff --git a/none/tests/sigcontext.stdout.exp b/none/tests/x86/sigcontext.stdout.exp similarity index 100% rename from none/tests/sigcontext.stdout.exp rename to none/tests/x86/sigcontext.stdout.exp diff --git a/none/tests/sigcontext.vgtest b/none/tests/x86/sigcontext.vgtest similarity index 100% rename from none/tests/sigcontext.vgtest rename to none/tests/x86/sigcontext.vgtest