diff --git a/src/arch/sparc/linux/linux.hh b/src/arch/sparc/linux/linux.hh
--- a/src/arch/sparc/linux/linux.hh
+++ b/src/arch/sparc/linux/linux.hh
@@ -127,11 +127,7 @@
     static const unsigned TGT_MAP_FILE          = 0x00000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x00200;
     static const unsigned TGT_MAP_HUGETLB       = 0x40000;
-    static const unsigned TGT_MAP_LOCKED        = 0x00100;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x10000;
     static const unsigned TGT_MAP_NORESERVE     = 0x00040;
-    static const unsigned TGT_MAP_POPULATE      = 0x08000;
-    static const unsigned TGT_MAP_STACK         = 0x20000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x00020;
     static const unsigned TGT_MAP_FIXED         = 0x00010;
     static const unsigned TGT_MAP_INHERIT       = 0x00080;
diff --git a/src/arch/sparc/solaris/solaris.hh b/src/arch/sparc/solaris/solaris.hh
--- a/src/arch/sparc/solaris/solaris.hh
+++ b/src/arch/sparc/solaris/solaris.hh
@@ -70,11 +70,7 @@
     static const unsigned TGT_MAP_FILE          = 0x00000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x00100;
     static const unsigned TGT_MAP_HUGETLB       = 0x40000;
-    static const unsigned TGT_MAP_LOCKED        = 0x02000;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x10000;
     static const unsigned TGT_MAP_NORESERVE     = 0x04000;
-    static const unsigned TGT_MAP_POPULATE      = 0x08000;
-    static const unsigned TGT_MAP_STACK         = 0x20000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x00020;
     static const unsigned TGT_MAP_FIXED         = 0x00010;
 
diff --git a/src/arch/sparc/solaris/solaris.cc b/src/arch/sparc/solaris/solaris.cc
--- a/src/arch/sparc/solaris/solaris.cc
+++ b/src/arch/sparc/solaris/solaris.cc
@@ -88,11 +88,7 @@
   { TGT_MAP_FILE, MAP_FILE },
   { TGT_MAP_GROWSDOWN, MAP_GROWSDOWN },
   { TGT_MAP_HUGETLB, MAP_HUGETLB },
-  { TGT_MAP_LOCKED, MAP_LOCKED },
-  { TGT_MAP_NONBLOCK, MAP_NONBLOCK },
   { TGT_MAP_NORESERVE, MAP_NORESERVE },
-  { TGT_MAP_POPULATE, MAP_POPULATE },
-  { TGT_MAP_STACK, MAP_STACK },
   { TGT_MAP_ANONYMOUS, MAP_ANONYMOUS },
   { TGT_MAP_FIXED, MAP_FIXED },
 };
diff --git a/src/arch/x86/linux/linux.hh b/src/arch/x86/linux/linux.hh
--- a/src/arch/x86/linux/linux.hh
+++ b/src/arch/x86/linux/linux.hh
@@ -135,11 +135,7 @@
     static const unsigned TGT_MAP_FILE          = 0x00000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x00100;
     static const unsigned TGT_MAP_HUGETLB       = 0x40000;
-    static const unsigned TGT_MAP_LOCKED        = 0x02000;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x10000;
     static const unsigned TGT_MAP_NORESERVE     = 0x04000;
-    static const unsigned TGT_MAP_POPULATE      = 0x08000;
-    static const unsigned TGT_MAP_STACK         = 0x20000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x00020;
     static const unsigned TGT_MAP_FIXED         = 0x00010;
 
@@ -263,11 +259,7 @@
     static const unsigned TGT_MAP_FILE          = 0x00000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x00100;
     static const unsigned TGT_MAP_HUGETLB       = 0x40000;
-    static const unsigned TGT_MAP_LOCKED        = 0x02000;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x10000;
     static const unsigned TGT_MAP_NORESERVE     = 0x04000;
-    static const unsigned TGT_MAP_POPULATE      = 0x08000;
-    static const unsigned TGT_MAP_STACK         = 0x20000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x00020;
     static const unsigned TGT_MAP_FIXED         = 0x00010;
 
diff --git a/src/arch/power/linux/linux.hh b/src/arch/power/linux/linux.hh
--- a/src/arch/power/linux/linux.hh
+++ b/src/arch/power/linux/linux.hh
@@ -171,11 +171,7 @@
     static const unsigned TGT_MAP_FILE          = 0x00000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x00100;
     static const unsigned TGT_MAP_HUGETLB       = 0x40000;
-    static const unsigned TGT_MAP_LOCKED        = 0x00080;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x10000;
     static const unsigned TGT_MAP_NORESERVE     = 0x00040;
-    static const unsigned TGT_MAP_POPULATE      = 0x08000;
-    static const unsigned TGT_MAP_STACK         = 0x20000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x00020;
     static const unsigned TGT_MAP_FIXED         = 0x00010;
 
