More compile fixes.

stephenrkell · Nov 7, 2016 · 074f237 · 074f237
1 parent 9616482
commit 074f237
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/config.mk b/config.mk
@@ -8,15 +8,18 @@ LIBCXXGEN ?= $(LIBALLOCS)/contrib/libcxxgen
 LIBDWARFPP ?= $(LIBALLOCS)/contrib/libdwarfpp
 LIBSRK31CXX ?= $(LIBALLOCS)/contrib/libsrk31cxx
 LIBCXXFILENO ?= $(LIBALLOCS)/contrib/libcxxfileno
+LIBDLBIND ?= $(LIBALLOCS)/contrib/libdlbind
 
 export CXXFLAGS += \
 -I$(LIBCXXGEN)/include \
 -I$(LIBDWARFPP)/include \
 -I$(LIBSRK31CXX)/include \
--I$(LIBCXXFILENO)/include
+-I$(LIBCXXFILENO)/include \
+-I$(LIBDLBIND)/include \
 
 export LDFLAGS += \
 -L$(LIBCXXGEN)/lib -Wl,-rpath,$(LIBCXXGEN)/lib \
 -L$(LIBDWARFPP)/lib -Wl,-rpath,$(LIBDWARFPP)/lib \
 -L$(LIBSRK31CXX)/lib -Wl,-rpath,$(LIBSRK31CXX)/lib \
--L$(LIBCXXFILENO)/lib -Wl,-rpath,$(LIBCXXFILENO)/lib
+-L$(LIBCXXFILENO)/lib -Wl,-rpath,$(LIBCXXFILENO)/lib \
+-L$(LIBDLBIND)/lib -Wl,-rpath,$(LIBDLBIND)/lib
diff --git a/frontend/c/bin/crunchbcc b/frontend/c/bin/crunchbcc
@@ -40,7 +40,7 @@ class CrunchXCC(CrunchCC):
             # temporary HACK to strip line numbers after preprocess
             #"--commPrintLn",
             includeArgs = [ \
-            "-include", self.getLibAllocsBaseDir() + "/include/uniqtype.h", \
+            "-include", self.getLibAllocsBaseDir() + "/include/uniqtype-defs.h", \
             "-DLIBCRUNCH_USING_TRAP_PTRS", \
             "-DLIBCRUNCH_WORDSIZE_BOUNDS", \
             "-include", \

diff --git a/frontend/c/bin/crunchcc b/frontend/c/bin/crunchcc
@@ -35,7 +35,7 @@ class CrunchCC(AllocsCC):
             # We can only do trumptr, and anything else that involves -include, 
             # if we're compiling only C files.
             includeArgs = ["-I" + self.getLibAllocsBaseDir() + "/include", \
-                "-include", self.getLibAllocsBaseDir() + "/include/uniqtype.h", \
+                "-include", self.getLibAllocsBaseDir() + "/include/uniqtype-defs.h", \
                  "-include", \
                 os.path.dirname(__file__) + "/../../../include/libcrunch_cil_inlines.h", \
                "--load=%s" % (os.path.dirname(sys.argv[0]) + "/../dumpreftypes/dumpreftypes.cmxs"),  "--dodumpreftypes", \

diff --git a/frontend/c/bin/crunchsbcc b/frontend/c/bin/crunchsbcc
@@ -53,7 +53,7 @@ class CrunchSBCC(CrunchCC):
             # temporary HACK to strip line numbers after preprocess
             #"--commPrintLn",
             includeArgs = [ \
-            "-include", self.getLibAllocsBaseDir() + "/include/uniqtype.h", \
+            "-include", self.getLibAllocsBaseDir() + "/include/uniqtype-defs.h", \
             "-DLIBCRUNCH_EMULATE_SOFTBOUND", \
             "-DLIBCRUNCH_WORDSIZE_BOUNDS", \
             "-include", \

diff --git a/frontend/c/bin/crunchxcc b/frontend/c/bin/crunchxcc
@@ -39,7 +39,7 @@ class CrunchXCC(CrunchCC):
             # Add temporary HACK to strip line numbers after preprocess
             # "--commPrintLn", \
             includeArgs = [ \
-            "-include", self.getLibAllocsBaseDir() + "/include/uniqtype.h", \
+            "-include", self.getLibAllocsBaseDir() + "/include/uniqtype-defs.h", \
             "-DLIBCRUNCH_USING_TRAP_PTRS", \
             "-DLIBCRUNCH_WORDSIZE_BOUNDS", \
            "-include", \

diff --git a/src/Makefile b/src/Makefile
@@ -7,7 +7,7 @@ LIBDLBIND ?= $(realpath $(SRCROOT)/../libdlbind)
 
 CFLAGS += -DLIBCRUNCH_WORDSIZE_BOUNDS
 
-CFLAGS += -I$(LIBALLOCS)/include -I$(LIBALLOCS)/src -I$(TRAP_SYSCALLS)/libsystrap
+CFLAGS += -I$(LIBALLOCS)/include -I$(LIBALLOCS)/src -I$(TRAP_SYSCALLS)/libsystrap -I$(LIBDLBIND)/include
 LDFLAGS += -L$(LIBALLOCS)/lib -L$(TRAP_SYSCALLS)/libsystrap
 
 #CFLAGS += -fkeep-inline-functions

diff --git a/src/libcrunch.c b/src/libcrunch.c
@@ -2790,7 +2790,7 @@ void (__attribute__((nonnull(1))) __store_pointer_nonlocal_via_voidptrptr)(const
 	 * "If loading a void*, always load bounds anyway"? HMM. Breaks stuff. 
 	 * I think rooting in the cache is best. Delete the noquery test case. */
 	__libcrunch_bounds_t dest_alloc_ptrwise_bounds = __peek_argument_bounds(
-		/* really */ 1, /* offset */ 0, /* val */ ptr);
+		/* really */ 1, /* offset */ 0, /* val */ srcval);
 
 	struct uniqtype *cached_target_alloc_type = __libcrunch_get_cached_object_type(dest);
 	if (cached_target_alloc_type)