commit ec92c4fc183869eb02e1590d44256b516d2da8b8
author Nick Kralevich <nnk@google.com> Mon Apr 26 10:12:05 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 26 10:12:05 2010 -0700
tree 2eec47a668c0292624064b547417c53928c7ca3e
parent 1166c9b6cf5ba84bd2de3b4cf4aa9254afa98f7c
parent 8e274f34768870eebc14a4044dbf0dc0e69f9f81

am 8e274f34: Merge "make libacc run with execute stack protections enabled." into kraken

libacc/acc.cpp

diff --git a/libacc/acc.cpp b/libacc/acc.cpp
index 8f33b0b..73d2cdd 100644
--- a/libacc/acc.cpp
+++ b/libacc/acc.cpp
@@ -23,10 +23,7 @@
 
 #include <cutils/hashmap.h>
 
-#if defined(__i386__)
 #include <sys/mman.h>
-#endif
-
 
 #if defined(__arm__)
 #define DEFAULT_ARM_CODEGEN
@@ -230,7 +227,7 @@
 
         void release() {
             if (pProgramBase != 0) {
-                free(pProgramBase);
+                munmap(pProgramBase, mSize);
                 pProgramBase = 0;
             }
         }
@@ -263,7 +260,9 @@
         virtual void init(int size) {
             release();
             mSize = size;
-            pProgramBase = (char*) calloc(1, size);
+            pProgramBase = (char*) mmap(NULL, size, 
+                PROT_EXEC | PROT_READ | PROT_WRITE, 
+                MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
             ind = pProgramBase;
         }