cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On amd64 we need to make sure function calls in inline assembly code go

Browse Source 
through the PLT, so do on OpenBSD what Linux and FreeBSD are already doing.

Fixes build with binutils 2.17 and fixes a potential runtime issue with
binutils 2.15.

ok espie@
This commit is contained in:
kettenis 2015-05-13 14:03:07 +00:00
parent ded35a521e
commit a317cf2c85
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/qt4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.125 2014/11/13 18:33:24 zhuk Exp $
# $OpenBSD: Makefile,v 1.126 2015/05/13 14:03:07 kettenis Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
SHARED_ONLY = Yes
@ -24,7 +24,7 @@ PKGNAME-main = qt4-${PKGVERSION}
PKGNAME-debug = qt4-debug-${PKGVERSION}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
REVISION-main = 0
REVISION-main = 1
REVISION-mysql = 0

12
x11/qt4/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs_cpp,v 1.1 2015/05/13 14:03:07 kettenis Exp $
--- src/3rdparty/webkit/Source/JavaScriptCore/jit/JITStubs.cpp.orig Thu Apr 10 20:37:11 2014
+++ src/3rdparty/webkit/Source/JavaScriptCore/jit/JITStubs.cpp Wed May 13 11:03:44 2015
@@ -79,7 +79,7 @@ namespace JSC {
#define THUMB_FUNC_PARAM(name)
#endif
-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
+#if (OS(LINUX) || OS(FREEBSD) || OS(OPENBSD)) && CPU(X86_64)
#define SYMBOL_STRING_RELOCATION(name) #name "@plt"
#elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
#define SYMBOL_STRING_RELOCATION(name) "_" #name