|
From: <sv...@va...> - 2008-05-15 12:48:29
|
Author: bart
Date: 2008-05-15 13:48:31 +0100 (Thu, 15 May 2008)
New Revision: 8094
Log:
VEX guest state offsets are now verified instead of generated. Eliminated BUILD_CC.
Modified:
branches/CROSS_COMPILATION/Makefile.am
branches/CROSS_COMPILATION/Makefile.tool.am
branches/CROSS_COMPILATION/coregrind/Makefile.am
branches/CROSS_COMPILATION/vex-cross-compilation.patch
Modified: branches/CROSS_COMPILATION/Makefile.am
===================================================================
--- branches/CROSS_COMPILATION/Makefile.am 2008-05-15 11:45:08 UTC (rev 8093)
+++ branches/CROSS_COMPILATION/Makefile.am 2008-05-15 12:48:31 UTC (rev 8094)
@@ -124,6 +124,7 @@
VEX/LICENSE.GPL \
VEX/Makefile \
VEX/auxprogs/genoffsets.c \
+ VEX/auxprogs/verifyoffsets.c \
VEX/pub/libvex_guest_amd64.h \
VEX/pub/libvex_ir.h \
VEX/pub/libvex_guest_ppc32.h \
Modified: branches/CROSS_COMPILATION/Makefile.tool.am
===================================================================
--- branches/CROSS_COMPILATION/Makefile.tool.am 2008-05-15 11:45:08 UTC (rev 8093)
+++ branches/CROSS_COMPILATION/Makefile.tool.am 2008-05-15 12:48:31 UTC (rev 8094)
@@ -51,43 +51,43 @@
##.PHONY: @VEX_DIR@/libvex.a
@VEX_DIR@/libvex_x86_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" AR="$(AR)" \
+ $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" \
libvex_x86_linux.a \
EXTRA_CFLAGS="$(AM_CFLAGS_X86_LINUX) @FLAG_WDECL_AFTER_STMT@ \
@FLAG_FNO_STACK_PROTECTOR@"
@VEX_DIR@/libvex_amd64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" AR="$(AR)" \
+ $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" \
libvex_amd64_linux.a \
EXTRA_CFLAGS="$(AM_CFLAGS_AMD64_LINUX) @FLAG_WDECL_AFTER_STMT@ \
@FLAG_FNO_STACK_PROTECTOR@"
@VEX_DIR@/libvex_ppc32_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" AR="$(AR)" \
+ $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" \
libvex_ppc32_linux.a \
EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_LINUX) @FLAG_WDECL_AFTER_STMT@ \
@FLAG_FNO_STACK_PROTECTOR@"
@VEX_DIR@/libvex_ppc64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" AR="$(AR)" \
+ $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" \
libvex_ppc64_linux.a \
EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_LINUX) @FLAG_WDECL_AFTER_STMT@ \
@FLAG_FNO_STACK_PROTECTOR@"
@VEX_DIR@/libvex_ppc32_aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" AR="$(AR) -X32" \
+ $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB) -X32" \
libvex_ppc32_aix5.a \
EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_AIX5) @FLAG_WDECL_AFTER_STMT@ \
@FLAG_FNO_STACK_PROTECTOR@"
@VEX_DIR@/libvex_ppc64_aix5.a: @VEX_DIR@/priv/main/vex_svnversion.h
- $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" AR="$(AR) -X64" \
+ $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB) -X64" \
libvex_ppc64_aix5.a \
EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_AIX5) @FLAG_WDECL_AFTER_STMT@ \
@FLAG_FNO_STACK_PROTECTOR@"
@VEX_DIR@/priv/main/vex_svnversion.h:
- $(MAKE) -C @VEX_DIR@ CC="$(CC)" version
+ $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" version
TOOL_LDADD_COMMON = -lgcc
TOOL_LDFLAGS_COMMON_LINUX = -static \
Modified: branches/CROSS_COMPILATION/coregrind/Makefile.am
===================================================================
--- branches/CROSS_COMPILATION/coregrind/Makefile.am 2008-05-15 11:45:08 UTC (rev 8093)
+++ branches/CROSS_COMPILATION/coregrind/Makefile.am 2008-05-15 12:48:31 UTC (rev 8094)
@@ -298,7 +298,7 @@
libcoregrind_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5)
libcoregrind_ppc32_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5)
-libcoregrind_ppc32_aix5_a_AR = $(AR) -X32 cru
+libcoregrind_ppc32_aix5_a_AR = $(RANLIB) -X32 cru
libcoregrind_ppc64_aix5_a_SOURCES = \
$(COREGRIND_SOURCES_COMMON) \
@@ -312,7 +312,7 @@
libcoregrind_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5)
libcoregrind_ppc64_aix5_a_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5)
-libcoregrind_ppc64_aix5_a_AR = $(AR) -X64 cru
+libcoregrind_ppc64_aix5_a_AR = $(RANLIB) -X64 cru
libreplacemalloc_toolpreload_x86_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c
@@ -334,12 +334,12 @@
libreplacemalloc_toolpreload_ppc32_aix5_a_SOURCES = m_replacemalloc/vg_replace_malloc.c
libreplacemalloc_toolpreload_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5)
libreplacemalloc_toolpreload_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -fpic -fno-omit-frame-pointer
-libreplacemalloc_toolpreload_ppc32_aix5_a_AR = $(AR) -X32 cru
+libreplacemalloc_toolpreload_ppc32_aix5_a_AR = $(RANLIB) -X32 cru
libreplacemalloc_toolpreload_ppc64_aix5_a_SOURCES = m_replacemalloc/vg_replace_malloc.c
libreplacemalloc_toolpreload_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5)
libreplacemalloc_toolpreload_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -fpic -fno-omit-frame-pointer
-libreplacemalloc_toolpreload_ppc64_aix5_a_AR = $(AR) -X64 cru
+libreplacemalloc_toolpreload_ppc64_aix5_a_AR = $(RANLIB) -X64 cru
m_dispatch/dispatch-x86-linux.S: libvex_guest_offsets.h
m_dispatch/dispatch-amd64-linux.S: libvex_guest_offsets.h
@@ -356,7 +356,7 @@
m_syswrap/syswrap-main.c: libvex_guest_offsets.h
libvex_guest_offsets.h:
- $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" AR="$(AR)" pub/libvex_guest_offsets.h
+ $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" RANLIB="$(RANLIB)" pub/libvex_guest_offsets.h
VGPRELOAD_CORE_SOURCES_COMMON = vg_preloaded.c
@@ -391,7 +391,7 @@
vgpreload_core_ppc64_aix5_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC64_AIX5)
clean-local:
- $(MAKE) -C @VEX_DIR@ CC="$(CC)" BUILD_CC="$(BUILD_CC)" AR="$(AR)" clean
+ $(MAKE) -C @VEX_DIR@ CC="$(CC)" RANLIB="$(RANLIB)" clean
MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
Modified: branches/CROSS_COMPILATION/vex-cross-compilation.patch
===================================================================
--- branches/CROSS_COMPILATION/vex-cross-compilation.patch 2008-05-15 11:45:08 UTC (rev 8093)
+++ branches/CROSS_COMPILATION/vex-cross-compilation.patch 2008-05-15 12:48:31 UTC (rev 8094)
@@ -1,48 +1,330 @@
-Index: VEX/auxprogs/genoffsets.c
+Index: pub/libvex_guest_offsets_in.h
===================================================================
---- VEX/auxprogs/genoffsets.c (revision 1849)
-+++ VEX/auxprogs/genoffsets.c (working copy)
-@@ -44,6 +44,7 @@
- without prior written permission.
- */
-
-+#include <assert.h>
- #include <stdio.h>
-
- /* A program which generates various guest state offsets. */
-@@ -56,6 +57,12 @@
-
- Int main ( void )
- {
-+ assert(sizeof(UChar) == 1);
-+ assert(sizeof(UShort) == 2);
-+ assert(sizeof(UInt) == 4);
-+ assert(sizeof(ULong) == 8);
-+ assert(sizeof(U128) == 16);
+--- pub/libvex_guest_offsets_in.h (revision 0)
++++ pub/libvex_guest_offsets_in.h (revision 0)
+@@ -0,0 +1,60 @@
++#define OFFSET_x86_EAX 0
++#define OFFSET_x86_EBX 12
++#define OFFSET_x86_ECX 4
++#define OFFSET_x86_EDX 8
++#define OFFSET_x86_ESI 24
++#define OFFSET_x86_EDI 28
++#define OFFSET_x86_EBP 20
++#define OFFSET_x86_ESP 16
++#define OFFSET_x86_EIP 60
++#define OFFSET_x86_CS 280
++#define OFFSET_x86_DS 282
++#define OFFSET_x86_ES 284
++#define OFFSET_x86_FS 286
++#define OFFSET_x86_GS 288
++#define OFFSET_x86_SS 290
+
- // x86
- printf("#define OFFSET_x86_EAX %3d\n",
- offsetof(VexGuestX86State,guest_EAX));
-Index: VEX/Makefile
++#define OFFSET_amd64_RAX 0
++#define OFFSET_amd64_RBX 24
++#define OFFSET_amd64_RCX 8
++#define OFFSET_amd64_RDX 16
++#define OFFSET_amd64_RSI 48
++#define OFFSET_amd64_RDI 56
++#define OFFSET_amd64_RSP 32
++#define OFFSET_amd64_RBP 40
++#define OFFSET_amd64_R8 64
++#define OFFSET_amd64_R9 72
++#define OFFSET_amd64_R10 80
++#define OFFSET_amd64_R11 88
++#define OFFSET_amd64_R12 96
++#define OFFSET_amd64_R13 104
++#define OFFSET_amd64_R14 112
++#define OFFSET_amd64_R15 120
++#define OFFSET_amd64_RIP 168
++
++#define OFFSET_ppc32_GPR0 0
++#define OFFSET_ppc32_GPR2 8
++#define OFFSET_ppc32_GPR3 12
++#define OFFSET_ppc32_GPR4 16
++#define OFFSET_ppc32_GPR5 20
++#define OFFSET_ppc32_GPR6 24
++#define OFFSET_ppc32_GPR7 28
++#define OFFSET_ppc32_GPR8 32
++#define OFFSET_ppc32_GPR9 36
++#define OFFSET_ppc32_GPR10 40
++#define OFFSET_ppc32_CIA 896
++#define OFFSET_ppc32_CR0_0 913
++
++#define OFFSET_ppc64_GPR0 0
++#define OFFSET_ppc64_GPR2 16
++#define OFFSET_ppc64_GPR3 24
++#define OFFSET_ppc64_GPR4 32
++#define OFFSET_ppc64_GPR5 40
++#define OFFSET_ppc64_GPR6 48
++#define OFFSET_ppc64_GPR7 56
++#define OFFSET_ppc64_GPR8 64
++#define OFFSET_ppc64_GPR9 72
++#define OFFSET_ppc64_GPR10 80
++#define OFFSET_ppc64_CIA 1024
++#define OFFSET_ppc64_CR0_0 1053
++
+Index: auxprogs/verifyoffsets.c
===================================================================
---- VEX/Makefile (revision 1849)
-+++ VEX/Makefile (working copy)
-@@ -67,6 +67,9 @@
- ifndef CC
- CC = gcc
- endif
-+ifndef BUILD_CC
-+ CC = gcc
-+endif
- ifndef AR
- AR = ar
- endif
-@@ -179,7 +182,7 @@
+--- auxprogs/verifyoffsets.c (revision 0)
++++ auxprogs/verifyoffsets.c (revision 0)
+@@ -0,0 +1,245 @@
++
++/*--------------------------------------------------------------------*/
++/*--- ---*/
++/*--- This file (auxprogs/genoffsets.c) is ---*/
++/*--- Copyright (C) OpenWorks LLP. All rights reserved. ---*/
++/*--- Copyright (C) 2008 Bart Van Assche <bar...@gm...>---*/
++/*--- ---*/
++/*--------------------------------------------------------------------*/
++
++/*
++ This file is part of LibVEX, a library for dynamic binary
++ instrumentation and translation.
++
++ Copyright (C) 2004-2008 OpenWorks LLP. All rights reserved.
++
++ This library is made available under a dual licensing scheme.
++
++ If you link LibVEX against other code all of which is itself
++ licensed under the GNU General Public License, version 2 dated June
++ 1991 ("GPL v2"), then you may use LibVEX under the terms of the GPL
++ v2, as appearing in the file LICENSE.GPL. If the file LICENSE.GPL
++ is missing, you can obtain a copy of the GPL v2 from the Free
++ Software Foundation Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ 02110-1301, USA.
++
++ For any other uses of LibVEX, you must first obtain a commercial
++ license from OpenWorks LLP. Please contact in...@op...
++ for information about commercial licensing.
++
++ This software is provided by OpenWorks LLP "as is" and any express
++ or implied warranties, including, but not limited to, the implied
++ warranties of merchantability and fitness for a particular purpose
++ are disclaimed. In no event shall OpenWorks LLP be liable for any
++ direct, indirect, incidental, special, exemplary, or consequential
++ damages (including, but not limited to, procurement of substitute
++ goods or services; loss of use, data, or profits; or business
++ interruption) however caused and on any theory of liability,
++ whether in contract, strict liability, or tort (including
++ negligence or otherwise) arising in any way out of the use of this
++ software, even if advised of the possibility of such damage.
++
++ Neither the names of the U.S. Department of Energy nor the
++ University of California nor the names of its contributors may be
++ used to endorse or promote products derived from this software
++ without prior written permission.
++*/
++
++
++/* A program which verifies various guest state offsets. */
++
++#include <stdio.h>
++#include "../pub/libvex_basictypes.h"
++#include "../pub/libvex_guest_x86.h"
++#include "../pub/libvex_guest_amd64.h"
++#include "../pub/libvex_guest_ppc32.h"
++#include "../pub/libvex_guest_ppc64.h"
++#include "../pub/libvex_guest_offsets_in.h"
++
++
++/* Compile-time assertion. */
++#if ! defined(static_assert)
++#define static_assert(a) { switch (a) { case 0: { } case (a): { } } }
++#endif
++
++
++Int main ( void )
++{
++ // x86
++ static_assert(OFFSET_x86_EAX ==
++ offsetof(VexGuestX86State,guest_EAX));
++
++ static_assert(OFFSET_x86_EBX ==
++ offsetof(VexGuestX86State,guest_EBX));
++
++ static_assert(OFFSET_x86_ECX ==
++ offsetof(VexGuestX86State,guest_ECX));
++
++ static_assert(OFFSET_x86_EDX ==
++ offsetof(VexGuestX86State,guest_EDX));
++
++ static_assert(OFFSET_x86_ESI ==
++ offsetof(VexGuestX86State,guest_ESI));
++
++ static_assert(OFFSET_x86_EDI ==
++ offsetof(VexGuestX86State,guest_EDI));
++
++ static_assert(OFFSET_x86_EBP ==
++ offsetof(VexGuestX86State,guest_EBP));
++
++ static_assert(OFFSET_x86_ESP ==
++ offsetof(VexGuestX86State,guest_ESP));
++
++ static_assert(OFFSET_x86_EIP ==
++ offsetof(VexGuestX86State,guest_EIP));
++
++ static_assert(OFFSET_x86_CS ==
++ offsetof(VexGuestX86State,guest_CS));
++
++ static_assert(OFFSET_x86_DS ==
++ offsetof(VexGuestX86State,guest_DS));
++
++ static_assert(OFFSET_x86_ES ==
++ offsetof(VexGuestX86State,guest_ES));
++
++ static_assert(OFFSET_x86_FS ==
++ offsetof(VexGuestX86State,guest_FS));
++
++ static_assert(OFFSET_x86_GS ==
++ offsetof(VexGuestX86State,guest_GS));
++
++ static_assert(OFFSET_x86_SS ==
++ offsetof(VexGuestX86State,guest_SS));
++
++
++ // amd64
++ static_assert(OFFSET_amd64_RAX ==
++ offsetof(VexGuestAMD64State,guest_RAX));
++
++ static_assert(OFFSET_amd64_RBX ==
++ offsetof(VexGuestAMD64State,guest_RBX));
++
++ static_assert(OFFSET_amd64_RCX ==
++ offsetof(VexGuestAMD64State,guest_RCX));
++
++ static_assert(OFFSET_amd64_RDX ==
++ offsetof(VexGuestAMD64State,guest_RDX));
++
++ static_assert(OFFSET_amd64_RSI ==
++ offsetof(VexGuestAMD64State,guest_RSI));
++
++ static_assert(OFFSET_amd64_RDI ==
++ offsetof(VexGuestAMD64State,guest_RDI));
++
++ static_assert(OFFSET_amd64_RSP ==
++ offsetof(VexGuestAMD64State,guest_RSP));
++
++ static_assert(OFFSET_amd64_RBP ==
++ offsetof(VexGuestAMD64State,guest_RBP));
++
++ static_assert(OFFSET_amd64_R8 ==
++ offsetof(VexGuestAMD64State,guest_R8));
++
++ static_assert(OFFSET_amd64_R9 ==
++ offsetof(VexGuestAMD64State,guest_R9));
++
++ static_assert(OFFSET_amd64_R10 ==
++ offsetof(VexGuestAMD64State,guest_R10));
++
++ static_assert(OFFSET_amd64_R11 ==
++ offsetof(VexGuestAMD64State,guest_R11));
++
++ static_assert(OFFSET_amd64_R12 ==
++ offsetof(VexGuestAMD64State,guest_R12));
++
++ static_assert(OFFSET_amd64_R13 ==
++ offsetof(VexGuestAMD64State,guest_R13));
++
++ static_assert(OFFSET_amd64_R14 ==
++ offsetof(VexGuestAMD64State,guest_R14));
++
++ static_assert(OFFSET_amd64_R15 ==
++ offsetof(VexGuestAMD64State,guest_R15));
++
++ static_assert(OFFSET_amd64_RIP ==
++ offsetof(VexGuestAMD64State,guest_RIP));
++
++
++ // ppc32
++ static_assert(OFFSET_ppc32_GPR0 ==
++ offsetof(VexGuestPPC32State,guest_GPR0));
++
++ static_assert(OFFSET_ppc32_GPR2 ==
++ offsetof(VexGuestPPC32State,guest_GPR2));
++
++ static_assert(OFFSET_ppc32_GPR3 ==
++ offsetof(VexGuestPPC32State,guest_GPR3));
++
++ static_assert(OFFSET_ppc32_GPR4 ==
++ offsetof(VexGuestPPC32State,guest_GPR4));
++
++ static_assert(OFFSET_ppc32_GPR5 ==
++ offsetof(VexGuestPPC32State,guest_GPR5));
++
++ static_assert(OFFSET_ppc32_GPR6 ==
++ offsetof(VexGuestPPC32State,guest_GPR6));
++
++ static_assert(OFFSET_ppc32_GPR7 ==
++ offsetof(VexGuestPPC32State,guest_GPR7));
++
++ static_assert(OFFSET_ppc32_GPR8 ==
++ offsetof(VexGuestPPC32State,guest_GPR8));
++
++ static_assert(OFFSET_ppc32_GPR9 ==
++ offsetof(VexGuestPPC32State,guest_GPR9));
++
++ static_assert(OFFSET_ppc32_GPR10 ==
++ offsetof(VexGuestPPC32State,guest_GPR10));
++
++ static_assert(OFFSET_ppc32_CIA ==
++ offsetof(VexGuestPPC32State,guest_CIA));
++
++ static_assert(OFFSET_ppc32_CR0_0 ==
++ offsetof(VexGuestPPC32State,guest_CR0_0));
++
++
++ // ppc64
++ static_assert(OFFSET_ppc64_GPR0 ==
++ offsetof(VexGuestPPC64State,guest_GPR0));
++
++ static_assert(OFFSET_ppc64_GPR2 ==
++ offsetof(VexGuestPPC64State,guest_GPR2));
++
++ static_assert(OFFSET_ppc64_GPR3 ==
++ offsetof(VexGuestPPC64State,guest_GPR3));
++
++ static_assert(OFFSET_ppc64_GPR4 ==
++ offsetof(VexGuestPPC64State,guest_GPR4));
++
++ static_assert(OFFSET_ppc64_GPR5 ==
++ offsetof(VexGuestPPC64State,guest_GPR5));
++
++ static_assert(OFFSET_ppc64_GPR6 ==
++ offsetof(VexGuestPPC64State,guest_GPR6));
++
++ static_assert(OFFSET_ppc64_GPR7 ==
++ offsetof(VexGuestPPC64State,guest_GPR7));
++
++ static_assert(OFFSET_ppc64_GPR8 ==
++ offsetof(VexGuestPPC64State,guest_GPR8));
++
++ static_assert(OFFSET_ppc64_GPR9 ==
++ offsetof(VexGuestPPC64State,guest_GPR9));
++
++ static_assert(OFFSET_ppc64_GPR10 ==
++ offsetof(VexGuestPPC64State,guest_GPR10));
++
++ static_assert(OFFSET_ppc64_CIA ==
++ offsetof(VexGuestPPC64State,guest_CIA));
++
++ static_assert(OFFSET_ppc64_CR0_0 ==
++ offsetof(VexGuestPPC64State,guest_CR0_0));
++
++
++ return 0;
++}
+Index: Makefile
+===================================================================
+--- Makefile (revision 1849)
++++ Makefile (working copy)
+@@ -179,8 +179,8 @@
@echo
pub/libvex_guest_offsets.h:
- $(CC) -Wall -g -o auxprogs/genoffsets auxprogs/genoffsets.c
-+ $(BUILD_CC) -Wall -g -o auxprogs/genoffsets auxprogs/genoffsets.c
- ./auxprogs/genoffsets > pub/libvex_guest_offsets.h
+- ./auxprogs/genoffsets > pub/libvex_guest_offsets.h
++ $(CC) -Wall -g -c auxprogs/verifyoffsets.c \
++ && cp pub/libvex_guest_offsets_in.h pub/libvex_guest_offsets.h
+ ALL_HEADERS = $(PUB_HEADERS) $(PRIV_HEADERS)
|