1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
From 8845a786598f1d9e83aa1b7d2966b0d1eb765ba0 Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Tue, 13 Dec 2016 10:14:31 -0700
Subject: [PATCH 1/3] Apply boost-1.62.0-no-forced-flags.patch
Upstream-Status: Inappropriate
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
libs/log/build/Jamfile.v2 | 4 ++--
libs/log/config/x86-ext/Jamfile.jam | 16 ++++++++--------
libs/log/src/dump_avx2.cpp | 4 ++++
libs/log/src/dump_ssse3.cpp | 4 ++++
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/libs/log/build/Jamfile.v2 b/libs/log/build/Jamfile.v2
index 4abbdbc..b3016fc 100644
--- a/libs/log/build/Jamfile.v2
+++ b/libs/log/build/Jamfile.v2
@@ -373,7 +373,7 @@ rule avx2-targets-cond ( properties * )
}
else if <toolset>clang in $(properties)
{
- result = <cxxflags>"-mavx -mavx2" ;
+ result = <cxxflags> ;
}
else if <toolset>intel in $(properties)
{
@@ -383,7 +383,7 @@ rule avx2-targets-cond ( properties * )
}
else
{
- result = <cxxflags>"-xCORE-AVX2 -fabi-version=0" ;
+ result = <cxxflags>"-fabi-version=0" ;
}
}
else if <toolset>msvc in $(properties)
diff --git a/libs/log/config/x86-ext/Jamfile.jam b/libs/log/config/x86-ext/Jamfile.jam
index 0e9695a..dcc394d 100644
--- a/libs/log/config/x86-ext/Jamfile.jam
+++ b/libs/log/config/x86-ext/Jamfile.jam
@@ -15,19 +15,19 @@ project /boost/log/x86-extensions
obj ssse3 : ssse3.cpp
:
- <toolset>gcc:<cxxflags>"-msse -msse2 -msse3 -mssse3"
- <toolset>clang:<cxxflags>"-msse -msse2 -msse3 -mssse3"
- <toolset>intel-linux:<cxxflags>"-xSSSE3"
- <toolset>intel-darwin:<cxxflags>"-xSSSE3"
+ <toolset>gcc:<cxxflags>
+ <toolset>clang:<cxxflags>
+ <toolset>intel-linux:<cxxflags>
+ <toolset>intel-darwin:<cxxflags>
<toolset>intel-win:<cxxflags>"/QxSSSE3"
;
obj avx2 : avx2.cpp
:
- <toolset>gcc:<cxxflags>"-mavx -mavx2 -fabi-version=0"
- <toolset>clang:<cxxflags>"-mavx -mavx2"
- <toolset>intel-linux:<cxxflags>"-xCORE-AVX2 -fabi-version=0"
- <toolset>intel-darwin:<cxxflags>"-xCORE-AVX2 -fabi-version=0"
+ <toolset>gcc:<cxxflags>"-fabi-version=0"
+ <toolset>clang:<cxxflags>
+ <toolset>intel-linux:<cxxflags>"-fabi-version=0"
+ <toolset>intel-darwin:<cxxflags>"-fabi-version=0"
<toolset>intel-win:<cxxflags>"/arch:CORE-AVX2"
<toolset>msvc:<cxxflags>"/arch:AVX"
;
diff --git a/libs/log/src/dump_avx2.cpp b/libs/log/src/dump_avx2.cpp
index 4ab1250..610fc6d 100644
--- a/libs/log/src/dump_avx2.cpp
+++ b/libs/log/src/dump_avx2.cpp
@@ -22,6 +22,10 @@
#include <boost/cstdint.hpp>
#include <boost/log/detail/header.hpp>
+#if !defined(__AVX2__)
+#error "AVX2 Unsupported!"
+#endif
+
#if defined(__x86_64) || defined(__x86_64__) || \
defined(__amd64__) || defined(__amd64) || \
defined(_M_X64)
diff --git a/libs/log/src/dump_ssse3.cpp b/libs/log/src/dump_ssse3.cpp
index 1325b49..60d4112 100644
--- a/libs/log/src/dump_ssse3.cpp
+++ b/libs/log/src/dump_ssse3.cpp
@@ -22,6 +22,10 @@
#include <boost/cstdint.hpp>
#include <boost/log/detail/header.hpp>
+#if !defined(__SSSE3__)
+#error "SSSE3 Unsupported!"
+#endif
+
#if defined(__x86_64) || defined(__x86_64__) || \
defined(__amd64__) || defined(__amd64) || \
defined(_M_X64)
--
2.8.0
|
