diff options
author | Ben Pfaff <blp@ovn.org> | 2018-05-14 10:06:20 -0700 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2018-05-14 16:13:14 -0700 |
commit | 07aec2ac19930b05370d813ff5a44e20c2908498 (patch) | |
tree | 734b955643ea78b8304f54790f528a5f03b4de44 /include | |
parent | c9756229ed818e4c354d8bfd7c65c656f92fc98b (diff) | |
download | openvswitch-07aec2ac19930b05370d813ff5a44e20c2908498.tar.gz |
sparse: Support newer GCC/glibc versions.
This fixes some "sparse" errors I encountered after upgrading.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/sparse/automake.mk | 2 | ||||
-rw-r--r-- | include/sparse/bits/floatn.h | 32 | ||||
-rw-r--r-- | include/sparse/sys/sysmacros.h | 32 |
3 files changed, 66 insertions, 0 deletions
diff --git a/include/sparse/automake.mk b/include/sparse/automake.mk index e9b42f52c..ce445fab1 100644 --- a/include/sparse/automake.mk +++ b/include/sparse/automake.mk @@ -1,5 +1,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 \ @@ -13,5 +14,6 @@ noinst_HEADERS += \ include/sparse/rte_memcpy.h \ include/sparse/rte_vect.h \ include/sparse/sys/socket.h \ + include/sparse/sys/sysmacros.h \ include/sparse/sys/types.h \ include/sparse/sys/wait.h diff --git a/include/sparse/bits/floatn.h b/include/sparse/bits/floatn.h new file mode 100644 index 000000000..a247331eb --- /dev/null +++ b/include/sparse/bits/floatn.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2018 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 + +#ifndef __BITS_FLOATN_SPARSE +#define __BITS_FLOATN_SPARSE 1 + +/* "sparse" claims to be a recent version of GCC but doesn't support IEEE 754 + * binary128, so we define macros to make that clear. */ + +#define __HAVE_FLOAT128 0 +#define __HAVE_FLOAT64X 0 + +#include <bits/floatn-common.h> + +#endif /* <bits/floatn.h> for sparse */ diff --git a/include/sparse/sys/sysmacros.h b/include/sparse/sys/sysmacros.h new file mode 100644 index 000000000..0c962a0af --- /dev/null +++ b/include/sparse/sys/sysmacros.h @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2018 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 + +#ifndef __SYS_SYSMACROS_SPARSE +#define __SYS_SYSMACROS_SPARSE 1 + +/* "sparse" doesn't like the large constants in <bits/sysmacros.h>, complaining + * that they are so large that they have type "unsigned long long". This + * header avoids the problem. */ + +unsigned int major(dev_t); +unsigned int minor(dev_t); +dev_t makedev(unsigned int, unsigned int); + +#endif /* <sys/sysmacros.h> for sparse */ |