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