Merge remote branch 'origin/develop' into piledriver

This commit is contained in:
wernsaar 2013-12-01 16:21:10 +01:00
commit d4833f1801
1 changed files with 16 additions and 5 deletions

View File

@ -310,13 +310,15 @@ typedef int blasint;
#define YIELDING SwitchToThread()
#endif
/***************************************************
Some no-oprations are enough
***************************************************/
#ifdef PILEDRIVER
#define YIELDING __asm__ __volatile__ ("nop;nop;nop;nop;nop;nop;nop;nop;\n");
#if defined(ARMV7) || defined(ARMV6) || defined(ARMV8)
#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
#ifndef YIELDING
#define YIELDING sched_yield()
#endif
@ -370,6 +372,15 @@ please https://github.com/xianyi/OpenBLAS/issues/246
#include "common_mips64.h"
#endif
#ifdef ARCH_ARM
#include "common_arm.h"
#endif
#ifdef ARCH_ARM64
#include "common_arm64.h"
#endif
#ifdef OS_LINUX
#include "common_linux.h"
#endif