Fix exp-bbv testcases such that they can be built out-of-tree.
Part of fixing #333628.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13982 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/exp-bbv/tests/amd64-linux/Makefile.am b/exp-bbv/tests/amd64-linux/Makefile.am
index a7eca39..c5c68a2 100644
--- a/exp-bbv/tests/amd64-linux/Makefile.am
+++ b/exp-bbv/tests/amd64-linux/Makefile.am
@@ -23,7 +23,7 @@
rep_prefix.stderr.exp \
rep_prefix.vgtest
-AM_CCASFLAGS += -ffreestanding
+AM_CCASFLAGS += -ffreestanding -Xassembler -I$(top_srcdir)/exp-bbv/tests
LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/exp-bbv/tests/amd64-linux/ll.S b/exp-bbv/tests/amd64-linux/ll.S
index 3e70cba..8f44606 100644
--- a/exp-bbv/tests/amd64-linux/ll.S
+++ b/exp-bbv/tests/amd64-linux/ll.S
@@ -9,7 +9,7 @@
#
-.include "../logo.include"
+.include "logo.include"
# offsets into the results returned by the uname syscall
.equ U_SYSNAME,0
@@ -563,7 +563,7 @@
three: .ascii "Three\0"
four: .ascii "Four\0"
-.include "../logo.lzss_new"
+.include "logo.lzss_new"
disk_buffer:
.ascii "processor : 0\n"
diff --git a/exp-bbv/tests/arm-linux/Makefile.am b/exp-bbv/tests/arm-linux/Makefile.am
index d022cf7..9b91b28 100644
--- a/exp-bbv/tests/arm-linux/Makefile.am
+++ b/exp-bbv/tests/arm-linux/Makefile.am
@@ -14,7 +14,7 @@
million.post.exp \
million.vgtest
-AM_CCASFLAGS += -ffreestanding
+AM_CCASFLAGS += -ffreestanding -Xassembler -I$(top_srcdir)/exp-bbv/tests
LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/exp-bbv/tests/arm-linux/ll.S b/exp-bbv/tests/arm-linux/ll.S
index 0fd896a..231cd89 100644
--- a/exp-bbv/tests/arm-linux/ll.S
+++ b/exp-bbv/tests/arm-linux/ll.S
@@ -7,7 +7,7 @@
# Modified to remove non-deterministic system calls
# And to avoid reading from /proc
-.include "../logo.include"
+.include "logo.include"
# offsets into the results returned by the uname syscall
.equ U_SYSNAME,0
@@ -480,7 +480,7 @@
sysinfo_buff:
.long 0,0,0,0,512*1024*1024,0,0,0
-.include "../logo.lzss_new"
+.include "logo.lzss_new"
#============================================================================
diff --git a/exp-bbv/tests/ppc32-linux/Makefile.am b/exp-bbv/tests/ppc32-linux/Makefile.am
index c094959..56646f4 100644
--- a/exp-bbv/tests/ppc32-linux/Makefile.am
+++ b/exp-bbv/tests/ppc32-linux/Makefile.am
@@ -14,7 +14,7 @@
million.post.exp \
million.vgtest
-AM_CCASFLAGS += -ffreestanding -m32
+AM_CCASFLAGS += -ffreestanding -m32 -Xassembler -I$(top_srcdir)/exp-bbv/tests
LDFLAGS += -nostartfiles -nodefaultlibs -m32
diff --git a/exp-bbv/tests/ppc32-linux/ll.S b/exp-bbv/tests/ppc32-linux/ll.S
index 7621b95..692bd5d 100644
--- a/exp-bbv/tests/ppc32-linux/ll.S
+++ b/exp-bbv/tests/ppc32-linux/ll.S
@@ -36,7 +36,7 @@
.equ BSS_BEGIN,25
.equ DATA_BEGIN,26
-.include "../logo.include"
+.include "logo.include"
.globl _start
_start:
@@ -503,7 +503,7 @@
data_begin:
-.include "../logo.lzss_new"
+.include "logo.lzss_new"
ver_string: .ascii " Version \0"
compiled_string: .ascii ", Compiled \0"
diff --git a/exp-bbv/tests/x86-linux/Makefile.am b/exp-bbv/tests/x86-linux/Makefile.am
index f2971e1..a16061f 100644
--- a/exp-bbv/tests/x86-linux/Makefile.am
+++ b/exp-bbv/tests/x86-linux/Makefile.am
@@ -14,7 +14,7 @@
ll.post.exp \
ll.vgtest
-AM_CCASFLAGS += -ffreestanding
+AM_CCASFLAGS += -ffreestanding -Xassembler -I$(top_srcdir)/exp-bbv/tests
LDFLAGS += @FLAG_M32@ -static -nostartfiles -nodefaultlibs
diff --git a/exp-bbv/tests/x86-linux/ll.S b/exp-bbv/tests/x86-linux/ll.S
index f0c0d2d..b9dc52f 100644
--- a/exp-bbv/tests/x86-linux/ll.S
+++ b/exp-bbv/tests/x86-linux/ll.S
@@ -8,7 +8,7 @@
# And to avoid reading from /proc
#
-.include "../logo.include"
+.include "logo.include"
# offsets into the results returned by the uname syscall
.equ U_SYSNAME,0
@@ -563,7 +563,7 @@
three: .ascii "Three\0"
four: .ascii "Four\0"
-.include "../logo.lzss_new"
+.include "logo.lzss_new"
disk_buffer:
.ascii "processor : 0\n"