diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-06-10 14:47:09 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-10 14:51:26 +0000 |
| commit | fcb019acb8932855d51b0facc45aa3e855fe8524 (patch) | |
| tree | 7ca38756f1338784d8f184bda956716a40738698 /wsutil | |
| parent | 94dcbfd9ac3af4c9d878f4653db4f2a7f8f1158a (diff) | |
Change HAVE_SSE42 to HAVE_SSE4_2 add $(SIMD_FLAGS)
Add autotools macros to distribution
Call AX_EXT to define HAVE_SSE4_2
Change-Id: I9ff085d923dfafb32510cdd14290e74a2aaea302
Reviewed-on: https://code.wireshark.org/review/2110
Tested-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/Makefile.am | 2 | ||||
| -rw-r--r-- | wsutil/ws_mempbrk.c | 6 | ||||
| -rw-r--r-- | wsutil/ws_mempbrk.h | 2 | ||||
| -rw-r--r-- | wsutil/ws_mempbrk_sse42.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 98273637f0..868f9d79a8 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -83,7 +83,7 @@ libwsutil_la_SOURCES = \ libwsutil_sse42_la_SOURCES = \ ws_mempbrk_sse42.c -libwsutil_sse42_la_CFLAGS = $(AM_CFLAGS) -msse4.2 +libwsutil_sse42_la_CFLAGS = $(AM_CFLAGS) $(SIMD_FLAGS) EXTRA_libwsutil_la_SOURCES= \ inet_aton.c \ diff --git a/wsutil/ws_mempbrk.c b/wsutil/ws_mempbrk.c index c167166689..c24cedb404 100644 --- a/wsutil/ws_mempbrk.c +++ b/wsutil/ws_mempbrk.c @@ -23,7 +23,7 @@ #include <glib.h> #include "ws_symbol_export.h" -#ifdef HAVE_SSE42 +#ifdef HAVE_SSE4_2 #include "ws_cpuid.h" #endif #include "ws_mempbrk.h" @@ -50,13 +50,13 @@ _ws_mempbrk(const guint8* haystack, size_t haystacklen, const guint8 *needles) WS_DLL_PUBLIC const guint8 * ws_mempbrk(const guint8* haystack, size_t haystacklen, const guint8 *needles) { -#ifdef HAVE_SSE42 +#ifdef HAVE_SSE4_2 static int have_sse42 = -1; #endif if (*needles == 0) return NULL; -#ifdef HAVE_SSE42 +#ifdef HAVE_SSE4_2 if G_UNLIKELY(have_sse42 < 0) have_sse42 = ws_cpuid_sse42(); diff --git a/wsutil/ws_mempbrk.h b/wsutil/ws_mempbrk.h index 5f515321fd..72f37d574a 100644 --- a/wsutil/ws_mempbrk.h +++ b/wsutil/ws_mempbrk.h @@ -26,7 +26,7 @@ WS_DLL_PUBLIC const guint8 *ws_mempbrk(const guint8* haystack, size_t haystacklen, const guint8 *needles); -#ifdef HAVE_SSE42 +#ifdef HAVE_SSE4_2 const char *_ws_mempbrk_sse42(const char* haystack, size_t haystacklen, const char *needles); #endif diff --git a/wsutil/ws_mempbrk_sse42.c b/wsutil/ws_mempbrk_sse42.c index ac9ecd281c..07c6504f55 100644 --- a/wsutil/ws_mempbrk_sse42.c +++ b/wsutil/ws_mempbrk_sse42.c @@ -20,7 +20,7 @@ #include "config.h" -#ifdef HAVE_SSE42 +#ifdef HAVE_SSE4_2 #include <glib.h> @@ -191,7 +191,7 @@ _ws_mempbrk_sse42(const char *s, size_t slen, const char *a) return _ws_mempbrk(aligned, slen, a); } -#endif /* HAVE_SSE42 */ +#endif /* HAVE_SSE4_2 */ /* * Editor modelines * |