8 files changed, 15 insertions, 19 deletions
diff --git a/mkspecs/common/aix/qplatformdefs.h b/mkspecs/common/aix/qplatformdefs.h
index 7bb8dfedd2..3606a2f1cb 100644
--- a/mkspecs/common/aix/qplatformdefs.h
+++ b/mkspecs/common/aix/qplatformdefs.h
@@ -75,9 +75,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
 
 // Only AIX 4.3 and better support 64-bit
 
diff --git a/mkspecs/common/android/qplatformdefs.h b/mkspecs/common/android/qplatformdefs.h
index 048eb47c6c..23180c5d3c 100644
--- a/mkspecs/common/android/qplatformdefs.h
+++ b/mkspecs/common/android/qplatformdefs.h
@@ -70,10 +70,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-
 #ifndef _GNU_SOURCE
 #  define _GNU_SOURCE
 #endif
diff --git a/mkspecs/common/bsd/qplatformdefs.h b/mkspecs/common/bsd/qplatformdefs.h
index 6c3a00b194..8e976d3290 100644
--- a/mkspecs/common/bsd/qplatformdefs.h
+++ b/mkspecs/common/bsd/qplatformdefs.h
@@ -70,9 +70,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
 
 #include "../posix/qplatformdefs.h"
 
diff --git a/mkspecs/common/gcc-base-unix.conf b/mkspecs/common/gcc-base-unix.conf
index 2d63877dc9..700f228c36 100644
--- a/mkspecs/common/gcc-base-unix.conf
+++ b/mkspecs/common/gcc-base-unix.conf
@@ -19,6 +19,7 @@ QMAKE_LFLAGS_THREAD    +=
 QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
 QMAKE_LFLAGS_RPATHLINK  = -Wl,-rpath-link,
 QMAKE_LFLAGS_NEW_DTAGS  = -Wl,--enable-new-dtags
+QMAKE_LFLAGS_GDB_INDEX  = -Wl,--gdb-index
 QMAKE_LFLAGS_USE_GOLD   = -fuse-ld=gold
 
 # -Bsymbolic-functions (ld) support
diff --git a/mkspecs/common/integrity/qplatformdefs.h b/mkspecs/common/integrity/qplatformdefs.h
index 7039318f25..f0b4dea8e1 100644
--- a/mkspecs/common/integrity/qplatformdefs.h
+++ b/mkspecs/common/integrity/qplatformdefs.h
@@ -68,9 +68,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
 
 // for htonl
 #include <arpa/inet.h>
diff --git a/mkspecs/common/mac/qplatformdefs.h b/mkspecs/common/mac/qplatformdefs.h
index 5cacd5a749..1927587097 100644
--- a/mkspecs/common/mac/qplatformdefs.h
+++ b/mkspecs/common/mac/qplatformdefs.h
@@ -70,9 +70,6 @@
 #include <sys/wait.h>
 #define __APPLE_USE_RFC_3542
 #include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
 
 #include "../posix/qplatformdefs.h"
 
diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf
index 395c0535a9..9f5da91806 100644
--- a/mkspecs/common/msvc-version.conf
+++ b/mkspecs/common/msvc-version.conf
@@ -82,6 +82,20 @@ greaterThan(QMAKE_MSC_VER, 1909) {
     MSVC_VER            = 15.0
     COMPAT_MKSPEC       = win32-msvc2017
     QMAKE_CXXFLAGS     += -Zc:referenceBinding
+
+    # Only Visual Studio 2017 version 15.3 / Visual C++ 19.11 & up have support
+    # for AVX-512. We enable the switches anyway and let configure check if they
+    # work.
+    QMAKE_CFLAGS_AVX512F   = -arch:AVX512
+    QMAKE_CFLAGS_AVX512ER  = -arch:AVX512
+    QMAKE_CFLAGS_AVX512CD  = -arch:AVX512
+    QMAKE_CFLAGS_AVX512PF  = -arch:AVX512
+    QMAKE_CFLAGS_AVX512DQ  = -arch:AVX512
+    QMAKE_CFLAGS_AVX512BW  = -arch:AVX512
+    QMAKE_CFLAGS_AVX512VL  = -arch:AVX512
+    QMAKE_CFLAGS_AVX512IFMA = -arch:AVX512
+    QMAKE_CFLAGS_AVX512VBMI = -arch:AVX512
+
     # For now permissive fails as soon as UWP API comes into play. In qtbase this
     # API is used in direct2d, but also in multimedia, positioning and sensors.
     # We can try again with a later version of Visual Studio.
diff --git a/mkspecs/common/qnx/qplatformdefs.h b/mkspecs/common/qnx/qplatformdefs.h
index 72fc92738c..b30cd96002 100644
--- a/mkspecs/common/qnx/qplatformdefs.h
+++ b/mkspecs/common/qnx/qplatformdefs.h
@@ -73,9 +73,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
 
 // for htonl
 #include <arpa/inet.h>