Merge branch 'develop' of https://github.com/TimothyGu/OpenBLAS into TimothyGu-develop

Conflicts:
	driver/others/memory.c

diff --cc Makefile.install
Simple merge

diff --cc common.h
Simple merge

diff --cc driver/others/blas_server.c
Simple merge

diff --cc driver/others/init.c
Simple merge

diff --cc driver/others/memory.c
index 095270b,ba806b3..f44b37b
--- 1/driver/others/memory.c
--- 2/driver/others/memory.c
+++ b/driver/others/memory.c
@@@ -292,10 -293,11 +292,10 @@@ int blas_get_cpu_number(void)
    if (blas_goto_num < 0) blas_goto_num = 0;
  
    if (blas_goto_num == 0) {
 -          p = getenv("GOTO_NUM_THREADS");
 -              if (p) blas_goto_num = atoi(p);
 +              if (readenv(p,"GOTO_NUM_THREADS")) blas_goto_num = atoi(p);
                if (blas_goto_num < 0) blas_goto_num = 0;
    }
-   
+ 
  #endif
  
    blas_omp_num = 0;
@@@ -781,11 -778,10 +781,11 @@@ static void *alloc_hugetlb(void *addres
                                      MEM_LARGE_PAGES | MEM_RESERVE | MEM_COMMIT,
                                      PAGE_READWRITE);
  
 -  AdjustTokenPrivileges(hToken, TRUE, &tp, 0, (PTOKEN_PRIVILEGES)NULL, NULL);
 +  tp.Privileges[0].Attributes = 0;
 +  AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL);
  
    if (map_address == (void *)NULL) map_address = (void *)-1;
-   
+ 
  #endif
  
    if (map_address != (void *)-1){

diff --cc driver/others/parameter.c
Simple merge

diff --cc exports/Makefile
Simple merge