Merge branch 'develop' into cmake

Conflicts:
	driver/others/memory.c

driver/others/memory.c

@@ -142,6 +142,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #if defined(_MSC_VER) && !defined(__clang__)
 #define CONSTRUCTOR __cdecl
 #define DESTRUCTOR __cdecl
+#elif defined(OS_DARWIN) && defined(C_GCC)
+#define CONSTRUCTOR	__attribute__ ((constructor))
+#define DESTRUCTOR	__attribute__ ((destructor))
 #else
 #define CONSTRUCTOR	__attribute__ ((constructor(101)))
 #define DESTRUCTOR	__attribute__ ((destructor(101)))

interface/imax.c

@@ -136,6 +136,8 @@ blasint NAME(blasint *N, FLOAT *x, blasint *INCX){
 
   ret = (blasint)MAX_K(n, x, incx);
 
+  if(ret > n) ret=n;
+
   FUNCTION_PROFILE_END(COMPSIZE, n, 0);
 
   IDEBUG_END;
@@ -159,6 +161,8 @@ CBLAS_INDEX CNAME(blasint n, FLOAT *x, blasint incx){
 
   ret = MAX_K(n, x, incx);
 
+  if (ret > n) ret=n;
+
   if (ret) ret --;
 
   FUNCTION_PROFILE_END(COMPSIZE, n, 0);