diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-08 09:41:43 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-08 09:41:43 +0000 |
| commit | 4318688cce5dc30a2db7bfe1a734e1ff6782e7f9 (patch) | |
| tree | 910fef7ed844d04fdad00f137d95b8ae56777af5 /src | |
| parent | f794318d6023a06654ba71626db295d0715c4cad (diff) | |
| download | nginx-4318688cce5dc30a2db7bfe1a734e1ff6782e7f9.tar.gz nginx-4318688cce5dc30a2db7bfe1a734e1ff6782e7f9.tar.bz2 | |
preserve Solaris binary hardware capabilities
Diffstat (limited to 'src')
| -rw-r--r-- | src/os/unix/ngx_sunpro_x86.il | 11 | ||||
| -rw-r--r-- | src/os/unix/ngx_sunpro_x86.map | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/os/unix/ngx_sunpro_x86.il b/src/os/unix/ngx_sunpro_x86.il index b82a2267b..e32ea8cc1 100644 --- a/src/os/unix/ngx_sunpro_x86.il +++ b/src/os/unix/ngx_sunpro_x86.il @@ -5,7 +5,7 @@ / ngx_atomic_uint_t ngx_atomic_cmp_set(ngx_atomic_t *lock, / ngx_atomic_uint_t old, ngx_atomic_uint_t set); / -/ the arguments are passed on the stack (%esp), 4(%esp), 8(%esp) +/ the arguments are passed on stack (%esp), 4(%esp), 8(%esp) .inline ngx_atomic_cmp_set,0 movl (%esp), %ecx @@ -21,7 +21,7 @@ / ngx_atomic_int_t ngx_atomic_fetch_add(ngx_atomic_t *value, / ngx_atomic_int_t add); / -/ the arguments are passed on the stack (%esp), 4(%esp) +/ the arguments are passed on stack (%esp), 4(%esp) .inline ngx_atomic_fetch_add,0 movl (%esp), %ecx @@ -32,7 +32,12 @@ / ngx_cpu_pause() +/ +/ the "rep; nop" is used instead of "pause" to avoid the "[ PAUSE ]" hardware +/ capability added by linker because Solaris/i386 does not know about it: +/ +/ ld.so.1: nginx: fatal: hardware capability unsupported: 0x2000 [ PAUSE ] .inline ngx_cpu_pause,0 - pause + rep; nop .end diff --git a/src/os/unix/ngx_sunpro_x86.map b/src/os/unix/ngx_sunpro_x86.map deleted file mode 100644 index 971dda649..000000000 --- a/src/os/unix/ngx_sunpro_x86.map +++ /dev/null @@ -1,2 +0,0 @@ -# disable { PAUSE ] hwcap for Sun Studio 11 -hwcap_1 = OVERRIDE; |