From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 26 Mar 2010 13:38:41 +0000 (+0000)
Subject: use "rep; nop" instead of "pause" on Solaris/amd64
X-Git-Tag: release-0.8.35~10
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=f59ae65fa4be49154462ee3b7c16bc801c663f9c;p=nginx.git

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
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