Merge

2015-05-27 16:15:23 -07:00 · 2015-05-27 16:15:23 -07:00 · e4c75c1368
commit e4c75c1368
parent 93b1bd8283 77588c66b4
1 changed files with 5 additions and 0 deletions
--- a/hotspot/src/share/vm/utilities/elfFile.cpp
+++ b/hotspot/src/share/vm/utilities/elfFile.cpp
@ -261,7 +261,12 @@ bool ElfFile::specifies_noexecstack() {
      }
    }
  }
+// AARCH64 defaults to noexecstack. All others default to execstack.
+#ifdef AARCH64
+  return true;
+#else
  return false;
+#endif
 }
 #endif