diff options
| author | Rob Mc Gee <RobertM@magnitude.com> | 2022-07-27 15:30:51 -0700 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-08-01 11:52:07 +0200 |
| commit | df1e33bc8ae67573a3f3488eff82e02fc0310203 (patch) | |
| tree | f3006e6da6afc48978e16a584de7fd64370c5101 /providers | |
| parent | 6f74677911de87f3271721073bd360806a93733f (diff) | |
| download | openssl-new-df1e33bc8ae67573a3f3488eff82e02fc0310203.tar.gz | |
Updating ifdefs to account for xlclang compiler frontend on AIX.
The fallback DEP works fine there. XLC should be unaffected.
CLA: trivial
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18892)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/fips/self_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c index 1882996571..42df9a4b87 100644 --- a/providers/fips/self_test.c +++ b/providers/fips/self_test.c @@ -104,7 +104,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -#elif defined(__GNUC__) +#elif defined(__GNUC__) && !defined(_AIX) # undef DEP_INIT_ATTRIBUTE # undef DEP_FINI_ATTRIBUTE # define DEP_INIT_ATTRIBUTE static __attribute__((constructor)) @@ -114,7 +114,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) # pragma init(init) # pragma fini(cleanup) -#elif defined(_AIX) +#elif defined(_AIX) && !defined(__GNUC__) void _init(void); void _cleanup(void); # pragma init(_init) |