diff -r f90c822e73f8 -r 2d8a650513c2 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Wed Apr 27 01:25:04 2016 +0800
+++ b/src/share/vm/runtime/globals.hpp	Fri Apr 29 00:06:10 2016 +0800
@@ -22,6 +22,12 @@
  *
  */
 
+/*
+ * This file has been modified by Loongson Technology in 2015. These
+ * modifications are Copyright (c) 2015 Loongson Technology, and are made
+ * available on the same license terms set forth above.
+ */
+
 #ifndef SHARE_VM_RUNTIME_GLOBALS_HPP
 #define SHARE_VM_RUNTIME_GLOBALS_HPP
 
@@ -52,6 +58,9 @@
 #ifdef TARGET_ARCH_ppc
 # include "globals_ppc.hpp"
 #endif
+#ifdef TARGET_ARCH_mips
+# include "globals_mips.hpp"
+#endif
 #ifdef TARGET_OS_FAMILY_linux
 # include "globals_linux.hpp"
 #endif
@@ -73,6 +82,9 @@
 #ifdef TARGET_OS_ARCH_linux_sparc
 # include "globals_linux_sparc.hpp"
 #endif
+#ifdef TARGET_OS_ARCH_linux_mips
+# include "globals_linux_mips.hpp"
+#endif
 #ifdef TARGET_OS_ARCH_linux_zero
 # include "globals_linux_zero.hpp"
 #endif
@@ -107,6 +119,9 @@
 #ifdef TARGET_ARCH_sparc
 # include "c1_globals_sparc.hpp"
 #endif
+#ifdef TARGET_ARCH_mips
+# include "c1_globals_mips.hpp"
+#endif
 #ifdef TARGET_ARCH_arm
 # include "c1_globals_arm.hpp"
 #endif
@@ -136,6 +151,9 @@
 #ifdef TARGET_ARCH_sparc
 # include "c2_globals_sparc.hpp"
 #endif
+#ifdef TARGET_ARCH_mips
+# include "c2_globals_mips.hpp"
+#endif
 #ifdef TARGET_ARCH_arm
 # include "c2_globals_arm.hpp"
 #endif
@@ -557,9 +575,28 @@
   develop(bool, TracePageSizes, false,                                      \
           "Trace page size selection and usage")                            \
                                                                             \
-  product(bool, UseNUMA, false,                                             \
+  /* 2013/12/18 Jin: disable UseNUMA until OS is fixed*/                    \
+  product(bool, UseNUMA, MIPS64_ONLY(false) NOT_MIPS64(false),              \
           "Use NUMA if available")                                          \
                                                                             \
+  product(bool, UseOldNUMA, MIPS64_ONLY(true) NOT_MIPS64(false),            \
+          "Use Old NUMA if available")                                      \
+                                                                            \
+  product(bool, UseNUMAThreadRoots, MIPS64_ONLY(true) NOT_MIPS64(false),    \
+          "Use NUMAThreadRoots if available")                               \
+                                                                            \
+  product(bool, UseNUMASteal, MIPS64_ONLY(true) NOT_MIPS64(false),          \
+          "Use NUMASteal if available")                                     \
+                                                                            \
+  product(bool, UseNUMAGC, MIPS64_ONLY(true) NOT_MIPS64(false),             \
+          "Use NUMAGC if available")                                        \
+                                                                            \
+  product(bool, UseStasticScavenge, false,                                  \
+          "Use StasticScavenge if available")                               \
+                                                                            \
+  product(bool, UseStasticCopy, false,                                      \
+          "Use StasticCopy if available")                                   \
+                                                                            \
   product(bool, UseNUMAInterleaving, false,                                 \
           "Interleave memory across NUMA nodes if available")               \
                                                                             \
@@ -2257,7 +2294,7 @@
   diagnostic(uintx, CPUForCMSThread, 0,                                     \
           "When BindCMSThreadToCPU is true, the CPU to bind CMS thread to") \
                                                                             \
-  product(bool, BindGCTaskThreadsToCPUs, false,                             \
+  product(bool, BindGCTaskThreadsToCPUs, MIPS64_ONLY(true) NOT_MIPS64(false), \
           "Bind GCTaskThreads to CPUs if possible")                         \
                                                                             \
   product(bool, UseGCTaskAffinity, false,                                   \
@@ -3103,10 +3140,10 @@
           "Number of times to spin wait before inflation")                  \
                                                                             \
   /* gc parameters */                                                       \
-  product(uintx, InitialHeapSize, 0,                                        \
+  product(uintx, InitialHeapSize, ScaleForWordSize(MIPS64_ONLY(2500) NOT_MIPS64(0) *M),                 \
           "Initial heap size (in bytes); zero means use ergonomics")        \
                                                                             \
-  product(uintx, MaxHeapSize, ScaleForWordSize(96*M),                       \
+  product(uintx, MaxHeapSize, ScaleForWordSize(MIPS64_ONLY(2500) NOT_MIPS64(96) *M),                     \
           "Maximum heap size (in bytes)")                                   \
                                                                             \
   product(uintx, OldSize, ScaleForWordSize(4*M),                            \