src/hotspot/os/aix/os_aix.cpp

*** 26,43 ****
  // According to the AIX OS doc #pragma alloca must be used
  // with C++ compiler before referencing the function alloca()
  #pragma alloca
  
  // no precompiled headers
  #include "classfile/classLoader.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "code/icBuffer.hpp"
  #include "code/vtableStubs.hpp"
  #include "compiler/compileBroker.hpp"
  #include "interpreter/interpreter.hpp"
- #include "jvm_aix.h"
  #include "logging/log.hpp"
  #include "libo4.hpp"
  #include "libperfstat_aix.hpp"
  #include "libodm_aix.hpp"
  #include "loadlib_aix.hpp"
--- 26,43 ----
  // According to the AIX OS doc #pragma alloca must be used
  // with C++ compiler before referencing the function alloca()
  #pragma alloca
  
  // no precompiled headers
+ #include "jvm.h"
  #include "classfile/classLoader.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "code/icBuffer.hpp"
  #include "code/vtableStubs.hpp"
  #include "compiler/compileBroker.hpp"
  #include "interpreter/interpreter.hpp"
  #include "logging/log.hpp"
  #include "libo4.hpp"
  #include "libperfstat_aix.hpp"
  #include "libodm_aix.hpp"
  #include "loadlib_aix.hpp"
*** 47,57 ****
  #include "oops/oop.inline.hpp"
  #include "os_aix.inline.hpp"
  #include "os_share_aix.hpp"
  #include "porting_aix.hpp"
  #include "prims/jniFastGetField.hpp"
- #include "prims/jvm.h"
  #include "prims/jvm_misc.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/atomic.hpp"
  #include "runtime/extendedPC.hpp"
  #include "runtime/globals.hpp"
--- 47,56 ----
*** 3247,3257 ****
    if (UseSIGTRAP) {
      DO_SIGNAL_CHECK(SIGTRAP);
    }
  
    // ReduceSignalUsage allows the user to override these handlers
!   // see comments at the very top and jvm_solaris.h
    if (!ReduceSignalUsage) {
      DO_SIGNAL_CHECK(SHUTDOWN1_SIGNAL);
      DO_SIGNAL_CHECK(SHUTDOWN2_SIGNAL);
      DO_SIGNAL_CHECK(SHUTDOWN3_SIGNAL);
      DO_SIGNAL_CHECK(BREAK_SIGNAL);
--- 3246,3256 ----
    if (UseSIGTRAP) {
      DO_SIGNAL_CHECK(SIGTRAP);
    }
  
    // ReduceSignalUsage allows the user to override these handlers
!   // see comments at the very top and jvm_md.h
    if (!ReduceSignalUsage) {
      DO_SIGNAL_CHECK(SHUTDOWN1_SIGNAL);
      DO_SIGNAL_CHECK(SHUTDOWN2_SIGNAL);
      DO_SIGNAL_CHECK(SHUTDOWN3_SIGNAL);
      DO_SIGNAL_CHECK(BREAK_SIGNAL);