diff options
| -rw-r--r-- | lib/System/Win32/Path.inc | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86JITInfo.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc index 92ab62f3cd..8f3ceebb28 100644 --- a/lib/System/Win32/Path.inc +++ b/lib/System/Win32/Path.inc @@ -741,7 +741,7 @@ Path::setStatusInfoOnDisk(const StatusInfo& si) const { } void -sys::CopyFile(const sys::Path &Dest, const sys::Path &Src) { +CopyFile(const sys::Path &Dest, const sys::Path &Src) { // Can't use CopyFile macro defined in Windows.h because it would mess up the // above line. We use the expansion it would have in a non-UNICODE build. if (!::CopyFileA(Src.c_str(), Dest.c_str(), false)) diff --git a/lib/Target/X86/X86JITInfo.cpp b/lib/Target/X86/X86JITInfo.cpp index 19ff68bd8f..7f93895deb 100644 --- a/lib/Target/X86/X86JITInfo.cpp +++ b/lib/Target/X86/X86JITInfo.cpp @@ -48,7 +48,7 @@ extern "C" { asm( ".text\n" ".align 8\n" -#if defined(__CYGWIN__) || defined(__APPLE__) +#if defined(__CYGWIN__) || defined(__APPLE__) || defined(__MINGW32__) ".globl _X86CompilationCallback\n" "_X86CompilationCallback:\n" #else @@ -59,7 +59,7 @@ extern "C" { "movl %esp, %ebp\n" // Standard prologue "pushl %eax\n" "pushl %edx\n" // save EAX/EDX -#if defined(__CYGWIN__) +#if defined(__CYGWIN__) || defined(__MINGW32__) "call _X86CompilationCallback2\n" #elif defined(__APPLE__) "movl 4(%ebp), %eax\n" // load the address of return address |