diff --git a/src/arch/mips/linux/linux.hh b/src/arch/mips/linux/linux.hh
--- a/src/arch/mips/linux/linux.hh
+++ b/src/arch/mips/linux/linux.hh
@@ -110,11 +110,7 @@
     static const unsigned TGT_MAP_FILE          = 0x00000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x01000;
     static const unsigned TGT_MAP_HUGETLB       = 0x80000;
-    static const unsigned TGT_MAP_LOCKED        = 0x08000;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x20000;
     static const unsigned TGT_MAP_NORESERVE     = 0x00400;
-    static const unsigned TGT_MAP_POPULATE      = 0x10000;
-    static const unsigned TGT_MAP_STACK         = 0x40000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x00800;
     static const unsigned TGT_MAP_FIXED         = 0x00010;
 
diff --git a/src/arch/arm/linux/linux.hh b/src/arch/arm/linux/linux.hh
--- a/src/arch/arm/linux/linux.hh
+++ b/src/arch/arm/linux/linux.hh
@@ -132,11 +132,7 @@
     static const unsigned TGT_MAP_FILE          = 0x00000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x00100;
     static const unsigned TGT_MAP_HUGETLB       = 0x40000;
-    static const unsigned TGT_MAP_LOCKED        = 0x02000;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x10000;
     static const unsigned TGT_MAP_NORESERVE     = 0x04000;
-    static const unsigned TGT_MAP_POPULATE      = 0x08000;
-    static const unsigned TGT_MAP_STACK         = 0x20000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x00020;
     static const unsigned TGT_MAP_FIXED         = 0x00010;
 
@@ -344,11 +340,7 @@
     static const unsigned TGT_MAP_FILE          = 0x00000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x00100;
     static const unsigned TGT_MAP_HUGETLB       = 0x40000;
-    static const unsigned TGT_MAP_LOCKED        = 0x02000;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x10000;
     static const unsigned TGT_MAP_NORESERVE     = 0x04000;
-    static const unsigned TGT_MAP_POPULATE      = 0x08000;
-    static const unsigned TGT_MAP_STACK         = 0x20000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x00020;
     static const unsigned TGT_MAP_FIXED         = 0x00010;
 
diff --git a/src/arch/alpha/tru64/tru64.cc b/src/arch/alpha/tru64/tru64.cc
--- a/src/arch/alpha/tru64/tru64.cc
+++ b/src/arch/alpha/tru64/tru64.cc
@@ -79,11 +79,7 @@
   { TGT_MAP_FILE, MAP_FILE },
   { TGT_MAP_GROWSDOWN, MAP_GROWSDOWN },
   { TGT_MAP_HUGETLB, MAP_HUGETLB },
-  { TGT_MAP_LOCKED, MAP_LOCKED },
-  { TGT_MAP_NONBLOCK, MAP_NONBLOCK },
   { TGT_MAP_NORESERVE, MAP_NORESERVE },
-  { TGT_MAP_POPULATE, MAP_POPULATE },
-  { TGT_MAP_STACK, MAP_STACK },
   { TGT_MAP_ANONYMOUS, MAP_ANONYMOUS },
   { TGT_MAP_FIXED, MAP_FIXED },
 };
# Node ID f8a5cb63b09fdecf22354cbe38ea0bd18c80ccdf
# Parent  4a86763c0b30cccba0f56c7f48637a46a4663b06
diff --git a/src/arch/alpha/linux/linux.hh b/src/arch/alpha/linux/linux.hh
--- a/src/arch/alpha/linux/linux.hh
+++ b/src/arch/alpha/linux/linux.hh
@@ -111,11 +111,7 @@
     static const unsigned TGT_MAP_FILE          = 0x000000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x001000;
     static const unsigned TGT_MAP_HUGETLB       = 0x100000;
-    static const unsigned TGT_MAP_LOCKED        = 0x008000;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x040000;
     static const unsigned TGT_MAP_NORESERVE     = 0x010000;
-    static const unsigned TGT_MAP_POPULATE      = 0x020000;
-    static const unsigned TGT_MAP_STACK         = 0x080000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x000010;
     static const unsigned TGT_MAP_FIXED         = 0x000100;
 
diff --git a/src/arch/alpha/tru64/tru64.hh b/src/arch/alpha/tru64/tru64.hh
--- a/src/arch/alpha/tru64/tru64.hh
+++ b/src/arch/alpha/tru64/tru64.hh
@@ -74,11 +74,7 @@
     static const unsigned TGT_MAP_FILE          = 0x00000;
     static const unsigned TGT_MAP_GROWSDOWN     = 0x00100;
     static const unsigned TGT_MAP_HUGETLB       = 0x40000;
-    static const unsigned TGT_MAP_LOCKED        = 0x02000;
-    static const unsigned TGT_MAP_NONBLOCK      = 0x10000;
     static const unsigned TGT_MAP_NORESERVE     = 0x04000;
-    static const unsigned TGT_MAP_POPULATE      = 0x08000;
-    static const unsigned TGT_MAP_STACK         = 0x20000;
     static const unsigned TGT_MAP_ANONYMOUS     = 0x00020;
     static const unsigned TGT_MAP_FIXED         = 0x00010;