Fix VEX/Makefile-gcc

Compile errors because config.h not found. Turns out libvex_inner.h
Also missing was priv/host_generic_reg_alloc3.o causing linking to fail.
Now fixed.

diff --git a/VEX/Makefile-gcc b/VEX/Makefile-gcc
index 0b94e13c5f72397f8d9d63efa46455c54c33dd8c..57e33cdb25e1351ae13cf1d14e1939c46e320ce4 100644 (file)
--- a/VEX/Makefile-gcc
+++ b/VEX/Makefile-gcc
@@ -68,6 +68,7 @@ LIB_OBJS =    priv/ir_defs.o                          \
                priv/host_generic_simd128.o             \
                priv/host_generic_simd256.o             \
                priv/host_generic_reg_alloc2.o          \
+               priv/host_generic_reg_alloc3.o          \
                priv/guest_generic_x87.o                \
                priv/guest_generic_bb_to_IR.o           \
                priv/guest_x86_helpers.o                \
@@ -347,6 +348,10 @@ priv/host_generic_reg_alloc2.o: $(ALL_HEADERS) priv/host_generic_reg_alloc2.c
        $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_generic_reg_alloc2.o \
                                         -c priv/host_generic_reg_alloc2.c
 
+priv/host_generic_reg_alloc3.o: $(ALL_HEADERS) priv/host_generic_reg_alloc3.c
+       $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/host_generic_reg_alloc3.o \
+                                        -c priv/host_generic_reg_alloc3.c
+
 priv/guest_x86_toIR.o: $(ALL_HEADERS) priv/guest_x86_toIR.c
        $(CC) $(CCFLAGS) $(ALL_INCLUDES) -o priv/guest_x86_toIR.o \
                                         -c priv/guest_x86_toIR.c

diff --git a/VEX/pub/libvex_inner.h b/VEX/pub/libvex_inner.h
index 023d1f6a3e8161b166503f8bb07574e216328337..f5db06d565f1c017592458965d9420b2403bbe15 100644 (file)
--- a/VEX/pub/libvex_inner.h
+++ b/VEX/pub/libvex_inner.h
@@ -37,8 +37,6 @@
 // For more details, see README_DEVELOPPERS.
 //--------------------------------------------------------------------
 
-#include "config.h" 
-
 // The code of the inner Valgrind (core or tool code) contains client
 // requests (e.g. from helgrind.h, memcheck.h, ...) to help the
 // outer Valgrind finding (relevant) errors in the inner Valgrind.