diff options
| author | Jakub Zawadzki <darkjames@darkjames.pl> | 2014-06-12 23:42:18 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-17 23:58:52 +0000 |
| commit | 666403057122b28d295ac288a897043bf395d86b (patch) | |
| tree | f83a6aa85a971cb54ea8339a0d1b67885259ae60 /wsutil/Makefile.am | |
| parent | 91f58d6714c5ca4b60d758be86cda2d32e6a80ba (diff) | |
| download | wireshark-666403057122b28d295ac288a897043bf395d86b.tar.gz wireshark-666403057122b28d295ac288a897043bf395d86b.tar.bz2 wireshark-666403057122b28d295ac288a897043bf395d86b.zip | |
Rewrite check for ws_mempbrk_sse42.c compilation
- check only for -msse4.2
- check if there's nmmintrin.h header
- don't check if current CPU support -msse4.2 (fix cross compilation)
Change-Id: Iba8d291fdf5602937ab540a69b7608a81427ad25
Reviewed-on: https://code.wireshark.org/review/2189
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wsutil/Makefile.am')
| -rw-r--r-- | wsutil/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index b9ab14bc47..1f3acbc4fc 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -52,9 +52,9 @@ if NEED_STRPTIME_LO wsutil_optional_objects += @STRPTIME_LO@ endif -## if SSE42_SUPPORTED +if SSE42_SUPPORTED wsutil_optional_objects += libwsutil_sse42.la -## endif +endif include ../Makefile.am.inc @@ -83,7 +83,7 @@ libwsutil_la_SOURCES = \ libwsutil_sse42_la_SOURCES = \ ws_mempbrk_sse42.c -libwsutil_sse42_la_CFLAGS = $(AM_CFLAGS) $(SIMD_FLAGS) +libwsutil_sse42_la_CFLAGS = $(AM_CFLAGS) -msse4.2 EXTRA_libwsutil_la_SOURCES= \ inet_aton.c \ |