diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-02-14 03:33:34 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-02-14 03:33:34 +0000 |
| commit | bf7ac42663e087b2effc6b9428eddab3b2475073 (patch) | |
| tree | 8178fbfc80a7957eb164d999e5038ba9ea5a542f | |
| parent | 1f258a6d53b29f6dfb60436da4aa76e996644d84 (diff) | |
| download | llvm-bf7ac42663e087b2effc6b9428eddab3b2475073.tar.gz llvm-bf7ac42663e087b2effc6b9428eddab3b2475073.tar.bz2 llvm-bf7ac42663e087b2effc6b9428eddab3b2475073.tar.xz | |
Revert r175120 and r175121. Clang is producing the expected asm names again.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175133 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/PowerPC/PPCJITInfo.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/X86/X86JITInfo.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/Target/PowerPC/PPCJITInfo.cpp b/lib/Target/PowerPC/PPCJITInfo.cpp index df40cf1872..851de1778a 100644 --- a/lib/Target/PowerPC/PPCJITInfo.cpp +++ b/lib/Target/PowerPC/PPCJITInfo.cpp @@ -292,7 +292,7 @@ void PPC64CompilationCallback() { #endif extern "C" { -void* LLVM_ATTRIBUTE_USED PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, +static void* LLVM_ATTRIBUTE_USED PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, unsigned *OrigCallAddrPlus4, bool is64Bit) { // Adjust the pointer to the address of the call instruction in the stub diff --git a/lib/Target/X86/X86JITInfo.cpp b/lib/Target/X86/X86JITInfo.cpp index 2e003f7a46..0a4accee99 100644 --- a/lib/Target/X86/X86JITInfo.cpp +++ b/lib/Target/X86/X86JITInfo.cpp @@ -342,6 +342,12 @@ extern "C" { /// must locate the start of the stub or call site and pass it into the JIT /// compiler function. extern "C" { +#if !(defined (X86_64_JIT) && defined(_MSC_VER)) + // the following function is called only from this translation unit, + // unless we are under 64bit Windows with MSC, where there is + // no support for inline assembly +static +#endif void LLVM_ATTRIBUTE_USED X86CompilationCallback2(intptr_t *StackPtr, intptr_t RetAddr) { intptr_t *RetAddrLoc = &StackPtr[1]; |