Merge branch 'TimothyGu-develop' into develop

Author: xianyi

Makefile

@@ -238,37 +238,6 @@ ifndef NOFORTRAN
 	-@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
 endif
 
-lapack-3.4.2 : lapack-3.4.2.tgz
-ifndef NOFORTRAN
-ifndef NO_LAPACK
-	@if test `$(MD5SUM) $< | $(AWK) '{print $$1}'` = 61bf1a8a4469d4bdb7604f5897179478; then \
-		echo $(TAR) zxf $< ;\
-		$(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-3.4.2) ;\
-		rm -f $(NETLIB_LAPACK_DIR)/lapacke/make.inc ;\
-	else \
-		rm -rf $(NETLIB_LAPACK_DIR) ;\
-		echo "	Cannot download lapack-3.4.2.tgz or the MD5 check sum is wrong (Please use orignal)."; \
-		exit 1; \
-	fi
-endif
-endif
-
-LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.2.tgz
-
-lapack-3.4.2.tgz :
-ifndef NOFORTRAN
-#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
-ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))
-	curl -O $(LAPACK_URL);
-else
-ifeq ($(OSNAME), FreeBSD)
-	fetch $(LAPACK_URL);
-else
-	wget -O $@ $(LAPACK_URL);
-endif
-endif
-endif
-
 large.tgz : 
 ifndef NOFORTRAN
 	if [ ! -a $< ]; then

exports/Makefile

@@ -75,9 +75,6 @@ zip : dll
 	zip $(LIBZIPNAME) $(LIBDLLNAME) $(LIBNAME)
 
 dll  : ../$(LIBDLLNAME)
-#libgoto2.dll
-
-dll2 : libgoto2_shared.dll
 
 # On Windows, we only generate a DLL without a version suffix.  This is because
 # applications which link against the dynamic library reference a fixed DLL name
@@ -96,34 +93,23 @@ else
 	-lib /machine:X64 /def:libopenblas.def 
 endif
 
-libgoto2_shared.dll : ../$(LIBNAME) libgoto2_shared.def
-	$(CC) $(CFLAGS) $(LDFLAGS) libgoto2_shared.def -shared -o $(@F) \
-	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
-	-Wl,--out-implib,libgoto2_shared.lib $(FEXTRALIB)
-
 libopenblas.def : gensymbol
 	perl ./gensymbol win2k    $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F)
 
-libgoto2_shared.def : gensymbol
-	perl ./gensymbol win2k    $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F)
-
 libgoto_hpl.def : gensymbol
 	perl ./gensymbol win2khpl $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F)
 
 $(LIBDYNNAME) : ../$(LIBNAME) osx.def
 	$(FC) $(FFLAGS) -all_load -headerpad_max_install_names -install_name $(CURDIR)/../$(LIBDYNNAME) -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def  $(FEXTRALIB)
 
-symbol.$(SUFFIX) : symbol.S
-	$(CC) $(CFLAGS) -c -o $(@F) $^
-
 dllinit.$(SUFFIX) : dllinit.c
 	$(CC) $(CFLAGS) -c -o $(@F) -s $<
 
 ifeq ($(OSNAME), Linux)
 
 so : ../$(LIBSONAME)
 
-../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
+../$(LIBSONAME) : ../$(LIBNAME) linktest.c
 ifneq ($(C_COMPILER), LSB)
 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
@@ -145,7 +131,7 @@ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
 
 so : ../$(LIBSONAME)
 
-../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
+../$(LIBSONAME) : ../$(LIBNAME) linktest.c
 	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
 	$(FEXTRALIB) $(EXTRALIB)
@@ -197,18 +183,12 @@ static : ../$(LIBNAME)
 	$(AR) -cq ../$(LIBNAME) goto.$(SUFFIX)
 	rm -f goto.$(SUFFIX)
 
-linux.def : gensymbol ../Makefile.system ../getarch.c
-	perl ./gensymbol linux $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS)  $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F)
-
 osx.def : gensymbol ../Makefile.system ../getarch.c
 	perl ./gensymbol osx $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS)  $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F)
 
 aix.def : gensymbol ../Makefile.system ../getarch.c
 	perl ./gensymbol aix $(ARCH) $(BU) $(EXPRECISION) $(NO_CBLAS)  $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > $(@F)
 
