Solaris missing from define checks for inline-assembler calling convention. file upstream bug diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h index 8379a69..b8fc3d3 100644 --- webkitgtk-2.32.3/Source/WTF/wtf/InlineASM.h +++ webkitgtk-2.32.3/Source/WTF/wtf/InlineASM.h @@ -43,11 +43,11 @@ #define THUMB_FUNC_PARAM(name) #endif -#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64) +#if (OS(LINUX) || OS(FREEBSD) || OS(SOLARIS)) && (CPU(X86_64) || (CPU(SPARC))) #define GLOBAL_REFERENCE(name) #name "@plt" #elif CPU(X86) && COMPILER(MINGW) #define GLOBAL_REFERENCE(name) "@" #name "@4" -#elif OS(LINUX) && CPU(X86) && defined(__PIC__) +#elif (OS(LINUX) || OS(SOLARIS)) && (CPU(X86) || (CPU(SPARC))) && defined(__PIC__) #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt" #else #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) @@ -69,6 +69,7 @@ || OS(FREEBSD) \ || OS(FUCHSIA) \ || OS(OPENBSD) \ + || OS(SOLARIS) \ || OS(HPUX) \ || OS(NETBSD) // ELF platform @@ -86,6 +87,7 @@ || OS(FREEBSD) \ || OS(FUCHSIA) \ || OS(OPENBSD) \ + || OS(SOLARIS) \ || OS(HURD) \ || OS(NETBSD) \ || COMPILER(MINGW)