aboutsummaryrefslogtreecommitdiff
path: root/paludis/util
diff options
context:
space:
mode:
authorAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-01-14 12:01:03 -0800
committerAvatar Saleem Abdulrasool <compnerd@compnerd.org> 2016-01-17 10:04:48 -0800
commit02f339e87ab1a864a967a7b7de05bd658f9dbedf (patch)
tree608a875d2daca5f90d9b8fe3988232c9b3a2bbfc /paludis/util
parentd34bba6a8a9457264a94326db3fdf84e69000dc9 (diff)
downloadpaludis-02f339e87ab1a864a967a7b7de05bd658f9dbedf.tar.gz
paludis-02f339e87ab1a864a967a7b7de05bd658f9dbedf.tar.xz
build: unconditionally use visibility flags
Remove the last remnants of icc support as the current released versions do not support C++11 and we intend to use clang as the alternate compiler. This cleans up the compile flags to remove the now obsoleted definition (-DPALUDIS_USE_VISIBILITY), the unnecessary compile time checks, and the handling for ICC in the macros.
Diffstat (limited to 'paludis/util')
-rw-r--r--paludis/util/Makefile.am.m42
-rw-r--r--paludis/util/attributes.hh25
2 files changed, 9 insertions, 18 deletions
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index c527cb1cc..fc41c0b05 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -48,7 +48,7 @@ ifelse(`$2', `testscript', `addtestscript(`$1')', `')')dnl
define(`add', `addthis(`$1',`$2')addthis(`$1',`$3')addthis(`$1',`$4')dnl
addthis(`$1',`$5')addthis(`$1',`$6')addthis(`$1',`$7')addthis(`$1',`$8')')dnl
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@ @PALUDIS_CXXFLAGS_VISIBILITY@
+AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@
include(`paludis/util/files.m4')
diff --git a/paludis/util/attributes.hh b/paludis/util/attributes.hh
index fa0f0302d..270fbc393 100644
--- a/paludis/util/attributes.hh
+++ b/paludis/util/attributes.hh
@@ -31,7 +31,7 @@
*/
/** \def PALUDIS_ATTRIBUTE
- * If we're using a recent GCC or ICC, expands to __attribute__, otherwise
+ * If we're using a GNU compatible compiler, expands to __attribute__, otherwise
* discards its arguments.
*
* \ingroup g_utils
@@ -49,27 +49,18 @@
* \ingroup g_utils
*/
-#if (defined(__GNUC__) && ! defined(DOXYGEN))
-# if defined(__ICC)
-# define PALUDIS_ATTRIBUTE(x)
-# else
-# if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-# define PALUDIS_ATTRIBUTE(x) __attribute__(x)
-# define PALUDIS_CAN_USE_ATTRIBUTE 1
-# else
-# define PALUDIS_ATTRIBUTE(x)
-# endif
-# endif
-#else
+#if defined(DOXYGEN)
# define PALUDIS_ATTRIBUTE(x)
+#else
+# define PALUDIS_ATTRIBUTE(x) __attribute__(x)
#endif
-#if (defined(PALUDIS_ENABLE_VISIBILITY) && ! defined(DOXYGEN))
-# define PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((visibility("default")))
-# define PALUDIS_HIDDEN PALUDIS_ATTRIBUTE((visibility("hidden")))
-#else
+#if defined(DOXYGEN)
# define PALUDIS_VISIBLE
# define PALUDIS_HIDDEN
+#else
+# define PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((visibility("default")))
+# define PALUDIS_HIDDEN PALUDIS_ATTRIBUTE((visibility("hidden")))
#endif
#define PALUDIS_TLS static __thread