From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sat, 7 Apr 2018 10:09:39 +0000 (+0200)
Subject: Merge branch 'develop' into atomic
X-Git-Tag: v0.3.0^2~18^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20c6c38e51e9787be22fc754645ccba577ca349f;p=platform%2Fupstream%2Fopenblas.git

Merge branch 'develop' into atomic
---

20c6c38e51e9787be22fc754645ccba577ca349f
diff --cc lapack/getrf/getrf_parallel.c
index 27faea0,b48765e..4e742b9
--- a/lapack/getrf/getrf_parallel.c
+++ b/lapack/getrf/getrf_parallel.c
@@@ -225,11 -236,11 +245,12 @@@ static int inner_advanced_thread(blas_a
    FLOAT *sbb= sb;
  
    blasint *ipiv = (blasint *)args -> c;
 -
 -   BLASLONG jw;
 -  
++  BLASLONG jw;
 +#if _STDC_VERSION__ >= 201112L  
 +  _Atomic BLASLONG *flag = (_Atomic BLASLONG *)args -> d;
 +#else
    volatile BLASLONG *flag = (volatile BLASLONG *)args -> d;
 -
 +#endif
    if (args -> a == NULL) {
      TRSM_ILTCOPY(k, k, (FLOAT *)args -> b, lda, 0, sb);
      sbb = (FLOAT *)((((BLASULONG)(sb + k * k * COMPSIZE) + GEMM_ALIGN) & ~GEMM_ALIGN) + GEMM_OFFSET_B);