Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authordcubed
Wed, 27 May 2015 16:15:23 -0700
changeset 30866 ae72977a5977
parent 30864 5bd9741e6b45 (current diff)
parent 30865 22f923339f58 (diff)
child 30885 c8ac8bbecc64
Merge
--- 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
jdk-sandbox