-symbol.S : gensymbol
-	perl ./gensymbol win2kasm noarch dummy $(EXPRECISION) $(NO_CBLAS)  $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) > symbol.S
-
 test : linktest.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) -lm && echo OK.
 	rm -f linktest

exports/gensymbol

@@ -2725,8 +2725,7 @@ if ($ARGV[8] == 1) {
 } elsif ($ARGV[5] == 1) {
 	#NO_LAPACK=1
 	@underscore_objs = (@blasobjs, @misc_underscore_objs);
-} elsif (-d "../lapack-3.1.1" || -d "../lapack-3.4.0" || -d "../lapack-3.4.1" ||
-         -d "../lapack-3.4.2" || -d "../lapack-netlib") {
+} elsif (-d "../lapack-netlib") {
 
     if ($ARGV[7] == 0){
 	# NEED2UNDERSCORES=0
@@ -2771,46 +2770,13 @@ if ($ARGV[6] == 1) {
     @no_underscore_objs = (@no_underscore_objs, @lapackeobjs);
 }
 
-@linuxobjs = ('__strtol_internal', 'exit', 'free', 'getenv', 'malloc',
-	      'mmap', 'printf', 'sqrt',
-	      'pthread_cond_broadcast', 'pthread_cond_destroy',
-	      'pthread_cond_init', 'pthread_cond_signal', 'pthread_cond_wait',
-	      'pthread_create', 'pthread_exit', 'pthread_join',
-	      'pthread_mutex_destroy', 'pthread_mutex_init',
-	      'pthread_mutex_lock', 'pthread_mutex_unlock');
-
 @hplobjs  = (daxpy, dcopy, dscal, idamax, dgemv, dtrsv, dger, dgemm, dtrsm);
 @hplobjs2 = (HPL_dlaswp00N, HPL_dlaswp01N, HPL_dlaswp01T); 
 
 $bu = $ARGV[2];
 
 $bu = "" if (($bu eq "0") || ($bu eq "1"));
 
-if ($ARGV[0] eq "linux"){
-
-    @underscore_objs = (@underscore_objs, @misc_common_objs);
-    @no_underscore_objs = (@no_underscore_objs, @misc_common_objs);
-
-    foreach $objs (@underscore_objs) {
-	print $objs, $bu, "\n";
-    }
-
-    foreach $objs (@need_2underscore_objs) {
-	print $objs, $bu, $bu, "\n";
-    }
-
-#    if ($ARGV[4] == 0) {
-	foreach $objs (@no_underscore_objs) {
-	    print $objs, "\n";
-	}
-#    }
-
-    foreach $objs (@linuxobjs) {
-	print $objs, "\n";
-    }
-    exit(0);
-} 
-
 if ($ARGV[0] eq "osx"){
 
     @underscore_objs = (@underscore_objs, @misc_common_objs);
@@ -2956,32 +2922,6 @@ if ($ARGV[0] eq "microsoft"){
     exit(0);
 }
 
-if ($ARGV[0] eq "win2kasm"){
-
-    @underscore_objs = (@underscore_objs, @misc_common_objs);
-
-    print "\t.text\n";
-    foreach $objs (@underscore_objs) {
-	$uppercase = $objs;
-	$uppercase =~ tr/[a-z]/[A-Z]/;
-	print "\t.align 16\n";
-	print "\t.globl _", $uppercase, "_\n";
-	print "_", $uppercase, "_:\n";
-	print "\tjmp\t_", $objs, "_\n";
-    }
-
-    foreach $objs (@need_2underscore_objs) {
-	$uppercase = $objs;
-	$uppercase =~ tr/[a-z]/[A-Z]/;
-	print "\t.align 16\n";
-	print "\t.globl _", $uppercase, "__\n";
-	print "_", $uppercase, "__:\n";
-	print "\tjmp\t_", $objs, "__\n";
-    }
-
-    exit(0);
-}
-
 if ($ARGV[0] eq "linktest"){
 
     @underscore_objs = (@underscore_objs, @misc_common_objs);