diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2020-06-08 08:04:19 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2020-06-08 08:16:15 +0000 |
| commit | e7b3f654f2ab0400c95c0517387a9ad645a5c4cd (patch) | |
| tree | abf913e1081892824cae8050327da9d594cd7fe9 | |
| parent | 48b799ea9a6a252c355947f33f78f43a38fe31b0 (diff) | |
| download | gcc-e7b3f654f2ab0400c95c0517387a9ad645a5c4cd.zip gcc-e7b3f654f2ab0400c95c0517387a9ad645a5c4cd.tar.gz gcc-e7b3f654f2ab0400c95c0517387a9ad645a5c4cd.tar.bz2 | |
[arm] (header usage fix) include c++ algorithm header via system.h
After the recent commit that forces uses of c++11, the arm part failed
to build because it does not include <algorithm> via system.h as
should be done.
This results in:
from /gcc/common/config/arm/arm-common.c:34:
/usr/lib/gcc/x86_64-linux-gnu/5/include/mm_malloc.h:42:12: error:
attempt to use poisoned "malloc"
return malloc (size);
This patch fixes the problem by defining INCLUDE_ALGORITHM before
including system.h and no longer includes <algorithm> directly.
gcc/ChangeLog:
* common/config/arm/arm-common.c (INCLUDE_ALGORITHM):
Define. No longer include <algorithm>.
| -rw-r--r-- | gcc/common/config/arm/arm-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/common/config/arm/arm-common.c b/gcc/common/config/arm/arm-common.c index 78a779c..8e986e4 100644 --- a/gcc/common/config/arm/arm-common.c +++ b/gcc/common/config/arm/arm-common.c @@ -19,6 +19,7 @@ #define INCLUDE_LIST #define INCLUDE_VECTOR +#define INCLUDE_ALGORITHM #include "config.h" #include "system.h" #include "coretypes.h" @@ -31,7 +32,6 @@ #include "flags.h" #include "sbitmap.h" #include "diagnostic.h" -#include <algorithm> /* Set default optimization options. */ static const struct default_options arm_option_optimization_table[] = |