jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 17:23:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Undo the ill-conceived breakage of the previous commit and really fix:

Browse Source 
For libc_r renamed syscalls, correct symbol naming from
_thread_sys_foo() <-- _foo() to _thread_sys_foo() <-- _foo() <-- foo().  This
is necessary for system calls which libc_r doesn't define foo().

Some weak symbols such as poll() are defined twice.  From what I understand,
depending on one weak symbol or the other to be used is a bad idea.  All
such weak symbols defined in the libc_r-specific code should therefore be
made strong (non-weak?).

Simplify PSEUDO() to not define any weak symbols, since they aren't ever
needed.

alpha/SYS.h:

Correct reversed usage of WEAK_ALIAS(), which has reversed arguments from
__weak_reference().  Also, fix reversal of symbols, so that syscall foo()
is a weak alias for _foo().

Add WEAK_ALIAS() call to PRSYSCALL(), which unlike the i386 version of
PRSYSCALL(), is not defined in terms of PSYSCALL().

Make PSEUDO() equivalent to the i386 version.
This commit is contained in:
Jason Evans 2000-01-29 12:50:47 +00:00
parent edfd254255
commit e9a89b2196
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=56809
3 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libc/alpha/SYS.h
View File

@ -46,8 +46,8 @@ LLABEL(name,1):
#define SYSCALL(name) \
LEAF(name,0); /* XXX # of args? */ \
WEAK_ALIAS(__CONCAT(_,name), name); \
LEAF(__CONCAT(_,name),0); /* XXX # of args? */ \
WEAK_ALIAS(name, __CONCAT(_,name)); \
CALLSYS_ERROR(name)
#define SYSCALL_NOERROR(name) \
@ -58,7 +58,7 @@ LEAF(name,0); /* XXX # of args? */ \
#define RSYSCALL(name) \
SYSCALL(name); \
RET; \
END(name)
END(__CONCAT(_,name))
#define RSYSCALL_NOERROR(name) \
SYSCALL_NOERROR(name); \
@ -67,11 +67,11 @@ END(name)
#define PSEUDO(label,name) \
LEAF(label,0); /* XXX # of args? */ \
WEAK_ALIAS(__CONCAT(_,name), name); \
LEAF(__CONCAT(_,label),0); /* XXX # of args? */ \
WEAK_ALIAS(label, __CONCAT(_,label)); \
CALLSYS_ERROR(name); \
RET; \
END(label);
END(__CONCAT(_,label));
#define PSEUDO_NOERROR(label,name) \
LEAF(label,0); /* XXX # of args? */ \
@ -104,18 +104,20 @@ END(___CONCAT(_thread_sys_,name))
#define PSYSCALL(name) \
PLEAF(name,0); /* XXX # of args? */ \
WEAK_ALIAS(__CONCAT(_,name), name); \
WEAK_ALIAS(__CONCAT(_,name), __CONCAT(_thread_sys_,name)); \
WEAK_ALIAS(name, __CONCAT(_,name)); \
CALLSYS_ERROR(name)
#define PRSYSCALL(name) \
PLEAF(name,0); /* XXX # of args? */ \
WEAK_ALIAS(__CONCAT(_,name), __CONCAT(_thread_sys_,name)); \
WEAK_ALIAS(name, __CONCAT(_,name)); \
CALLSYS_ERROR(name) \
RET; \
PEND(name)
#define PPSEUDO(label,name) \
PLEAF(label,0); /* XXX # of args? */ \
WEAK_ALIAS(__CONCAT(_,name), name); \
CALLSYS_ERROR(name); \
RET; \
PEND(label)

18
lib/libc/amd64/SYS.h
View File

@ -41,17 +41,17 @@
#include <sys/syscall.h>
#include "DEFS.h"
#define SYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
ENTRY(__CONCAT(_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
#define SYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
ENTRY(__CONCAT(_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
#define RSYSCALL(x) SYSCALL(x); ret
#define PSEUDO(x,y) ENTRY(__CONCAT(_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
#define PSEUDO(x,y) ENTRY(__CONCAT(_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
lea __CONCAT(SYS_,y), %eax; KERNCALL; ret
/* gas messes up offset -- although we don't currently need it, do for BCS */
@ -73,13 +73,13 @@
*/
#define PSYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
ENTRY(__CONCAT(_thread_sys_,x)); \
.weak CNAME(__CONCAT(_,x)); \
.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(_thread_sys_,x));\
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
#define PRSYSCALL(x) PSYSCALL(x); ret
#define PPSEUDO(x,y) ENTRY(__CONCAT(_thread_sys_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
lea __CONCAT(SYS_,y), %eax; KERNCALL; ret
#else
/*

18
lib/libc/i386/SYS.h
View File

@ -41,17 +41,17 @@
#include <sys/syscall.h>
#include "DEFS.h"
#define SYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
ENTRY(__CONCAT(_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
#define SYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
ENTRY(__CONCAT(_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
#define RSYSCALL(x) SYSCALL(x); ret
#define PSEUDO(x,y) ENTRY(__CONCAT(_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
#define PSEUDO(x,y) ENTRY(__CONCAT(_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
lea __CONCAT(SYS_,y), %eax; KERNCALL; ret
/* gas messes up offset -- although we don't currently need it, do for BCS */
@ -73,13 +73,13 @@
*/
#define PSYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \
ENTRY(__CONCAT(_thread_sys_,x)); \
.weak CNAME(__CONCAT(_,x)); \
.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(_thread_sys_,x));\
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
lea __CONCAT(SYS_,x),%eax; KERNCALL; jb 2b
#define PRSYSCALL(x) PSYSCALL(x); ret
#define PPSEUDO(x,y) ENTRY(__CONCAT(_thread_sys_,x)); \
.weak CNAME(x); \
.set CNAME(x),CNAME(__CONCAT(_,x)); \
lea __CONCAT(SYS_,y), %eax; KERNCALL; ret
#else
/*