Mercurial > hg > truffle
annotate src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp @ 17833:bfdf528be8e8
8038498: Fix includes and C inlining after 8035330
Summary: Change 8035330: Remove G1ParScanPartialArrayClosure and G1ParScanHeapEvacClosure broke the debug build on AIX. The method do_oop_partial_array() is added in a header, but requires the inline function par_write_ref() through several inlined calls. In some cpp files, like arguments.cpp, par_write_ref() is not defined as the corresponding inline header and is not included. The AIX debug VM does not start because of the missing symbol. This change solves this by cleaning up include dependencies.
Reviewed-by: tschatzl, stefank
| author | tschatzl |
|---|---|
| date | Fri, 04 Apr 2014 10:43:56 +0200 |
| parents | f95d63e2154a |
| children | a0ea36509b7b |
| rev | line source |
|---|---|
| 133 | 1 /* |
| 1972 | 2 * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. |
| 133 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 5 * This code is free software; you can redistribute it and/or modify it | |
| 6 * under the terms of the GNU General Public License version 2 only, as | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
196
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
196
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
196
diff
changeset
|
21 * questions. |
| 133 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #include "precompiled.hpp" |
| 26 #include "runtime/os.hpp" | |
| 27 #include "vm_version_sparc.hpp" | |
| 133 | 28 |
| 29 static bool detect_niagara() { | |
| 30 char cpu[128]; | |
| 31 bool rv = false; | |
| 32 | |
| 33 FILE* fp = fopen("/proc/cpuinfo", "r"); | |
| 34 if (fp == NULL) { | |
| 35 return rv; | |
| 36 } | |
| 37 | |
| 38 while (!feof(fp)) { | |
| 39 if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) { | |
| 40 if (strstr(cpu, "Niagara") != NULL) { | |
| 41 rv = true; | |
| 42 } | |
| 43 break; | |
| 44 } | |
| 45 } | |
| 46 | |
| 47 fclose(fp); | |
| 48 | |
| 49 return rv; | |
| 50 } | |
| 51 | |
| 52 int VM_Version::platform_features(int features) { | |
| 53 // Default to generic v9 | |
| 54 features = generic_v9_m; | |
| 55 | |
| 56 if (detect_niagara()) { | |
| 57 NOT_PRODUCT(if (PrintMiscellaneous && Verbose) tty->print_cr("Detected Linux on Niagara");) | |
| 58 features = niagara1_m; | |
| 59 } | |
| 60 | |
| 61 return features; | |
| 62 } |