Changeset c7021d9

Timestamp:

05/29/14 16:00:48 (7 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

9b42f3e

Parents:

5809145

Message:

Added m4 macros to check for gcc compiler attributes

Instead of relying on GNUC, we now individually check
whether each attribute is supported by the C compiler and set
preprocessor macros accordingly.

Removed similar attribute definitions from wandio.h, as these are
not used at all by libwandio.

Files:

• configure.in (modified) (1 diff)
• lib/libtrace.h.in (modified) (1 diff)
• libwandio/wandio.h (modified) (1 diff)
• m4/attributes.m4 (added)

configure.in

@@ -111 +111 @@
 gl_VISIBILITY
 
+gcc_PACKED
+gcc_DEPRECATED
+gcc_UNUSED
+gcc_PURE
+gcc_FORMAT
         
 # Check for libtool

lib/libtrace.h.in

@@ -153 +153 @@
 #endif
 
-/* Function does not depend on anything but its
- * parameters, used to hint gcc's optimisations
- *
- * TODO: Find a way to check for these that is not gcc-specific
- */
-#if __GNUC__ >= 3 
+/* Ensure these gcc optimisation attributes are defined consistently, 
+ * without requiring users to need to have access to the config.h 
+ * generated by running configure.
+ */
+
+#define LT_USE_PACKED @HAVE_ATTRIBUTE_PACKED@
+#define LT_USE_UNUSED @HAVE_ATTRIBUTE_UNUSED@
+#define LT_USE_DEPRECATED @HAVE_ATTRIBUTE_DEPRECATED@
+#define LT_USE_PURE @HAVE_ATTRIBUTE_PURE@
+#define LT_USE_PRINTF @HAVE_ATTRIBUTE_FORMAT@
+
+#if LT_USE_PACKED
+#  define PACKED __attribute__((packed))
+#else
+#  define PACKED
+#endif
+
+#if LT_USE_UNUSED
+#  define UNUSED __attribute__((unused))
+#else
+#  define UNUSED
+#endif
+
+#if LT_USE_DEPRECATED
 #  define DEPRECATED __attribute__((deprecated))
-#  define SIMPLE_FUNCTION __attribute__((pure))
-#  define UNUSED __attribute__((unused))
-#  define PACKED __attribute__((packed))
-#  define PRINTF(formatpos,argpos) __attribute__((format(printf,formatpos,argpos)))
 #else
 #  define DEPRECATED
+#endif
+
+#if LT_USE_PURE
+#  define SIMPLE_FUNCTION __attribute__((pure))
+#else
 #  define SIMPLE_FUNCTION
-#  define UNUSED
-#  define PACKED 
-#  define PRINTF(formatpos,argpos) 
+#endif
+
+#if LT_USE_PRINTF
+#  define PRINTF(formatpos, argpos) __attribute__((format(printf,formatpos, argpos)))
+#else
+#  define PRINTF(formatpos, argpos)
 #endif
 

libwandio/wandio.h

@@ -51 +51 @@
 
 // TODO: Use a proper check for these attribute rather than gcc version check
-#if __GNUC__ >= 3 
-#  define DEPRECATED __attribute__((deprecated))
-#  define SIMPLE_FUNCTION __attribute__((pure))
-#  define UNUSED __attribute__((unused))
-#  define PACKED __attribute__((packed))
-#  define PRINTF(formatpos,argpos) __attribute__((format(printf,formatpos,argpos)))
-#else
-#  define DEPRECATED
-#  define SIMPLE_FUNCTION
-#  define UNUSED
-#  define PACKED 
-#  define PRINTF(formatpos,argpos) 
-#endif
-
 
 /** @file