ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use configure to detect whether global symbols need underscores

Browse Source 
64-bit Windows already used this check; make it universal, and use it in
place of an ifdef on X86_WIN32, to handle non-Windows platforms that use
the underscore, such as Darwin.
This commit is contained in:
Josh Triplett
2014-03-24 21:44:13 -07:00
parent f0f4138f90
commit be50b87a49
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@@ -439,11 +439,9 @@ AC_ARG_ENABLE(pax_emutramp,
[Define this if you want to enable pax emulated trampolines]) [Define this if you want to enable pax emulated trampolines])
fi) fi)
if test x$TARGET = xX86_WIN64; then LT_SYS_SYMBOL_USCORE
LT_SYS_SYMBOL_USCORE if test "x$sys_symbol_underscore" = xyes; then
if test "x$sys_symbol_underscore" = xyes; then AC_DEFINE(SYMBOL_UNDERSCORE, 1, [Define if symbols are underscored.])
AC_DEFINE(SYMBOL_UNDERSCORE, 1, [Define if symbols are underscored.])
fi
fi fi
FFI_EXEC_TRAMPOLINE_TABLE=0 FFI_EXEC_TRAMPOLINE_TABLE=0

2
src/x86/win32.S
View File

@@ -473,7 +473,7 @@ END
#else #else
#if defined(X86_WIN32) #if defined(SYMBOL_UNDERSCORE)
#define USCORE_SYMBOL(x) _##x #define USCORE_SYMBOL(x) _##x
#else #else
#define USCORE_SYMBOL(x) x #define USCORE_SYMBOL(x) x