diff options
author | spz <spz> | 2015-04-29 15:15:11 +0000 |
---|---|---|
committer | spz <spz> | 2015-04-29 15:15:11 +0000 |
commit | b823ef3048afcad3e0c11d4273c27ddd65437cf9 (patch) | |
tree | 9d79be6946f84bbefa8087bf7e784ad59ccbaac8 | |
parent | 7e4af58f0e4e3486f2706b0507a6143fc3e2cef1 (diff) | |
download | pkgsrc-b823ef3048afcad3e0c11d4273c27ddd65437cf9.tar.gz |
Pullup ticket #4701 - requested by manu
devel/gnustep-objc: build fix
Revisions pulled up:
- devel/gnustep-objc/Makefile 1.27
- devel/gnustep-objc/distinfo 1.9
- devel/gnustep-objc/patches/patch-objc_msgSend.x86-32.S 1.1
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: manu
Date: Sat Apr 18 07:23:18 UTC 2015
Modified Files:
pkgsrc/devel/gnustep-objc: Makefile distinfo
Added Files:
pkgsrc/devel/gnustep-objc/patches: patch-objc_msgSend.x86-32.S
Log Message:
Build fix for missing __i686.get_pc_thunk.bx symbol
Depending on the compiler, __i686.get_pc_thunk.bx may be missing
from runtime. Replace it by a localy supplied version.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/gnustep-objc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/gnustep-objc/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/gnustep-objc/patches/patch-objc_msgSend.x86-32.S
-rw-r--r-- | devel/gnustep-objc/patches/patch-objc_msgSend.x86-32.S | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/devel/gnustep-objc/patches/patch-objc_msgSend.x86-32.S b/devel/gnustep-objc/patches/patch-objc_msgSend.x86-32.S new file mode 100644 index 00000000000..d55e04c1167 --- /dev/null +++ b/devel/gnustep-objc/patches/patch-objc_msgSend.x86-32.S @@ -0,0 +1,26 @@ +$NetBSD: patch-objc_msgSend.x86-32.S,v 1.1.2.2 2015/04/29 15:15:11 spz Exp $ + +Depending on the compiler, __i686.get_pc_thunk.bx may be missing +from runtime. Replace it by a localy supplied version. + +--- objc_msgSend.x86-32.S.orig 2015-04-17 09:44:49.000000000 +0000 ++++ objc_msgSend.x86-32.S 2015-04-17 09:47:40.000000000 +0000 +@@ -77,9 +77,9 @@ + + jmp *%eax + 6: # smallObject: + push %ebx # Save old %ebx +- call __i686.get_pc_thunk.bx ++ call ___i686.get_pc_thunk.bx + addl $_GLOBAL_OFFSET_TABLE_, %ebx + mov SmallObjectClasses@GOT(%ebx), %eax + mov (%eax), %eax + popl %ebx +@@ -97,4 +97,7 @@ + .globl objc_msgSend_stret + .type objc_msgSend_stret, @function + objc_msgSend_stret: + MSGSEND 8, 12, 0 ++___i686.get_pc_thunk.bx: ++ mov (%esp),%ebx ++ ret |