Revert "suppress warning on GCC 7 and later"

This reverts commit a630ad73cb5dde7f8c69e86094bd4a1070ff0249.

diff --git a/3rdparty/openexr/CMakeLists.txt b/3rdparty/openexr/CMakeLists.txt
index 1fbfa4f8575e33e5218ec4519ff0b1bb9f298a6f..88f60b23c01495b78f0301523701b53d076584e5 100644 (file)
--- a/3rdparty/openexr/CMakeLists.txt
+++ b/3rdparty/openexr/CMakeLists.txt
@@ -110,10 +110,6 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused -Wsign-compare -Wundef -W
                                      -Wreorder
                                      -Wunused-result
 )
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0)
   ocv_warnings_disable(CMAKE_CXX_FLAGS -Wclass-memaccess)
 endif()

diff --git a/3rdparty/protobuf/CMakeLists.txt b/3rdparty/protobuf/CMakeLists.txt
index f8372dc1ada16d6b2a7e42279e87bb8860440902..f249d2dcc39f1e0bfe41004598176bcdf5277363 100644 (file)
--- a/3rdparty/protobuf/CMakeLists.txt
+++ b/3rdparty/protobuf/CMakeLists.txt
@@ -25,10 +25,6 @@ else()
                                        -Warray-bounds  # GCC 9+
   )
 endif()
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 if(CV_ICC)
   ocv_warnings_disable(CMAKE_CXX_FLAGS
       -wd265 -wd858 -wd873 -wd2196

diff --git a/modules/calib3d/CMakeLists.txt b/modules/calib3d/CMakeLists.txt
index 1c31ad190320b301075d575c58dd70345ab0b0bf..a38fdf18d8066c8c7638b874c4d55d383fe3affe 100644 (file)
--- a/modules/calib3d/CMakeLists.txt
+++ b/modules/calib3d/CMakeLists.txt
@@ -3,10 +3,6 @@ set(debug_modules "")
 if(DEBUG_opencv_calib3d)
   list(APPEND debug_modules opencv_highgui)
 endif()
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 ocv_define_module(calib3d opencv_imgproc opencv_features2d ${debug_modules}
     WRAP java python js
 )

diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
index 568a8afef1d9a0811af924c461fb25e2cfba06e9..beba9f804ee141dd056e8684bcc6b54ac9b4a253 100644 (file)
--- a/modules/core/CMakeLists.txt
+++ b/modules/core/CMakeLists.txt
@@ -38,10 +38,6 @@ endif()
 if(HAVE_CUDA)
   ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wenum-compare -Wunused-function -Wshadow)
 endif()
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 
 if(CV_TRACE AND HAVE_ITT)
   add_definitions(-DOPENCV_WITH_ITT=1)

diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
index 680be360ba943e8ba9f72ca08f74892c945659a8..40193563927effd0a081893258f1b4fd19b68969 100644 (file)
--- a/modules/dnn/CMakeLists.txt
+++ b/modules/dnn/CMakeLists.txt
@@ -35,10 +35,6 @@ else()
                                        -Wunused-parameter -Wsign-compare
   )
 endif()
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 if(HAVE_CUDA)
   ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
 endif()

diff --git a/modules/features2d/CMakeLists.txt b/modules/features2d/CMakeLists.txt
index 28af58565b1557b7ee99ef7ca05c42270d81a523..1d29320a14b6665afa7093ddef52fb39a924e035 100644 (file)
--- a/modules/features2d/CMakeLists.txt
+++ b/modules/features2d/CMakeLists.txt
@@ -1,10 +1,6 @@
 set(the_description "2D Features Framework")
 
 ocv_add_dispatched_file(sift SSE4_1 AVX2 AVX512_SKX)
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 
 set(debug_modules "")
 if(DEBUG_opencv_features2d)

diff --git a/modules/flann/CMakeLists.txt b/modules/flann/CMakeLists.txt
index 5935f679d47ab04e2a4302c015fddb17af4d438e..78e041129b942881a3f6b97dbacdfed7466db468 100644 (file)
--- a/modules/flann/CMakeLists.txt
+++ b/modules/flann/CMakeLists.txt
@@ -1,6 +1,2 @@
 set(the_description "Clustering and Search in Multi-Dimensional Spaces")
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 ocv_define_module(flann opencv_core WRAP python)

