diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-03-26 13:38:41 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-03-26 13:38:41 +0000 |
| commit | f59ae65fa4be49154462ee3b7c16bc801c663f9c (patch) | |
| tree | 30eca4df58a30a2b05beac8b95a61562b8ee9ad5 /src/os/unix | |
| parent | b45498c3de7458a366810bc27de537794e070ab4 (diff) | |
| download | nginx-f59ae65fa4be49154462ee3b7c16bc801c663f9c.tar.gz nginx-f59ae65fa4be49154462ee3b7c16bc801c663f9c.zip | |
use "rep; nop" instead of "pause" on Solaris/amd64
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_sunpro_amd64.il | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/os/unix/ngx_sunpro_amd64.il b/src/os/unix/ngx_sunpro_amd64.il index c26e6f717..c6519574d 100644 --- 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 |