From: Florian Krohm <florian@eich-krohm.de>
Date: Wed, 29 Oct 2014 13:53:11 +0000 (+0000)
Subject: Tweak to allow the use of this Makefile with the ICC compiler.
X-Git-Tag: svn/VALGRIND_3_11_0^2~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25b91671f36d80dc55b7fa4419a9da853b66d51d;p=thirdparty%2Fvalgrind.git

Tweak to allow the use of this Makefile with the ICC compiler.
Patch by Gregory Czajkowski <gregczajkowski@yahoo.com>.
Related to BZ #339542.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2980
---

diff --git a/VEX/Makefile-gcc b/VEX/Makefile-gcc
index c07bf9be85..12bf1ed165 100644
--- a/VEX/Makefile-gcc
+++ b/VEX/Makefile-gcc
@@ -224,11 +224,13 @@ minidist:
 # This is very uggerly.  Need to sed out both "xyzzyN" and
 # "xyzzy$N" since gcc on different targets emits the constants
 # differently -- with a leading $ on x86/amd64 but none on ppc32/64.
+# ICC also emits the constants differently with a leading # #define
 pub/libvex_guest_offsets.h:
 	rm -f auxprogs/genoffsets.s
 	$(CC) $(CCFLAGS) -O -S -o auxprogs/genoffsets.s \
 				auxprogs/genoffsets.c
-	grep xyzzy auxprogs/genoffsets.s | grep "^#define" \
+	grep xyzzy auxprogs/genoffsets.s | grep "^[# ]*#define" \
+	   | sed "s/# #define/#define/g" \
 	   | sed "s/xyzzy\\$$//g" \
 	   | sed "s/xyzzy#//g" \
 	   | sed "s/xyzzy//g" \