Mercurial > hg > truffle
comparison src/share/vm/runtime/globals.cpp @ 13451:02f27ecb4f3a
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 18 Dec 2013 00:00:24 +0100 |
parents | 359f7e70ae7f 396564992823 |
children | d8041d695d19 |
comparison
equal
deleted
inserted
replaced
13371:4db09b7304da | 13451:02f27ecb4f3a |
---|---|
323 { KIND_SHARK, "SHARK" }, | 323 { KIND_SHARK, "SHARK" }, |
324 { KIND_PLATFORM_DEPENDENT, "pd" }, | 324 { KIND_PLATFORM_DEPENDENT, "pd" }, |
325 { KIND_PRODUCT, "product" }, | 325 { KIND_PRODUCT, "product" }, |
326 { KIND_MANAGEABLE, "manageable" }, | 326 { KIND_MANAGEABLE, "manageable" }, |
327 { KIND_DIAGNOSTIC, "diagnostic" }, | 327 { KIND_DIAGNOSTIC, "diagnostic" }, |
328 { KIND_EXPERIMENTAL, "experimental" }, | |
329 { KIND_COMMERCIAL, "commercial" }, | |
328 { KIND_NOT_PRODUCT, "notproduct" }, | 330 { KIND_NOT_PRODUCT, "notproduct" }, |
329 { KIND_DEVELOP, "develop" }, | 331 { KIND_DEVELOP, "develop" }, |
330 { KIND_LP64_PRODUCT, "lp64_product" }, | 332 { KIND_LP64_PRODUCT, "lp64_product" }, |
331 { KIND_READ_WRITE, "rw" }, | 333 { KIND_READ_WRITE, "rw" }, |
332 { -1, "" } | 334 { -1, "" } |