Merge branch 'cmake' of https://github.com/hpanderson/OpenBLAS into hpanderson_cmake
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 21 Jul 2015 20:06:39 +0000 (04:06 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 21 Jul 2015 20:06:39 +0000 (04:06 +0800)
1  2 
common.h
common_x86.h
cpuid.h
cpuid_x86.c
driver/others/memory.c
getarch.c
interface/gemv.c

diff --cc common.h
Simple merge
diff --cc common_x86.h
Simple merge
diff --cc cpuid.h
Simple merge
diff --cc cpuid_x86.c
Simple merge
@@@ -1397,8 -1361,32 +1402,30 @@@ void DESTRUCTOR gotoblas_quit(void) 
  #ifdef PROFILE
     moncontrol (1);
  #endif
 -
 -   blas_shutdown();
  }
  
+ #if defined(_MSC_VER) && !defined(__clang__)
+ BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)
+ {
+   switch (ul_reason_for_call)
+   {
+     case DLL_PROCESS_ATTACH:
+       gotoblas_init();
+       break;
+     case DLL_THREAD_ATTACH:
+       break;
+     case DLL_THREAD_DETACH:
+       break;
+     case DLL_PROCESS_DETACH:
+       gotoblas_quit();
+       break;
+     default:
+       break;
+   }
+   return TRUE;
+ }
+ #endif
  #if (defined(C_PGI) || (!defined(C_SUN) && defined(F_INTERFACE_SUN))) && (defined(ARCH_X86) || defined(ARCH_X86_64))
  /* Don't call me; this is just work around for PGI / Sun bug */
  void gotoblas_dummy_for_PGI(void) {
diff --cc getarch.c
Simple merge
Simple merge