Commit: ca176b8bf7e8457cf59ad9bfe57f62a7083e0b89 - tme (git)

Commit MetaInfo

• Revision: ca176b8bf7e8457cf59ad9bfe57f62a7083e0b89 (tree)
• Time: 2022-12-02 18:58:42
• Author: phabrics <phabrics@phab...>
• Commiter: phabrics

Log Message

Compilation fixes for clang. In particular, the ffs & rdtsc functions were different, as well as the printf format attribute.

Change Summary

• modified: configure.ac
• modified: libtme/host/x86/misc-x86.c
• modified: tme/common.h
• modified: tme/libopenvpn/buffer.h
• modified: tme/libopenvpn/error.h
• modified: tme/libopenvpn/misc.h
• modified: tme/libopenvpn/openvpn-plugin.h
• modified: tme/libopenvpn/status.h
• modified: tmesh/Makefile.am

Incremental Difference

--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ dnl POSSIBILITY OF SUCH DAMAGE.
 dnl Checks that we are given a good source directory.
 AC_PREREQ([2.68])
 m4_include(version.m4)
-AC_INIT([tme], [0.12rc9])
+AC_INIT([tme], [0.12rc10])
 AC_CONFIG_SRCDIR([ic/m68k/m68k-impl.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET
@@ -1054,6 +1054,23 @@ if test "x${misc_hosts}" = "xno"; then
     misc_hosts=
 fi
 
+if test "x${misc_hosts}" = "xx86"; then
+  AC_CHECK_FUNC_LONG(__rdtsc, [
+  unsigned long long int x;
+
+  // _mm_lfence();  // optionally wait for earlier insns to retire before reading the clock
+  x = __rdtsc();
+  // _mm_lfence();  // optionally block later instructions until rdtsc retires
+],[
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
+#include <x86intrin.h>
+#endif
+])
+fi
+
+
 dnl Configure for libtool.
 #AC_LIBLTDL_INSTALLABLE
 #AC_SUBST(INCLTDL)
@@ -1153,7 +1170,7 @@ else
   if test "x${have_clang}" = xyes; then
     CFLAGS="${CFLAGS-} -Wno-tautological-compare -Wno-sometimes-uninitialized \
     		       -Wno-sign-compare -Wno-incompatible-pointer-types \
-		       -Wno-implicit-function-declaration -Wno-\#warnings \
+		       -Wno-implicit-function-declaration \
 		       -fbracket-depth=1024"
   fi
   if test "x${have_Og}" = xyes; then

--- a/libtme/host/x86/misc-x86.c
+++ b/libtme/host/x86/misc-x86.c
@@ -38,23 +38,34 @@ _TME_RCSID("$Id: misc-x86.c,v 1.2 2009/11/08 17:21:18 fredette Exp $");
 
 /* includes: */
 #include <tme/misc.h>
+#ifdef _TME_HAVE___RDTSC
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
+#include <x86intrin.h>
+#endif
+#endif
 
-#if defined(__GNUC__) && !defined(__EMSCRIPTEN__)
+#if defined(_TME_HAVE___RDTSC) || defined(__GNUC__) && !defined(__EMSCRIPTEN__)
 
 /* this returns the cycle counter: */
 inline union tme_value64
 tme_misc_cycles(void)
 {
+  union tme_value64 value;
+
+#ifdef _TME_HAVE___RDTSC
+  value.tme_value64_uint = __rdtsc();
+#else
   unsigned long reg_a;
   unsigned long reg_d;
-  union tme_value64 value;
 
   asm("	rdtsc	\n"
       : "=a" (reg_a), "=d" (reg_d));
   value.tme_value64_uint32_lo = reg_a;
   value.tme_value64_uint32_hi = reg_d;
+#endif /* !defined(__GNUC__) */
   return (value);
 }
 #define TME_HAVE_MISC_CYCLES
-
-#endif /* !defined(__GNUC__) */
+#endif /* def _TME_HAVE___RDTSC */

--- a/tme/common.h
+++ b/tme/common.h
@@ -356,6 +356,11 @@ tme_bswap_u128(tme_uint128_t x)
 }
 #endif /* TME_HAVE_INT128_T */
 
+/* misc: */
+#ifdef __clang__
+#define ffs __builtin_ffs
+#endif
+
 /* versions: */
 #define TME_X_VERSION(current, age)	(((current) << 10) | (age))
 #define TME_X_VERSION_CURRENT(version)	((version) >> 10)

--- a/tme/libopenvpn/buffer.h
+++ b/tme/libopenvpn/buffer.h
@@ -315,7 +315,7 @@ has_digit (const unsigned char* src)
  */
 bool buf_printf (struct buffer *buf, const char *format, ...)
 #ifdef __GNUC__
-#if __USE_MINGW_ANSI_STDIO
+#if __USE_MINGW_ANSI_STDIO && !defined(__clang__)
 	__attribute__ ((format (gnu_printf, 2, 3)))
 #else
 	__attribute__ ((format (__printf__, 2, 3)))
@@ -333,7 +333,7 @@ bool buf_puts (struct buffer *buf, const char *str);
  */
 bool openvpn_snprintf(char *str, size_t size, const char *format, ...)
 #ifdef __GNUC__
-#if __USE_MINGW_ANSI_STDIO
+#if __USE_MINGW_ANSI_STDIO && !defined(__clang__)
 	__attribute__ ((format (gnu_printf, 3, 4)))
 #else
 	__attribute__ ((format (__printf__, 3, 4)))

--- a/tme/libopenvpn/error.h
+++ b/tme/libopenvpn/error.h
@@ -174,7 +174,7 @@ bool dont_mute (unsigned int flags); /* check muting filter */
 
 void x_msg (const unsigned int flags, const char *format, ...)
 #ifdef __GNUC__
-#if __USE_MINGW_ANSI_STDIO
+#if __USE_MINGW_ANSI_STDIO && !defined(__clang__)
 	__attribute__ ((format (gnu_printf, 2, 3)))
 #else
 	__attribute__ ((format (__printf__, 2, 3)))

--- a/tme/libopenvpn/misc.h
+++ b/tme/libopenvpn/misc.h
@@ -338,7 +338,7 @@ void argv_printf_arglist (struct argv *a, const char *format, const unsigned int
 
 void argv_printf (struct argv *a, const char *format, ...)
 #ifdef __GNUC__
-#if __USE_MINGW_ANSI_STDIO
+#if __USE_MINGW_ANSI_STDIO && !defined(__clang__)
 	__attribute__ ((format (gnu_printf, 2, 3)))
 #else
 	__attribute__ ((format (__printf__, 2, 3)))
@@ -348,7 +348,7 @@ void argv_printf (struct argv *a, const char *format, ...)
 
 void argv_printf_cat (struct argv *a, const char *format, ...)
 #ifdef __GNUC__
-#if __USE_MINGW_ANSI_STDIO
+#if __USE_MINGW_ANSI_STDIO && !defined(__clang__)
 	__attribute__ ((format (gnu_printf, 2, 3)))
 #else
 	__attribute__ ((format (__printf__, 2, 3)))

--- a/tme/libopenvpn/openvpn-plugin.h
+++ b/tme/libopenvpn/openvpn-plugin.h
@@ -228,7 +228,7 @@ typedef enum
 
 
 #ifdef __GNUC__
-#if __USE_MINGW_ANSI_STDIO
+#if __USE_MINGW_ANSI_STDIO && !defined(__clang__)
 #  define _ovpn_chk_fmt(a, b) __attribute__ ((format(gnu_printf, (a), (b))))
 #else
 #  define _ovpn_chk_fmt(a, b) __attribute__ ((format(__printf__, (a), (b))))

--- a/tme/libopenvpn/status.h
+++ b/tme/libopenvpn/status.h
@@ -77,7 +77,7 @@ void status_flush (struct status_output *so);
 bool status_close (struct status_output *so);
 void status_printf (struct status_output *so, const char *format, ...)
 #ifdef __GNUC__
-#if __USE_MINGW_ANSI_STDIO
+#if __USE_MINGW_ANSI_STDIO && !defined(__clang__)
 	__attribute__ ((format (gnu_printf, 2, 3)))
 #else
 	__attribute__ ((format (__printf__, 2, 3)))

--- a/tmesh/Makefile.am
+++ b/tmesh/Makefile.am
@@ -25,10 +25,10 @@ if WIN32
 if HAVE_SDL
 tmesh_LDFLAGS += -mwindows
 endif
-endif
-
+else
 install-exec-hook:
 	$(SETCAP) $(DESTDIR)$(bindir)/$(TGTPFX)tmesh$(EXEEXT)
+endif
 
 include $(top_srcdir)/tme-hosts.txt
 include $(top_srcdir)/tme-preopen.txt