Merge branch 'master' of github.com:JuliaLang/julia

jiahao · Mar 16, 2013 · 248c36b · 248c36b
2 parents 9161915 + 780c815
commit 248c36b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Make.inc b/Make.inc
@@ -322,7 +322,7 @@ OSLIBS += -Wl,--export-all-symbols -Wl,--version-script=$(JULIAHOME)/src/julia.e
 JCFLAGS += -D_WIN32_WINNT=0x0600
 JCXXFLAGS += -D_WIN32_WINNT=0x0600
 LLVM_CONFIG := WINEPATH="$(WINEPATH)" $(LLVM_CONFIG).exe
-JLDFLAGS = -Wl,--stack,8388608
+JLDFLAGS = -Wl,--stack,8388608 -Wl,--large-address-aware
 endif
 
 # MKL

diff --git a/deps/Makefile b/deps/Makefile
@@ -618,6 +618,13 @@ OPENBLAS_OBJ_TARGET = $(BUILD)/lib/libopenblas.$(SHLIB_EXT)
 OPENBLAS_BUILD_OPTS = CC="$(CC)" FC="$(FC)" RANLIB="$(RANLIB)" FFLAGS="$(FFLAGS) $(JFFLAGS)" USE_THREAD=$(OPENBLAS_USE_THREAD) TARGET=$(OPENBLAS_TARGET_ARCH)
 ifeq ($(OPENBLAS_DYNAMIC_ARCH), 1)
 OPENBLAS_BUILD_OPTS += DYNAMIC_ARCH=1
+ifneq ($(ARCH),x86_64)
+# assume we can't address much memory to spawn many threads
+OPENBLAS_BUILD_OPTS += NUM_THREADS=30
+else
+# assume we may want lots of threads on some future machine
+OPENBLAS_BUILD_OPTS += NUM_THREADS=512
+endif
 endif
 
 ifeq ($(USE_LIB64), 1)