Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/globals.cpp @ 14442:1174c8abbdb6
Merge
author | kvn |
---|---|
date | Thu, 05 Dec 2013 15:13:12 -0800 |
parents | 396564992823 |
children | 02f27ecb4f3a b7cd330fd5b6 cd7a42c7be06 |
comparison
equal
deleted
inserted
replaced
14441:e7cbc95179c4 | 14442:1174c8abbdb6 |
---|---|
319 { KIND_SHARK, "SHARK" }, | 319 { KIND_SHARK, "SHARK" }, |
320 { KIND_PLATFORM_DEPENDENT, "pd" }, | 320 { KIND_PLATFORM_DEPENDENT, "pd" }, |
321 { KIND_PRODUCT, "product" }, | 321 { KIND_PRODUCT, "product" }, |
322 { KIND_MANAGEABLE, "manageable" }, | 322 { KIND_MANAGEABLE, "manageable" }, |
323 { KIND_DIAGNOSTIC, "diagnostic" }, | 323 { KIND_DIAGNOSTIC, "diagnostic" }, |
324 { KIND_EXPERIMENTAL, "experimental" }, | |
325 { KIND_COMMERCIAL, "commercial" }, | |
324 { KIND_NOT_PRODUCT, "notproduct" }, | 326 { KIND_NOT_PRODUCT, "notproduct" }, |
325 { KIND_DEVELOP, "develop" }, | 327 { KIND_DEVELOP, "develop" }, |
326 { KIND_LP64_PRODUCT, "lp64_product" }, | 328 { KIND_LP64_PRODUCT, "lp64_product" }, |
327 { KIND_READ_WRITE, "rw" }, | 329 { KIND_READ_WRITE, "rw" }, |
328 { -1, "" } | 330 { -1, "" } |