OpenJDK / portola / portola
changeset 42890:6eeb895b1a6f
Merge
| author | dsamersoff |
|---|---|
| date | Tue, 20 Dec 2016 10:53:52 +0000 |
| parents | 0b0ae99d8639 9d8028808e78 |
| children | 2104a8acb194 |
| files | |
| diffstat | 1 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/logging/logFileStreamOutput.cpp Tue Dec 20 13:35:40 2016 +0300 +++ b/hotspot/src/share/vm/logging/logFileStreamOutput.cpp Tue Dec 20 10:53:52 2016 +0000 @@ -29,11 +29,17 @@ #include "memory/allocation.inline.hpp" static bool initialized; -static char stdoutmem[sizeof(LogStdoutOutput)]; -static char stderrmem[sizeof(LogStderrOutput)]; +static union { + char stdoutmem[sizeof(LogStdoutOutput)]; + jlong dummy; +} aligned_stdoutmem; +static union { + char stderrmem[sizeof(LogStderrOutput)]; + jlong dummy; +} aligned_stderrmem; -LogStdoutOutput &StdoutLog = reinterpret_cast<LogStdoutOutput&>(stdoutmem); -LogStderrOutput &StderrLog = reinterpret_cast<LogStderrOutput&>(stderrmem); +LogStdoutOutput &StdoutLog = reinterpret_cast<LogStdoutOutput&>(aligned_stdoutmem.stdoutmem); +LogStderrOutput &StderrLog = reinterpret_cast<LogStderrOutput&>(aligned_stderrmem.stderrmem); LogFileStreamInitializer::LogFileStreamInitializer() { if (!initialized) {