diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-17 09:15:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-17 09:15:50 +0000 |
| commit | 3ab773c57c72969125220b9cedea1f85cef6c543 (patch) | |
| tree | 32d9aa9f9b1da9086389d7b8c199206a1ec73c69 /gcc | |
| parent | eeee6c73f048177dfdd94c50fe387391d225f4f5 (diff) | |
| parent | be78228790d125fe46af339d6b323a6a545f278f (diff) | |
| download | gcc-3ab773c57c72969125220b9cedea1f85cef6c543.zip gcc-3ab773c57c72969125220b9cedea1f85cef6c543.tar.gz gcc-3ab773c57c72969125220b9cedea1f85cef6c543.tar.bz2 | |
Merge #497
497: Avoid abort macro override the abort of std r=philberty a=thomasyonug
Fixing the build issue in macos by avoiding abort macro override the abort call of std.
Co-authored-by: Thomas Young <wenzhang5800@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/lex/rust-token.h | 12 | ||||
| -rw-r--r-- | gcc/rust/rust-lang.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/rust-session-manager.cc | 4 | ||||
| -rw-r--r-- | gcc/rust/rust-session-manager.h | 7 |
4 files changed, 12 insertions, 13 deletions
diff --git a/gcc/rust/lex/rust-token.h b/gcc/rust/lex/rust-token.h index f8680cd..f76899c 100644 --- a/gcc/rust/lex/rust-token.h +++ b/gcc/rust/lex/rust-token.h @@ -19,18 +19,18 @@ #ifndef RUST_TOKEN_H #define RUST_TOKEN_H -#include "config.h" -#include "system.h" -#include "coretypes.h" -#include "input.h" -// order: config, system, coretypes, input - #include <string> #include <memory> #include "rust-linemap.h" #include "rust-codepoint.h" +// order: config, system, coretypes, input +#include "config.h" +#include "system.h" +#include "coretypes.h" +#include "input.h" + namespace Rust { // "Primitive core types" in Rust - the different int and float types, as well // as some others diff --git a/gcc/rust/rust-lang.cc b/gcc/rust/rust-lang.cc index 4b139ef..6edf8cc 100644 --- a/gcc/rust/rust-lang.cc +++ b/gcc/rust/rust-lang.cc @@ -16,6 +16,7 @@ // along with GCC; see the file COPYING3. If not see // <http://www.gnu.org/licenses/>. +#include "rust-diagnostics.h" #include "config.h" #include "system.h" #include "coretypes.h" @@ -31,7 +32,6 @@ #include "convert.h" #include "langhooks.h" #include "langhooks-def.h" -#include "rust-diagnostics.h" #include <mpfr.h> // note: header files must be in this order or else forward declarations don't diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc index e1938fa..c0d863b 100644 --- a/gcc/rust/rust-session-manager.cc +++ b/gcc/rust/rust-session-manager.cc @@ -17,12 +17,12 @@ // <http://www.gnu.org/licenses/>. // #include "rust-session-manager.h" +#include <fstream> +#include <sstream> #include "rust-session-manager.h" #include "rust-diagnostics.h" #include "diagnostic.h" #include "input.h" -#include <fstream> -#include <sstream> #include "target.h" #include "tm.h" diff --git a/gcc/rust/rust-session-manager.h b/gcc/rust/rust-session-manager.h index b7e081b..ff3e438 100644 --- a/gcc/rust/rust-session-manager.h +++ b/gcc/rust/rust-session-manager.h @@ -20,14 +20,13 @@ #ifndef RUST_SESSION_MANAGER_H #define RUST_SESSION_MANAGER_H +#include "rust-linemap.h" +#include "rust-backend.h" + #include "config.h" #include "system.h" #include "coretypes.h" #include "options.h" -#include "rust-system.h" - -#include "rust-linemap.h" -#include "rust-backend.h" namespace Rust { // parser forward decl |