changeset 30866:ae72977a5977

Merge
author dcubed
date Wed, 27 May 2015 16:15:23 -0700
parents 5bd9741e6b45 22f923339f58
children c8ac8bbecc64
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/utilities/elfFile.cpp	Wed May 27 09:34:57 2015 -0400
+++ b/hotspot/src/share/vm/utilities/elfFile.cpp	Wed May 27 16:15:23 2015 -0700
@@ -261,7 +261,12 @@
       }
     }
   }
+// AARCH64 defaults to noexecstack. All others default to execstack.
+#ifdef AARCH64
+  return true;
+#else
   return false;
+#endif
 }
 #endif