diff options
| author | Andy Polyakov <appro@openssl.org> | 2010-09-18 08:46:53 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2010-09-18 08:46:53 +0000 |
| commit | 90ba3a28f8701bc2a97b963d96c8293838d8d08b (patch) | |
| tree | 5a05d0975639786698ccba0da09f665c438aa4f5 /crypto/s390xcap.c | |
| parent | bc9092f726fa0801b196ca5f47c824bee3b33251 (diff) | |
| download | openssl-90ba3a28f8701bc2a97b963d96c8293838d8d08b.tar.gz | |
s390x assembler pack: extend OPENSSL_s390xcap_P to 128 bits.
Diffstat (limited to 'crypto/s390xcap.c')
| -rw-r--r-- | crypto/s390xcap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c index ffbe0235f9..f2e94ef47e 100644 --- a/crypto/s390xcap.c +++ b/crypto/s390xcap.c @@ -4,7 +4,7 @@ #include <setjmp.h> #include <signal.h> -extern unsigned long OPENSSL_s390xcap_P; +extern unsigned long OPENSSL_s390xcap_P[]; static sigjmp_buf ill_jmp; static void ill_handler (int sig) { siglongjmp(ill_jmp,sig); } @@ -16,7 +16,9 @@ void OPENSSL_cpuid_setup(void) sigset_t oset; struct sigaction ill_act,oact; - if (OPENSSL_s390xcap_P) return; + if (OPENSSL_s390xcap_P[0]) return; + + OPENSSL_s390xcap_P[0] = 1UL<<(8*sizeof(unsigned long)-1); memset(&ill_act,0,sizeof(ill_act)); ill_act.sa_handler = ill_handler; @@ -27,10 +29,8 @@ void OPENSSL_cpuid_setup(void) sigaction (SIGILL,&ill_act,&oact); /* protection against missing store-facility-list-extended */ - if (sigsetjmp(ill_jmp,0) == 0) - OPENSSL_s390xcap_P = OPENSSL_s390x_facilities(); - else - OPENSSL_s390xcap_P = 1UL<<63; + if (sigsetjmp(ill_jmp,1) == 0) + OPENSSL_s390x_facilities(); sigaction (SIGILL,&oact,NULL); sigprocmask(SIG_SETMASK,&oset,NULL); |