Merge branch 'master' of git://factorcode.org/git/factor
commit
6f1bc07fb2
|
@ -3,9 +3,15 @@
|
||||||
if [ \( `uname -s ` = FreeBSD \) -a \( `uname -p` = i386 \) ]
|
if [ \( `uname -s ` = FreeBSD \) -a \( `uname -p` = i386 \) ]
|
||||||
then
|
then
|
||||||
echo freebsd-x86-32
|
echo freebsd-x86-32
|
||||||
|
elif [ \( `uname -s` = FreeBSD \) -a \( `uname -m` = amd64 \) ]
|
||||||
|
then
|
||||||
|
echo freebsd-x86-64
|
||||||
elif [ \( `uname -s` = OpenBSD \) -a \( `uname -m` = i386 \) ]
|
elif [ \( `uname -s` = OpenBSD \) -a \( `uname -m` = i386 \) ]
|
||||||
then
|
then
|
||||||
echo openbsd-x86-32
|
echo openbsd-x86-32
|
||||||
|
elif [ \( `uname -s` = OpenBSD \) -a \( `uname -m` = amd64 \) ]
|
||||||
|
then
|
||||||
|
echo openbsd-x86-64
|
||||||
elif [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ]
|
elif [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ]
|
||||||
then
|
then
|
||||||
echo macosx-ppc
|
echo macosx-ppc
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
|
#include <amd64/signal.h>
|
||||||
|
|
||||||
INLINE void *openbsd_stack_pointer(void *uap)
|
INLINE void *openbsd_stack_pointer(void *uap)
|
||||||
{
|
{
|
||||||
ucontext_t *ucontext = (ucontext_t *)uap;
|
struct sigcontext *sc = (struct sigcontext*) uap;
|
||||||
return (void *)ucontext->sc_rsp;
|
return (void *)sc->sc_rsp;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ucontext_stack_pointer openbsd_stack_pointer
|
#define ucontext_stack_pointer openbsd_stack_pointer
|
||||||
|
#define UAP_PROGRAM_COUNTER(uap) (((struct sigcontext*)(uap))->sc_rip)
|
||||||
|
|
Loading…
Reference in New Issue