]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Updating ifdefs to account for xlclang compiler frontend on AIX.
authorRob Mc Gee <RobertM@magnitude.com>
Wed, 27 Jul 2022 22:30:51 +0000 (15:30 -0700)
committerTomas Mraz <tomas@openssl.org>
Mon, 1 Aug 2022 09:52:07 +0000 (11:52 +0200)
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)

providers/fips/self_test.c

index 1882996571a8618dc0b7cf70aca0c60ba923649c..42df9a4b87575c449b0eee8320b015eb4fd99203 100644 (file)
@@ -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)