# HG changeset patch # User Igor Sysoev # Date 1269610721 0 # Node ID bfd1912e55a9b29bc72942c3b0ef92cbfd92e357 # Parent eb8660fecc12e7137b5182a7e191ef3526dc3845 use "rep; nop" instead of "pause" on Solaris/amd64 diff --git a/src/os/unix/ngx_sunpro_amd64.il b/src/os/unix/ngx_sunpro_amd64.il --- a/src/os/unix/ngx_sunpro_amd64.il +++ b/src/os/unix/ngx_sunpro_amd64.il @@ -31,7 +31,12 @@ / ngx_cpu_pause() +/ +/ the "rep; nop" is used instead of "pause" to avoid the "[ PAUSE ]" hardware +/ capability added by linker because Solaris/amd64 does not know about it: +/ +/ ld.so.1: nginx: fatal: hardware capability unsupported: 0x2000 [ PAUSE ] .inline ngx_cpu_pause,0 - pause + rep; nop .end