diff options
| author | Andrea Mondelli <Andrea.Mondelli@ucf.edu> | 2019-09-17 14:20:37 -0400 |
|---|---|---|
| committer | Andrea Mondelli <Andrea.Mondelli@ucf.edu> | 2019-09-19 21:46:32 +0000 |
| commit | dc2db5cf9b5f782912569fd2be8be69fa71da33c (patch) | |
| tree | 47ad40b6e34f045b82dc1d72eaecec35ab58f2ab | |
| parent | f85cdccf4167180221fffddb9978bdb3953c1dc0 (diff) | |
| download | gem5-dc2db5cf9b5f782912569fd2be8be69fa71da33c.tar.xz | |
dev: Terminal output's dump name conflicts
The recently Terminal dump options name introduced
in patch 1c72e90 conflict with MacOS stdio.h header.
From stdio.h:
#define stdin __stdinp
#define stdout __stdoutp
#define stderr __stderrp
To remove this conflict, the TerminalDump options are renamed.
Change-Id: I1b60fa1031328fc32d6a58bf7889b6e479d95219
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20959
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
| -rw-r--r-- | src/dev/serial/Terminal.py | 2 | ||||
| -rw-r--r-- | src/dev/serial/terminal.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dev/serial/Terminal.py b/src/dev/serial/Terminal.py index 534010456..e6cc6a9fa 100644 --- a/src/dev/serial/Terminal.py +++ b/src/dev/serial/Terminal.py @@ -44,7 +44,7 @@ from m5.proxy import * from m5.objects.Serial import SerialDevice -class TerminalDump(Enum): vals = ["none", "stdout", "stderr", "file"] +class TerminalDump(Enum): vals = ["none", "stdoutput", "stderror", "file"] class Terminal(SerialDevice): type = 'Terminal' diff --git a/src/dev/serial/terminal.cc b/src/dev/serial/terminal.cc index 002a2ebb7..ce8e214f7 100644 --- a/src/dev/serial/terminal.cc +++ b/src/dev/serial/terminal.cc @@ -151,9 +151,9 @@ Terminal::terminalDump(const TerminalParams* p) switch (p->outfile) { case Enums::TerminalDump::none: return nullptr; - case Enums::TerminalDump::stdout: + case Enums::TerminalDump::stdoutput: return simout.findOrCreate("stdout"); - case Enums::TerminalDump::stderr: + case Enums::TerminalDump::stderror: return simout.findOrCreate("stderr"); case Enums::TerminalDump::file: return simout.findOrCreate(p->name); |