diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2007-06-01 08:26:48 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2007-06-01 08:26:48 +0000 |
| commit | 16a5bb82bce0388962a5d64682072439b5fa8795 (patch) | |
| tree | c3d29ddb2cbb4f48406fd8fca4c10a9858066298 /rts/Adjustor.c | |
| parent | 051f5e48f6709244dbf73306519666b060dec42d (diff) | |
| download | haskell-16a5bb82bce0388962a5d64682072439b5fa8795.tar.gz | |
remove OpenBSD-specific initAdjustor() code that shouldn't be required now
Submitted by: Matthias Kilian <kili@outback.escape.de>
Diffstat (limited to 'rts/Adjustor.c')
| -rw-r--r-- | rts/Adjustor.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/rts/Adjustor.c b/rts/Adjustor.c index 841f75c5d0..e2815d0d04 100644 --- a/rts/Adjustor.c +++ b/rts/Adjustor.c @@ -84,10 +84,6 @@ static void GNUC3_ATTRIBUTE(used) obscure_ccall_wrapper(void) } extern void obscure_ccall_ret_code(void); -#if defined(openbsd_HOST_OS) -static unsigned char *obscure_ccall_ret_code_dyn; -#endif - #endif #if defined(x86_64_HOST_ARCH) @@ -322,11 +318,7 @@ createAdjustor(int cconv, StgStablePtr hptr, adj_code[0x0a] = (unsigned char)0x68; /* pushl obscure_ccall_ret_code */ *((StgFunPtr*)(adj_code + 0x0b)) = -#if !defined(openbsd_HOST_OS) (StgFunPtr)obscure_ccall_ret_code; -#else - (StgFunPtr)obscure_ccall_ret_code_dyn; -#endif adj_code[0x0f] = (unsigned char)0xff; /* jmp *%eax */ adj_code[0x10] = (unsigned char)0xe0; @@ -1099,21 +1091,3 @@ if ( *(unsigned char*)ptr != 0xe8 ) { freeExec(ptr); } - - -/* - * Function: initAdjustor() - * - * Perform initialisation of adjustor thunk layer (if needed.) - */ -void -initAdjustor(void) -{ -#if defined(i386_HOST_ARCH) && defined(openbsd_HOST_OS) - obscure_ccall_ret_code_dyn = allocateExec(4); - obscure_ccall_ret_code_dyn[0] = ((unsigned char *)obscure_ccall_ret_code)[0]; - obscure_ccall_ret_code_dyn[1] = ((unsigned char *)obscure_ccall_ret_code)[1]; - obscure_ccall_ret_code_dyn[2] = ((unsigned char *)obscure_ccall_ret_code)[2]; - obscure_ccall_ret_code_dyn[3] = ((unsigned char *)obscure_ccall_ret_code)[3]; -#endif -} |