Date: Sat, 23 Nov 2013 18:50:43 +0000 (UTC) From: Andreas Tobler <andreast@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258502 - in head/lib/libc: powerpc powerpc64 Message-ID: <201311231850.rANIohrT019593@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andreast Date: Sat Nov 23 18:50:43 2013 New Revision: 258502 URL: http://svnweb.freebsd.org/changeset/base/258502 Log: Get rid of the CONCAT macro. Modified: head/lib/libc/powerpc/SYS.h head/lib/libc/powerpc64/SYS.h Modified: head/lib/libc/powerpc/SYS.h ============================================================================== --- head/lib/libc/powerpc/SYS.h Sat Nov 23 18:32:53 2013 (r258501) +++ head/lib/libc/powerpc/SYS.h Sat Nov 23 18:50:43 2013 (r258502) @@ -36,24 +36,24 @@ #define _SYSCALL(name) \ .text; \ .align 2; \ - li 0,(__CONCAT(SYS_, name)); \ + li 0,(SYS_##name); \ sc #define SYSCALL(name) \ .text; \ .align 2; \ 2: b PIC_PLT(CNAME(HIDENAME(cerror))); \ -ENTRY(__CONCAT(__sys_, name)); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), name); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\ +ENTRY(__sys_##name); \ + WEAK_REFERENCE(__sys_##name, name); \ + WEAK_REFERENCE(__sys_##name, _##name); \ _SYSCALL(name); \ bso 2b #define PSEUDO(name) \ .text; \ .align 2; \ -ENTRY(__CONCAT(__sys_, name)); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\ +ENTRY(__sys_##name); \ + WEAK_REFERENCE(__sys_##name, _##name); \ _SYSCALL(name); \ bnslr; \ b PIC_PLT(CNAME(HIDENAME(cerror))) @@ -62,9 +62,9 @@ ENTRY(__CONCAT(__sys_, name)); \ .text; \ .align 2; \ 2: b PIC_PLT(CNAME(HIDENAME(cerror))); \ -ENTRY(__CONCAT(__sys_, name)); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), name); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\ +ENTRY(__sys_##name); \ + WEAK_REFERENCE(__sys_##name, name); \ + WEAK_REFERENCE(__sys_##name, _##name); \ _SYSCALL(name); \ bnslr; \ b PIC_PLT(CNAME(HIDENAME(cerror))) Modified: head/lib/libc/powerpc64/SYS.h ============================================================================== --- head/lib/libc/powerpc64/SYS.h Sat Nov 23 18:32:53 2013 (r258501) +++ head/lib/libc/powerpc64/SYS.h Sat Nov 23 18:50:43 2013 (r258502) @@ -36,7 +36,7 @@ #define _SYSCALL(name) \ .text; \ .align 2; \ - li 0,(__CONCAT(SYS_, name)); \ + li 0,(SYS_##name); \ sc #define SYSCALL(name) \ @@ -51,17 +51,17 @@ ld %r0,16(%r1); \ mtlr %r0; \ blr; \ -ENTRY(__CONCAT(__sys_, name)); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), name); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name)); \ - _SYSCALL(name); \ +ENTRY(__sys_##name); \ + WEAK_REFERENCE(__sys_##name, name); \ + WEAK_REFERENCE(__sys_##name, _##name); \ + _SYSCALL(name); \ bso 2b #define PSEUDO(name) \ .text; \ .align 2; \ -ENTRY(__CONCAT(__sys_, name)); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name)); \ +ENTRY(__sys_##name); \ + WEAK_REFERENCE(__sys_##name, _##name); \ _SYSCALL(name); \ bnslr; \ mflr %r0; \ @@ -77,9 +77,9 @@ ENTRY(__CONCAT(__sys_, name)); \ #define RSYSCALL(name) \ .text; \ .align 2; \ -ENTRY(__CONCAT(__sys_, name)); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), name); \ - WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\ +ENTRY(__sys_##name); \ + WEAK_REFERENCE(__sys_##name, name); \ + WEAK_REFERENCE(__sys_##name, _##name); \ _SYSCALL(name); \ bnslr; \ \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311231850.rANIohrT019593>