diff --git a/modules/imgproc/CMakeLists.txt b/modules/imgproc/CMakeLists.txt
index 5787ec502c48449cb1373fac7992174e0aba57b2..3b4548248100d6ac89098208f2b64ba862b7df85 100644 (file)
--- a/modules/imgproc/CMakeLists.txt
+++ b/modules/imgproc/CMakeLists.txt
@@ -12,10 +12,6 @@ ocv_add_dispatched_file(smooth SSE2 SSE4_1 AVX2)
 ocv_add_dispatched_file(sumpixels SSE2 AVX2 AVX512_SKX)
 ocv_add_dispatched_file(undistort SSE2 AVX2)
 ocv_define_module(imgproc opencv_core WRAP java python js)
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 
 ocv_check_environment_variables(OPENCV_IPP_GAUSSIAN_BLUR)
 option(OPENCV_IPP_GAUSSIAN_BLUR "Enable IPP optimizations for GaussianBlur (+8Mb in binary size)" OFF)

diff --git a/modules/ml/CMakeLists.txt b/modules/ml/CMakeLists.txt
index 8b76e0c8ade8c19672048afa4b57b4eef24128e5..1b64cc4f17b6989c3d149ee3b51e7283facfb7cd 100644 (file)
--- a/modules/ml/CMakeLists.txt
+++ b/modules/ml/CMakeLists.txt
@@ -1,6 +1,2 @@
 set(the_description "Machine Learning")
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 ocv_define_module(ml opencv_core WRAP java python)

diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt
index 34b77eab6b3edf92d1f195bf7c275925c0434c24..414e5780999a8e97c8b8df1db9f9617fffc6addd 100644 (file)
--- a/modules/objdetect/CMakeLists.txt
+++ b/modules/objdetect/CMakeLists.txt
@@ -1,8 +1,4 @@
 set(the_description "Object Detection")
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js)
 
 if(HAVE_QUIRC)

diff --git a/modules/shape/CMakeLists.txt b/modules/shape/CMakeLists.txt
index 209eb11f34a6b17b0878922d8e49e75e946a955e..527a0c2f71344f21d20c9b1b0f43c8451215c0b1 100644 (file)
--- a/modules/shape/CMakeLists.txt
+++ b/modules/shape/CMakeLists.txt
@@ -1,6 +1,2 @@
 set(the_description "Shape descriptors and matchers")
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 ocv_define_module(shape opencv_core opencv_imgproc opencv_video WRAP python)

diff --git a/modules/stitching/CMakeLists.txt b/modules/stitching/CMakeLists.txt
index 7ea34a1608504de4e3aa441208f0a5de3c843d61..44f35eb59b2449e243d003a81902928bef8bba55 100644 (file)
--- a/modules/stitching/CMakeLists.txt
+++ b/modules/stitching/CMakeLists.txt
@@ -3,10 +3,6 @@ set(the_description "Images stitching")
 if(HAVE_CUDA)
   ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wstrict-aliasing)
 endif()
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 
 set(STITCHING_CONTRIB_DEPS "opencv_xfeatures2d")
 if(BUILD_SHARED_LIBS AND BUILD_opencv_world AND OPENCV_WORLD_EXCLUDE_EXTRA_MODULES)

diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt
index fd6e0083332c6ed161edda9583bbc9dc0a6a5a3f..f95bed0793837df87d1bbb00f704c55a53e18c76 100644 (file)
--- a/modules/ts/CMakeLists.txt
+++ b/modules/ts/CMakeLists.txt
@@ -15,10 +15,6 @@ if(WINRT)
 endif()
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
-if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-  # suppress warnings from GCC only on 7.1 and later
-  ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-endif()
 
 ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui)
 

diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
index 8cb11c0222bd6c33988ba923a7a16583161aec38..6ae9586fd49b60945a9fce03fa54c726e1c9bccd 100644 (file)
--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
@@ -41,10 +41,6 @@ foreach(sample_filename ${cpp_samples})
       ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-override)
     endif()
   endif()
-  if(ARM AND CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-    # suppress warnings from GCC only on 7.1 and later
-    ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-psabi)
-  endif()
   set(package "cpp")
   if(sample_filename MATCHES "tutorial_code")
     set(package "tutorial")