diff --git a/Modules/Platform/GNU-Initialize.cmake b/Modules/Platform/GNU-Initialize.cmake
new file mode 100644
index 0000000000..37875ab429
--- /dev/null
+++ b/Modules/Platform/GNU-Initialize.cmake
@@ -0,0 +1 @@
+set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*")
diff --git a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake
index fac29a8fa4..188135bd77 100644
--- a/Modules/Platform/GNU.cmake
+++ b/Modules/Platform/GNU.cmake
@@ -35,6 +35,4 @@ else()
   endif()
 endif()
 
-set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*")
-
 include(Platform/UnixPaths)
diff --git a/Modules/Platform/QNX-Initialize.cmake b/Modules/Platform/QNX-Initialize.cmake
new file mode 100644
index 0000000000..21a2cdde7b
--- /dev/null
+++ b/Modules/Platform/QNX-Initialize.cmake
@@ -0,0 +1,2 @@
+include(Platform/GNU-Initialize)
+unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)
diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake
index ebc4609a37..f0933141e9 100644
--- a/Modules/Platform/QNX.cmake
+++ b/Modules/Platform/QNX.cmake
@@ -1,7 +1,6 @@
 set(QNXNTO 1)
 
 include(Platform/GNU)
-unset(CMAKE_LIBRARY_ARCHITECTURE_REGEX)
 
 set(CMAKE_DL_LIBS "")
 
diff --git a/Modules/Platform/kFreeBSD-Initialize.cmake b/Modules/Platform/kFreeBSD-Initialize.cmake
new file mode 100644
index 0000000000..f5d7b0a0c1
--- /dev/null
+++ b/Modules/Platform/kFreeBSD-Initialize.cmake
@@ -0,0 +1,5 @@
+# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD,
+# and should be marked as LINUX
+include(Platform/Linux-Initialize)
+
+set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*")
diff --git a/Modules/Platform/kFreeBSD.cmake b/Modules/Platform/kFreeBSD.cmake
index 09c240dc53..171c1ac17c 100644
--- a/Modules/Platform/kFreeBSD.cmake
+++ b/Modules/Platform/kFreeBSD.cmake
@@ -1,5 +1,2 @@
-# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD,
-# and should be marked as LINUX
+# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD.
 include(Platform/Linux)
-
-set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*")