Bug #33108847 BROKEN BUILD FOR BUNDLED LIBFIDO WITH PGO/LTO

With PGO/LTO enabled, the bundled libfido2 build is broken.  We
normally do not build, or run, the authentication plugins when doing
profile-guided optimizations.

It should still be possible to build and run them, so add a call to
the macro DISABLE_MISSING_PROFILE_WARNING.

Move DISABLE_MISSING_PROFILE_WARNING from maintainer.cmake to the top
level CMakeLists.txt so that it can be used without adding all the
other stuff in maintainer.cmake.

Also fix:
extra/libfido2/openbsd-compat/openbsd-compat.h:71:5:
error: "OPENSSL_VERSION_NUMBER" is not defined

Change-Id: I123833845690fa1dcf30733630a4d7c7ee167f86
(cherry picked from commit 5fd5019f8c524580f77931807aa6817bdba221a0)

Author: Tor Didriksen

CMakeLists.txt

@@ -968,6 +968,19 @@ FUNCTION(MY_CHECK_CXX_COMPILER_WARNING WARNING_OPTION RETURN_VALUE)
   ENDIF()
 ENDFUNCTION()
 
+# When builing with PGO, GCC will report -Wmissing-profile when compiling
+# files for which it cannot find profile data. It is valid to disable
+# this warning for files we are not currently interested in profiling.
+MACRO(DISABLE_MISSING_PROFILE_WARNING)
+  IF(FPROFILE_USE)
+    MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_WARN_FLAG)
+    IF(HAS_WARN_FLAG)
+      STRING_APPEND(CMAKE_C_FLAGS   " ${HAS_WARN_FLAG}")
+      STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
+    ENDIF()
+  ENDIF()
+ENDMACRO()
+
 MACRO(MY_SANITIZER_CHECK SAN_OPT ADD_OPTIMIZATION RESULT)
   MY_CHECK_C_COMPILER_FLAG("${SAN_OPT}" C_RESULT)
   MY_CHECK_CXX_COMPILER_FLAG("${SAN_OPT}" CXX_RESULT)

cmake/maintainer.cmake

@@ -186,15 +186,3 @@ MACRO(ADD_WSHADOW_WARNING)
     ADD_COMPILE_OPTIONS("-Wshadow-uncaptured-local")
   ENDIF()
 ENDMACRO()
-
-# When builing with PGO, GCC 9 will report -Wmissing-profile when compiling
-# files for which it cannot find profile data. It is valid to disable
-# this warning for files we are not currently interested in profiling.
-MACRO(DISABLE_MISSING_PROFILE_WARNING)
-  IF(FPROFILE_USE)
-    MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_WARN_FLAG)
-    IF(HAS_WARN_FLAG)
-      STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
-    ENDIF()
-  ENDIF()
-ENDMACRO()

extra/libfido2/CMakeLists.txt

@@ -347,6 +347,14 @@ SET(CBOR_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/${CBOR_BUNDLE_SRC_PATH}
 
 SET(CBOR_LIBRARY_DIRS ${CMAKE_BINARY_DIR}/${CBOR_BUNDLE_SRC_PATH})
 
+DISABLE_MISSING_PROFILE_WARNING()
+IF(FPROFILE_USE)
+  MY_CHECK_CXX_COMPILER_WARNING("-Wcoverage-mismatch" HAS_WARN_FLAG)
+  IF(HAS_WARN_FLAG)
+    STRING_APPEND(CMAKE_C_FLAGS " ${HAS_WARN_FLAG}")
+  ENDIF()
+ENDIF()
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
 include_directories(${CBOR_INCLUDE_DIRS})
 

extra/libfido2/openbsd-compat/openbsd-compat.h

@@ -68,6 +68,7 @@ int timingsafe_bcmp(const void *, const void *, size_t);
 #include <readpassphrase.h>
 #endif
 
+#include <openssl/opensslv.h>
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 #define EVP_PKEY_get0_EC_KEY(x) ((x)->pkey.ec)
 #define EVP_PKEY_get0_RSA(x) ((x)->pkey.rsa)

libmysql/authentication_fido/CMakeLists.txt

@@ -41,6 +41,8 @@ INCLUDE(CheckIncludeFiles)
 
 MY_INCLUDE_SYSTEM_DIRECTORIES(FIDO)
 
+DISABLE_MISSING_PROFILE_WARNING()
+
 MYSQL_ADD_PLUGIN(authentication_fido_client
   fido_registration.cc
   fido_assertion.cc