From: Rob Mc Gee <RobertM@magnitude.com>
Date: Wed, 27 Jul 2022 22:30:51 +0000 (-0700)
Subject: Updating ifdefs to account for xlclang compiler frontend on AIX.
X-Git-Tag: openssl-3.2.0-alpha1~2309
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df1e33bc8ae67573a3f3488eff82e02fc0310203;p=thirdparty%2Fopenssl.git

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

diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c
index 1882996571a..42df9a4b875 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)