[PATCH 0/2] Fix and adjustment to tools/fuzz

[PATCH 0/2] Fix and adjustment to tools/fuzz

[Wei Liu]

Wei Liu (2):
  tools/fuzz: fix compilation after 897129d
  tools/fuzz: make sure targets are always built

 tools/fuzz/Makefile                          | 6 ++----
 tools/fuzz/libelf/Makefile                   | 3 +++
 tools/fuzz/x86_instruction_emulator/Makefile | 5 ++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[PATCH 1/2] tools/fuzz: fix compilation after 897129d

[Wei Liu]

We need to add -D__XEN_TOOLS__ so that the correct register names are
generated.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/fuzz/x86_instruction_emulator/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/fuzz/x86_instruction_emulator/Makefile b/tools/fuzz/x86_instruction_emulator/Makefile
index a97f507..505de39 100644
--- a/tools/fuzz/x86_instruction_emulator/Makefile
+++ b/tools/fuzz/x86_instruction_emulator/Makefile
@@ -14,7 +14,7 @@ x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h:
 x86_emulate.c x86_emulate.h: %:
 	[ -L $* ] || ln -sf $(XEN_ROOT)/tools/tests/x86_emulator/$*
 
-CFLAGS += $(CFLAGS_xeninclude)
+CFLAGS += $(CFLAGS_xeninclude) -D__XEN_TOOLS__
 
 x86_emulate.o: x86_emulate.c x86_emulate.h x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h
 
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[PATCH 2/2] tools/fuzz: make sure targets are always built

[Wei Liu]

Invocation of `make' in top-level directory would end up invoking the
install target.

Adjust fuzzing target makefiles a bit so that they are always build in
that situation.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/fuzz/Makefile                          | 6 ++----
 tools/fuzz/libelf/Makefile                   | 3 +++
 tools/fuzz/x86_instruction_emulator/Makefile | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/fuzz/Makefile b/tools/fuzz/Makefile
index ce00b82..986fbb8 100644
--- a/tools/fuzz/Makefile
+++ b/tools/fuzz/Makefile
@@ -5,7 +5,5 @@ SUBDIRS-y :=
 SUBDIRS-y += libelf
 SUBDIRS-y += x86_instruction_emulator
 
-.PHONY: all clean distclean
-all clean distclean: %: subdirs-%
-
-install:
+.PHONY: all clean distclean install
+all clean distclean install: %: subdirs-%
diff --git a/tools/fuzz/libelf/Makefile b/tools/fuzz/libelf/Makefile
index 0e9d40a..c73ce44 100644
--- a/tools/fuzz/libelf/Makefile
+++ b/tools/fuzz/libelf/Makefile
@@ -29,3 +29,6 @@ distclean: clean
 .PHONY: clean
 clean:
 	rm -f *.o *.a
+
+.PHONY: install
+install: all
diff --git a/tools/fuzz/x86_instruction_emulator/Makefile b/tools/fuzz/x86_instruction_emulator/Makefile
index 505de39..20431b0 100644
--- a/tools/fuzz/x86_instruction_emulator/Makefile
+++ b/tools/fuzz/x86_instruction_emulator/Makefile
@@ -34,3 +34,6 @@ distclean: clean
 .PHONY: clean
 clean:
 	rm -f *.a *.o
+
+.PHONY: install
+install: all
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[PATCH] tools/fuzz: remove redundant rule in x86 insn fuzzer

[Wei Liu]

The predefined pattern rule works.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/fuzz/x86_instruction_emulator/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/fuzz/x86_instruction_emulator/Makefile b/tools/fuzz/x86_instruction_emulator/Makefile
index 20431b0..1777bf6 100644
--- a/tools/fuzz/x86_instruction_emulator/Makefile
+++ b/tools/fuzz/x86_instruction_emulator/Makefile
@@ -21,8 +21,6 @@ x86_emulate.o: x86_emulate.c x86_emulate.h x86_emulate/x86_emulate.c x86_emulate
 x86-insn-emulator.a: x86_emulate.o
 	$(AR) rc $@ $^
 
-x86-insn-emulator-fuzzer.o: x86-insn-emulator-fuzzer.c
-
 # Common targets
 .PHONY: all
 all: x86-instruction-emulator-fuzzer-all
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel