diff --git a/common.h b/common.h
index 310fcad93..4e3230d7e 100644
--- a/common.h
+++ b/common.h
@@ -310,9 +310,12 @@ typedef int blasint;
 #define YIELDING	SwitchToThread()
 #endif
 
-
 #if defined(ARMV7) || defined(ARMV6) || defined(ARMV8)
-#define YIELDING	asm volatile ("nop;nop;nop;nop;nop;nop;nop;nop; \n");
+#define YIELDING        asm volatile ("nop;nop;nop;nop;nop;nop;nop;nop; \n");
+#endif
+
+#ifdef PILEDRIVER
+#define YIELDING        __asm__ __volatile__ ("nop;nop;nop;nop;nop;nop;nop;nop;\n");
 #endif
 
 
@@ -320,8 +323,6 @@ typedef int blasint;
 #define YIELDING	sched_yield()
 #endif
 
-
-
 /***
 To alloc job_t on heap or statck.
 please https://github.com/xianyi/OpenBLAS/issues/246
@@ -379,6 +380,7 @@ please https://github.com/xianyi/OpenBLAS/issues/246
 #include "common_arm64.h"
 #endif
 
+
 #ifdef OS_LINUX
 #include "common_linux.h"
 #endif
@@ -590,9 +592,10 @@ typedef struct {
 #include "common_level2.h"
 #include "common_level3.h"
 #include "common_lapack.h"
+
 #ifdef CBLAS
-/* This header file is generated from "cblas.h" (see Makefile.prebuild). */
-#include "cblas_noconst.h"
+# define OPENBLAS_CONST     /* see comment in cblas.h */
+# include "cblas.h"
 #endif
 
 #ifndef ASSEMBLER