diff options
| author |   deraadt <deraadt@openbsd.org> | 2017-08-16 19:48:49 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2017-08-16 19:48:49 +0000 |
| commit | a995b05780da19c4461e096a22974243cbdeaeb4 (patch) | |
| tree | ba305bae86dd86e0f5d6f9cbc938b62706710415 | |
| parent | ENTRY() requires END() (diff) | |
| download | wireguard-openbsd-a995b05780da19c4461e096a22974243cbdeaeb4.tar.xz wireguard-openbsd-a995b05780da19c4461e096a22974243cbdeaeb4.zip | |
remove accidentally duplicated cpp chunks
ok kettenis
| -rw-r--r-- | libexec/ld.so/i386/ldasm.S | 42 |
1 files changed, 10 insertions, 32 deletions
diff --git a/libexec/ld.so/i386/ldasm.S b/libexec/ld.so/i386/ldasm.S index ae8d57ed86c..220a07bfb36 100644 --- a/libexec/ld.so/i386/ldasm.S +++ b/libexec/ld.so/i386/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.30 2017/08/15 00:26:02 deraadt Exp $ */ +/* $OpenBSD: ldasm.S,v 1.31 2017/08/16 19:48:49 deraadt Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -85,18 +85,6 @@ _dl_start: movl $__CONCAT(SYS_, x),%eax; \ int $0x80 - -#define DL_SYSCALL(n) DL_SYSCALL2(n,n) -#define DL_SYSCALL2(n,c) \ - .section ".text" ;\ - .align 16,0xcc ;\ - .global __CONCAT(_dl_,n) ;\ - .type __CONCAT(_dl_,n),@function ;\ -__CONCAT(_dl_,n): ;\ - __DO_SYSCALL(c) ;\ - jb .L_cerr ;\ - ret - #define DL_SYSCALL(n) DL_SYSCALL2(n,n) #define DL_SYSCALL2(n,c) \ .section ".text" ;\ @@ -108,35 +96,26 @@ __CONCAT(_dl_,n): ;\ jb .L_cerr ;\ ret +DL_SYSCALL(open) +DL_SYSCALL(fstat) +DL_SYSCALL(read) +DL_SYSCALL(write) DL_SYSCALL(close) - - .section ".text" - .align 16,0xcc - .global _dl_exit - .type _dl_exit,@function -_dl_exit: - mov $SYS_exit, %eax - int $0x80 - ret - DL_SYSCALL(issetugid) DL_SYSCALL(getthrid) -DL_SYSCALL2(_syscall,__syscall) -DL_SYSCALL(munmap) +DL_SYSCALL(getdents) DL_SYSCALL(mprotect) -DL_SYSCALL(open) -DL_SYSCALL(read) -DL_SYSCALL(write) -DL_SYSCALL(fstat) +DL_SYSCALL(munmap) +DL_SYSCALL(exit) DL_SYSCALL(readlink) DL_SYSCALL(utrace) DL_SYSCALL(getentropy) DL_SYSCALL(sendsyslog) DL_SYSCALL(pledge) DL_SYSCALL2(getcwd,__getcwd) -DL_SYSCALL(sysctl) -DL_SYSCALL(getdents) DL_SYSCALL2(set_tcb,__set_tcb) +DL_SYSCALL2(_syscall,__syscall) +DL_SYSCALL(sysctl) DL_SYSCALL(thrkill) .L_cerr: @@ -144,7 +123,6 @@ DL_SYSCALL(thrkill) neg %eax ret - .align 16,0xcc .global _dl_bind_start .type _dl_bind_start,@function |