Merge pull request numpy#4842 from cournape/fix_intrinsics_detection

juliantaylor · juliantaylor · commit 251acc007a07 · 2014-07-07T17:16:16.000+02:00
fix unknown attribute warnings under clang
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -176,12 +176,11 @@ def check_funcs(funcs_name):
             moredefs.append((fname2def(f), 1))
 
     for dec, fn in OPTIONAL_FUNCTION_ATTRIBUTES:
-        if config.check_func(fn, decl='int %s %s(void *);' % (dec, fn),
-                             call=False):
+        if config.check_gcc_function_attribute(dec, fn):
             moredefs.append((fname2def(fn), 1))
 
     for fn in OPTIONAL_VARIABLE_ATTRIBUTES:
-        if config.check_func(fn, decl='int %s a;' % (fn), call=False):
+        if config.check_gcc_variable_attribute(fn):
             m = fn.replace("(", "_").replace(")", "_")
             moredefs.append((fname2def(m), 1))
 
diff --git a/numpy/distutils/command/autodist.py b/numpy/distutils/command/autodist.py
@@ -41,3 +41,37 @@ def check_compiler_gcc4(cmd):
 }
 """
     return cmd.try_compile(body, None, None)
+
+
+def check_gcc_function_attribute(cmd, attribute, name):
+    """Return True if the given function attribute is supported."""
+    cmd._check_compiler()
+    body = """
+#pragma GCC diagnostic error "-Wattributes"
+#pragma clang diagnostic error "-Wattributes"
+
+int %s %s(void*);
+
+int
+main()
+{
+}
+""" % (attribute, name)
+    return cmd.try_compile(body, None, None) != 0
+
+def check_gcc_variable_attribute(cmd, attribute):
+    """Return True if the given variable attribute is supported."""
+    cmd._check_compiler()
+    body = """
+#pragma GCC diagnostic error "-Wattributes"
+#pragma clang diagnostic error "-Wattributes"
+
+int %s foo;
+
+int
+main()
+{
+    return 0;
+}
+""" % (attribute, )
+    return cmd.try_compile(body, None, None) != 0
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
@@ -16,7 +16,10 @@
 import distutils
 from numpy.distutils.exec_command import exec_command
 from numpy.distutils.mingw32ccompiler import generate_manifest
-from numpy.distutils.command.autodist import check_inline, check_compiler_gcc4
+from numpy.distutils.command.autodist import (check_gcc_function_attribute,
+                                              check_gcc_variable_attribute,
+                                              check_inline,
+                                              check_compiler_gcc4)
 from numpy.distutils.compat import get_exception
 
 LANG_EXT['f77'] = '.f'
@@ -402,6 +405,12 @@ def check_compiler_gcc4(self):
         """Return True if the C compiler is gcc >= 4."""
         return check_compiler_gcc4(self)
 
+    def check_gcc_function_attribute(self, attribute, name):
+        return check_gcc_function_attribute(self, attribute, name)
+
+    def check_gcc_variable_attribute(self, attribute):
+        return check_gcc_variable_attribute(self, attribute)
+
     def get_output(self, body, headers=None, include_dirs=None,
                    libraries=None, library_dirs=None,
                    lang="c", use_tee=None):
