diff options
| author | Jukka Ojanen <jukka.ojanen@linkotec.net> | 2014-11-09 01:47:25 +0200 |
|---|---|---|
| committer | Jukka Ojanen <jukka.ojanen@linkotec.net> | 2014-11-09 01:47:25 +0200 |
| commit | 43bb4d927ad562c6dd07f28e3f8c345a71837105 (patch) | |
| tree | 14c40345ecaa4f97026c60b7fc09e52d2ca5fad8 | |
| parent | c82441c33c3527d1b13f7779c52d58e477f36a93 (diff) | |
| parent | 757b6eb0e7a5742ffd23b721f2fe2e041ffd1069 (diff) | |
| download | ffts-43bb4d927ad562c6dd07f28e3f8c345a71837105.zip ffts-43bb4d927ad562c6dd07f28e3f8c345a71837105.tar.gz | |
Merge commit '757b6eb0e7a5742ffd23b721f2fe2e041ffd1069'
| -rw-r--r-- | src/arch/x86/x86-codegen.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/x86/x86-codegen.h b/src/arch/x86/x86-codegen.h index 2c5b7e3..fec8ccb 100644 --- a/src/arch/x86/x86-codegen.h +++ b/src/arch/x86/x86-codegen.h @@ -490,12 +490,7 @@ typedef union { #define x86_movsl(inst) do { *(inst)++ =(unsigned char)0xa5; } while (0) #define x86_movsd(inst) x86_movsl((inst)) -#if defined(__default_codegen__) -#define x86_prefix(inst,p) \ - do { \ - *(inst)++ =(unsigned char) (p); \ - } while (0) -#elif defined(__native_client_codegen__) +#if defined(__native_client_codegen__) #if defined(TARGET_X86) /* kNaClAlignment - 1 is the max value we can pass into x86_codegen_pre. */ /* This keeps us from having to call x86_codegen_pre with specific */ @@ -517,6 +512,11 @@ typedef union { #endif /* TARGET_AMD64 */ +#else +#define x86_prefix(inst,p) \ + do { \ + *(inst)++ =(unsigned char) (p); \ + } while (0) #endif /* __native_client_codegen__ */ #define x86_rdtsc(inst) \ |
