Index: b/usr/src/lib/libc/i386/inc/SYS.h =================================================================== --- a/usr/src/lib/libc/i386/inc/SYS.h +++ b/usr/src/lib/libc/i386/inc/SYS.h @@ -64,7 +64,7 @@ #define __SYSCALLINT(name) \ /* CSTYLED */ \ - movl $SYS_/**/name, %eax; \ + movl $SYS_##name, %eax; \ int $T_SYSCALLINT /* @@ -75,7 +75,7 @@ call 8f; \ 8: popl %edx; \ /* CSTYLED */ \ - movl $SYS_/**/name, %eax; \ + movl $SYS_##name, %eax; \ movl %esp, %ecx; \ add $[9f - 8b], %edx; \ sysenter; \ @@ -87,7 +87,7 @@ */ #define __SYSCALL(name) \ /* CSTYLED */ \ - movl $SYS_/**/name, %eax; \ + movl $SYS_##name, %eax; \ .byte 0xf, 0x5 /* syscall */ #if defined(_SYSC_INSN) @@ -112,7 +112,7 @@ */ #define SYSFASTTRAP(name) \ /* CSTYLED */ \ - movl $T_/**/name, %eax; \ + movl $T_##name, %eax; \ int $T_FASTTRAP /* @@ -149,7 +149,7 @@ */ #define SYSREENTRY(name) \ /* CSTYLED */ \ -.restart_/**/name: \ +.restart_##name: \ ENTRY(name) /* @@ -207,13 +207,13 @@ SYSREENTRY(name); \ SYSTRAP_2RVALS(name); \ /* CSTYLED */ \ - SYSRESTART(.restart_/**/name) + SYSRESTART(.restart_##name) #define SYSCALL_RESTART_RVAL1(name) \ SYSREENTRY(name); \ SYSTRAP_RVAL1(name); \ /* CSTYLED */ \ - SYSRESTART(.restart_/**/name) + SYSRESTART(.restart_##name) /* * SYSCALL2 provides a common system call sequence when the entry name @@ -237,13 +237,13 @@ SYSREENTRY(entryname); \ SYSTRAP_2RVALS(trapname); \ /* CSTYLED */ \ - SYSRESTART(.restart_/**/entryname) + SYSRESTART(.restart_##entryname) #define SYSCALL2_RESTART_RVAL1(entryname, trapname) \ SYSREENTRY(entryname); \ SYSTRAP_RVAL1(trapname); \ /* CSTYLED */ \ - SYSRESTART(.restart_/**/entryname) + SYSRESTART(.restart_##entryname) /* * SYSCALL_NOERROR provides the most common system call sequence for those Index: b/usr/src/lib/libc/amd64/inc/SYS.h =================================================================== --- a/usr/src/lib/libc/amd64/inc/SYS.h +++ b/usr/src/lib/libc/amd64/inc/SYS.h @@ -54,7 +54,7 @@ #define __SYSCALL(name) \ movq %rcx, %r10; \ /* CSTYLED */ \ - movl $SYS_/**/name, %eax; \ + movl $SYS_##name, %eax; \ syscall #define SYSTRAP_RVAL1(name) __SYSCALL(name) @@ -68,7 +68,7 @@ */ #define SYSFASTTRAP(name) \ /* CSTYLED */ \ - movl $T_/**/name, %eax; \ + movl $T_##name, %eax; \ int $T_FASTTRAP /* Index: b/usr/src/lib/libc/amd64/gen/memcmp.s =================================================================== --- a/usr/src/lib/libc/amd64/gen/memcmp.s +++ b/usr/src/lib/libc/amd64/gen/memcmp.s @@ -54,7 +54,7 @@ #include "SYS.h" #include "cache.h" -#define LABEL(s) .memcmp/**/s +#define LABEL(s) .memcmp##s ENTRY(memcmp) /* (const void *, const void*, size_t) */ Index: b/usr/src/lib/libc/amd64/gen/memcpy.s =================================================================== --- a/usr/src/lib/libc/amd64/gen/memcpy.s +++ b/usr/src/lib/libc/amd64/gen/memcpy.s @@ -44,7 +44,7 @@ #include "cache.h" #include "proc64_id.h" -#define L(s) .memcpy/**/s +#define L(s) .memcpy##s /* * memcpy algorithm overview: Index: b/usr/src/lib/libc/amd64/gen/memset.s =================================================================== --- a/usr/src/lib/libc/amd64/gen/memset.s +++ b/usr/src/lib/libc/amd64/gen/memset.s @@ -42,7 +42,7 @@ #include "cache.h" #include "proc64_id.h" -#define L(s) .memset/**/s +#define L(s) .memset##s /* * memset algorithm overview: Index: b/usr/src/lib/libc/amd64/gen/strcmp.s =================================================================== --- a/usr/src/lib/libc/amd64/gen/strcmp.s +++ b/usr/src/lib/libc/amd64/gen/strcmp.s @@ -31,7 +31,7 @@ #include "SYS.h" #include "proc64_id.h" -#define LABEL(s) .strcmp/**/s +#define LABEL(s) .strcmp##s #ifdef USE_AS_STRNCMP /* Index: b/usr/src/lib/libc/amd64/gen/strcpy.s =================================================================== --- a/usr/src/lib/libc/amd64/gen/strcpy.s +++ b/usr/src/lib/libc/amd64/gen/strcpy.s @@ -30,7 +30,7 @@ #include "SYS.h" #include "proc64_id.h" -#define LABEL(s) .strcpy/**/s +#define LABEL(s) .strcpy##s #ifdef USE_AS_STRNCPY ENTRY(strncpy) Index: b/usr/src/lib/libc/amd64/gen/strlen.s =================================================================== --- a/usr/src/lib/libc/amd64/gen/strlen.s +++ b/usr/src/lib/libc/amd64/gen/strlen.s @@ -31,7 +31,7 @@ #include "SYS.h" #include "proc64_id.h" -#define LABEL(s) .strlen/**/s +#define LABEL(s) .strlen##s /* * This implementation uses SSE instructions to compare up to 16 bytes