Merge pull request #267 from vtjnash/master

Makefile consolidation and LLVM bug fix
JuliaLang · Nov 29, 2011 · 444f5c4 · 444f5c4
2 parents 231df1d + 18011e9
commit 444f5c4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Make.inc b/Make.inc
@@ -41,6 +41,11 @@ endif
 
 USE_SYSTEM_READLINE=0
 
+# If OpenBLAS doesn't build, find your architechure at the following URL and enter it below
+# https://github.com/xianyi/OpenBLAS/blob/master/GotoBLAS_01Readme.txt
+TARGET_OPENBLAS_ARCH=
+
+
 ifeq ($(OS), Linux)
 SHLIB_EXT = so
 OSLIBS += -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap $(EXTROOT)/lib/libunwind-generic.a $(EXTROOT)/lib/libunwind.a

diff --git a/external/Makefile b/external/Makefile
@@ -177,7 +177,7 @@ openblas-$(OPENBLAS_VER)/Makefile: openblas-$(OPENBLAS_VER).tar.gz
 	tar -C openblas-$(OPENBLAS_VER) --strip-components 1 -xf $<
 	touch $@
 $(OPENBLAS_OBJ_SOURCE): openblas-$(OPENBLAS_VER)/Makefile
-	$(MAKE) -C openblas-$(OPENBLAS_VER) DYNAMIC_ARCH=1 USE_THREAD=0 NO_LAPACK=1 CC=$(CC) FC=$(FC)
+	$(MAKE) -C openblas-$(OPENBLAS_VER) DYNAMIC_ARCH=1 USE_THREAD=0 NO_LAPACK=1 CC=$(CC) FC=$(FC) TARGET=$(TARGET_OPENBLAS_ARCH)
 
 clean-openblas:
 	$(MAKE) -C openblas-$(OPENBLAS_VER) clean

diff --git a/src/alloc.c b/src/alloc.c
@@ -700,7 +700,7 @@ UIBOX_FUNC(uint64, uint64_t, 3)
 static jl_value_t *boxed_int8_cache[256];
 jl_value_t *jl_box_int8(int8_t x)
 {
-    return boxed_int8_cache[((int32_t)x)+128];
+    return boxed_int8_cache[(uint8_t)x];
 }
 static jl_value_t *boxed_uint8_cache[256];
 jl_value_t *jl_box_uint8(uint8_t x)
@@ -721,7 +721,7 @@ void jl_init_box_caches(void)
 {
     int64_t i;
     for(i=0; i < 256; i++) {
-        boxed_int8_cache[i]  = jl_new_box_int8((int8_t)(i-128));
+        boxed_int8_cache[i]  = jl_new_box_int8(i);
         boxed_uint8_cache[i] = jl_new_box_uint8(i);
     }
     for(i=0; i < NBOX_C; i++) {