Merge pull request #1 from cooljeanius/master

Update 26-07-2014
chubbymaggie · Jul 26, 2014 · f4a7fcd · f4a7fcd
2 parents 9d97486 + 2cab47e
commit f4a7fcd
Show file tree

Hide file tree

Showing 78 changed files with 9,782 additions and 2,562 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,13 +50,16 @@ zarith-1.0/Makefile.orig
 *.depend
 *(Autosaved)*
 Makefile
+gcc-root/*
 libasmir/Makefile
+libasmir/makefile.inc
 libasmir/apps/Makefile
 libasmir/src/Makefile
 libtracewrap/CONFIGURED
 libtracewrap/Makefile
 libtracewrap/libtrace/Makefile
 libtracewrap/libtrace/piqi/deps
+libtracewrap/libtrace/piqi/piqi/configure.sh
 ocaml/Makefile
 utils/Makefile
 tests/Makefile
@@ -92,3 +95,4 @@ tests/asm/nop
 *grammar.ml
 *grammar.mli
 VEX/pub/*guest_offsets.h
+pin/*
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 --install
 
 # Work around buggy Debian ocaml patch
 # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577

diff --git a/Makefile.in b/Makefile.in
@@ -79,14 +79,14 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog THANKS \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(top_srcdir)/libtracewrap/Makefile.in \
 	$(top_srcdir)/ocaml/Makefile.in \
 	$(top_srcdir)/utils/Makefile.in \
-	$(top_srcdir)/tests/Makefile.in AUTHORS COPYING ChangeLog \
-	INSTALL NEWS README TODO ar-lib compile config.guess \
-	config.sub depcomp install-sh missing ltmain.sh
+	$(top_srcdir)/tests/Makefile.in COPYING TODO ar-lib compile \
+	config.guess config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/ax_check_gnu_make.m4 \
@@ -209,6 +209,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 ASMIR_DIR = @ASMIR_DIR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -245,6 +246,8 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 GREP = @GREP@
 HAVE_LLVM_AC = @HAVE_LLVM_AC@
 INCDIRS = @INCDIRS@
@@ -258,6 +261,7 @@ LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -303,9 +307,11 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POW_LIB = @POW_LIB@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+RC = @RC@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -376,7 +382,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 --install
 @HAVE_PIN_TRUE@PINTRACES = pintraces
 BAPDIRS = libasmir ocaml utils tests $(PINTRACES)
 SUBDIRS = batteries zarith-1.0 ounit pcre-ocaml ocamlgraph-1.8 objsize-0.16 libtracewrap VEX $(BAPDIRS)
@@ -389,15 +395,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnits'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnits \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
+	  $(AUTOMAKE) --gnits Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -542,6 +548,12 @@ distclean-tags:
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
+	@case `sed 15q $(srcdir)/NEWS` in \
+	*"$(VERSION)"*) : ;; \
+	*) \
+	  echo "NEWS not updated; not releasing" 1>&2; \
+	  exit 1;; \
+	esac
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

diff --git a/THANKS b/THANKS
@@ -0,0 +1 @@
+Thanks
diff --git a/VEX/BAP.README b/VEX/BAP.README
@@ -1 +1 @@
-This is VEX version 2199 with the patch bap_patch_20110908.patch applied.  Also, Makefile is a copy of Makefil-gcc with "-fPIC" added to the CFLAGS.
+This is VEX version 2199 with the patch bap_patch_20110908.patch applied.  Also, Makefile is a copy of Makefile-gcc with "-fPIC" added to the CFLAGS.
diff --git a/VEX/Makefile b/VEX/Makefile
@@ -90,8 +90,8 @@ CCFLAGS = -Wall -Wmissing-prototypes -Wshadow \
 		-Wno-pointer-sign \
 		$(EXTRA_CFLAGS) -g -O2 -fstrict-aliasing -fPIC
 
-#CC = icc
-#CCFLAGS = -g -Wall -wd981 -wd279 -wd1287 -wd869 -wd111 -wd188 -wd186
+CC_THAT_IS_ACTUALLY_ICC = icc
+ICC_SPECIFIC_CCFLAGS = -g -Wall -wd981 -wd279 -wd1287 -wd869 -wd111 -wd188 -wd186
 # 981: operands are evaluated in unspecified order
 # 279: controlling expression is constant
 # 1287: invalid attribute for parameter
@@ -122,7 +122,7 @@ libvex.a: $(LIB_OBJS)
 
 # The idea with these TAG-s is to mark the flavour of libvex.a 
 # most recently built, so if the same target is re-requested, we
-# don't rebuild everything, but if a different one is requested
+# do NOT rebuild everything, but if a different one is requested
 # then we scrub everything and start over.
 
 libvex-x86-linux.a: TAG-x86-linux libvex.a
@@ -173,12 +173,15 @@ TAG-amd64-darwin:
 	if [ ! -f TAG-amd64-darwin ] ; then rm -f $(LIB_OBJS) TAG-* libvex.a ; fi
 	touch TAG-amd64-darwin
 
-
+.PHONY: clean
 clean:
 	rm -f $(LIB_OBJS) *.a vex test_main.o TAG-* \
 		pub/libvex_guest_offsets.h \
 		auxprogs/genoffsets.s
 
+.PHONY: distclean
+distclean: clean
+
 minidist:
 	rm -f vex--minidist-2005MMDD.tar
 	tar cf vex--minidist-2005MMDD.tar $(PUB_HEADERS) $(PRIV_HEADERS) \
@@ -345,4 +348,4 @@ priv/host_s390_disasm.o: $(ALL_HEADERS) priv/host_s390_disasm.c
 					 -c priv/host_s390_disasm.c
 
 tags:
-	-
+	-
diff --git a/VEX/Makefile-gcc b/VEX/Makefile-gcc
@@ -90,8 +90,8 @@ CCFLAGS = -Wall -Wmissing-prototypes -Wshadow \
 		-Wno-pointer-sign \
 		$(EXTRA_CFLAGS) -g -O2 -fstrict-aliasing
 
-#CC = icc
-#CCFLAGS = -g -Wall -wd981 -wd279 -wd1287 -wd869 -wd111 -wd188 -wd186
+CC_THAT_IS_ACTUALLY_ICC = icc
+ICC_SPECIFIC_CCFLAGS = -g -Wall -wd981 -wd279 -wd1287 -wd869 -wd111 -wd188 -wd186
 # 981: operands are evaluated in unspecified order
 # 279: controlling expression is constant
 # 1287: invalid attribute for parameter
@@ -122,7 +122,7 @@ libvex.a: $(LIB_OBJS)
 
 # The idea with these TAG-s is to mark the flavour of libvex.a 
 # most recently built, so if the same target is re-requested, we
-# don't rebuild everything, but if a different one is requested
+# do NOT rebuild everything, but if a different one is requested
 # then we scrub everything and start over.
 
 libvex-x86-linux.a: TAG-x86-linux libvex.a
@@ -173,12 +173,15 @@ TAG-amd64-darwin:
 	if [ ! -f TAG-amd64-darwin ] ; then rm -f $(LIB_OBJS) TAG-* libvex.a ; fi
 	touch TAG-amd64-darwin
 
-
+.PHONY: clean
 clean:
 	rm -f $(LIB_OBJS) *.a vex test_main.o TAG-* \
 		pub/libvex_guest_offsets.h \
 		auxprogs/genoffsets.s
 
+.PHONY: distclean
+distclean: clean
+
 minidist:
 	rm -f vex--minidist-2005MMDD.tar
 	tar cf vex--minidist-2005MMDD.tar $(PUB_HEADERS) $(PRIV_HEADERS) \

diff --git a/VEX/Makefile-icc b/VEX/Makefile-icc
@@ -64,11 +64,11 @@ PUB_INCLUDES = -Ipub
 PRIV_INCLUDES = -Ipriv
 
 
-#CC = gcc
-#CCFLAGS = -g -O -Wall -Wmissing-prototypes -Wshadow -Winline \
-#		-Wpointer-arith -Wbad-function-cast -Wcast-qual \
-#		-Wcast-align -Wmissing-declarations \
-#		$(EXTRA_CFLAGS)
+CC_THAT_IS_ACTUALLY_GCC = gcc
+GCC_SPECIFIC_CCFLAGS = -g -O -Wall -Wmissing-prototypes -Wshadow -Winline \
+		-Wpointer-arith -Wbad-function-cast -Wcast-qual \
+		-Wcast-align -Wmissing-declarations \
+		$(EXTRA_CFLAGS)
 
 CC = icc
 CCFLAGS = -g -Wall -wd981 -wd279 -wd1287 -wd869 -wd111 -wd188 -wd186 -wd810
@@ -93,11 +93,15 @@ libvex.a: $(LIB_OBJS)
 	rm -f libvex.a
 	ar clq libvex.a $(LIB_OBJS)
 
+.PHONY: clean
 clean:
 	rm -f $(LIB_OBJS) libvex.a vex test_main.o \
 		priv/main/vex_svnversion.h \
 		pub/libvex_guest_offsets.h
 
+.PHONY: distclean
+distclean: clean
+
 version:
 	rm -f priv/main/vex_svnversion.h
 	echo -n "\""  > priv/main/vex_svnversion.h

diff --git a/autogen.sh b/autogen.sh
@@ -12,6 +12,6 @@ test ! -z "`which autoheader`" && autoheader --force
 test ! -z "`which automake`" && automake --add-missing --copy --force-missing
 (cd libtracewrap/libtrace && sh ./autogen.sh)
 
-test -e autom4te.cache && rm -rf autom4te.cache
-test -e config.h.in~ && rm -rf config.h.in~
+test -d autom4te.cache && rm -rf autom4te.cache
+test -e config.h.in~ && rm -f config.h.in~
 exit 0
diff --git a/batteries/Makefile b/batteries/Makefile
@@ -58,7 +58,7 @@ else
   MODE = bytecode
 endif
 
-.PHONY: all clean doc install uninstall reinstall test qtest camfail camfailunk
+.PHONY: all clean doc install uninstall reinstall test qtest camfail camfailunk distclean
 
 all: src/batCamomile.ml
 	@echo "Build mode:" $(MODE)
@@ -165,10 +165,10 @@ src/batCamomile.ml: $(CAMFIX)
 	cp -f $< $@
 
 camfailunk:
-	echo "Unknown build of camomile detected ( $(CAMVER) ), cannot auto-config batcamomile."
-	echo "If your camomile is more recent than 0.8.3, you can probably do"
-	echo "  cp src/batCamomile-0.8.2.ml src/batCamomile.ml"
-	echo "and everything will work fine."
+	@echo "Unknown build of camomile detected ( $(CAMVER) ), cannot auto-config batcamomile."
+	@echo "If your camomile is more recent than 0.8.3, you can probably do"
+	@echo "  cp src/batCamomile-0.8.2.ml src/batCamomile.ml"
+	@echo "and everything will work fine."
 	exit 1
 
 ##
@@ -190,4 +190,11 @@ qtest/test_mods.mllib:
 .PHONY: qtest/test_mods.mllib
 
 tags:
-	-
+	-
+
+distclean: clean
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		This is VEX version 2199 with the patch bap_patch_20110908.patch applied. Also, Makefile is a copy of Makefil-gcc with "-fPIC" added to the CFLAGS.
		This is VEX version 2199 with the patch bap_patch_20110908.patch applied. Also, Makefile is a copy of Makefile-gcc with "-fPIC" added to the CFLAGS.