acinclude: Add vector defines to sparse.

By adding compiler default flags for vector instructions to
cgcc we'll be able to check the same sources that we're building.
Also, this will allow to avoid re-defining these flags and
types specifically for "sparse" includes.

"sparse" headers "bmi2intrin.h" and "emmintrin.h" dropped as
not needed anymore.

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Acked-by: Ben Pfaff <blp@ovn.org>

3 files changed, 0 insertions, 54 deletions

diff --git a/include/sparse/automake.mk b/include/sparse/automake.mk
index 8d96d0346..274d52577 100644
--- a/include/sparse/automake.mk
+++ b/include/sparse/automake.mk
@@ -11,8 +11,6 @@ noinst_HEADERS += \
         include/sparse/arpa/inet.h \
         include/sparse/bits/floatn.h \
         include/sparse/assert.h \
-        include/sparse/bmi2intrin.h \
-        include/sparse/emmintrin.h \
         include/sparse/math.h \
         include/sparse/netinet/in.h \
         include/sparse/netinet/ip6.h \
diff --git a/include/sparse/bmi2intrin.h b/include/sparse/bmi2intrin.h
deleted file mode 100644
index 3ee37bb72..000000000
--- a/include/sparse/bmi2intrin.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (c) 2015 Nicira, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __CHECKER__
-#error "Use this header only with sparse.  It is not a correct implementation."
-#endif
-
-/* Sparse doesn't know the __int128 type used by GCC 4.9 *intrin.h headers.
- * We cannot use a typedef because the type is used with a qualifier
- * ('unsigned __int128') */
-#define __int128 int
-#include_next <bmi2intrin.h>
-#undef __int128
diff --git a/include/sparse/emmintrin.h b/include/sparse/emmintrin.h
deleted file mode 100644
index 3810f55a2..000000000
--- a/include/sparse/emmintrin.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (c) 2015 Nicira, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __CHECKER__
-#error "Use this header only with sparse.  It is not a correct implementation."
-#endif
-
-/* GCC 4.8 *intrin.h headers do not work if these are not defined */
-#define __SSE2__
-#define __SSE__
-#define __MMX__
-#include_next <emmintrin.h>
-#undef __MMX__
-#undef __SSE__
-#undef __SSE2__