Mercurial > hg > truffle
annotate make/solaris/makefiles/product.make @ 17716:cdb71841f4bc
6498581: ThreadInterruptTest3 produces wrong output on Windows
Summary: There is race condition between os::interrupt and os::is_interrupted on Windows. In JVM_Sleep(Thread.sleep), check if thread gets interrupted, it may see interrupted but not really interrupted so cause spurious waking up (early return from sleep). Fix by checking if interrupt event really gets set thus prevent false return. For intrinsic of _isInterrupted, on Windows, go fastpath only on bit not set.
Reviewed-by: acorn, kvn
Contributed-by: david.holmes@oracle.com, yumin.qi@oracle.com
author | minqi |
---|---|
date | Wed, 26 Feb 2014 15:20:41 -0800 |
parents | 892acf0431ef |
children | 989155e2d07a 5eee9a9aeb7a |
rev | line source |
---|---|
0 | 1 # |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6243
diff
changeset
|
2 # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. |
0 | 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:
1547
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1547
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:
1547
diff
changeset
|
21 # questions. |
0 | 22 # |
23 # | |
24 | |
25 # Sets make macros for making optimized version of Gamma VM | |
26 # (This is the "product", not the "release" version.) | |
27 | |
28 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make | |
29 OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS) | |
30 OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@)) | |
31 | |
32 # Workaround for a bug in dtrace. If ciEnv::post_compiled_method_load_event() | |
33 # is inlined, the resulting dtrace object file needs a reference to this | |
34 # function, whose symbol name is too long for dtrace. So disable inlining | |
35 # for this method for now. (fix this when dtrace bug 6258412 is fixed) | |
36 ifndef USE_GCC | |
37 OPT_CFLAGS/ciEnv.o = $(OPT_CFLAGS) -xinline=no%__1cFciEnvbFpost_compiled_method_load_event6MpnHnmethod__v_ | |
38 endif | |
39 | |
40 # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) | |
158
a49545cab84a
6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
ohair
parents:
91
diff
changeset
|
41 ifeq ("${Platform_compiler}", "sparcWorks") |
0 | 42 |
6243
43541217e9f7
7187046: Crash in ClassFileParser on solaris-ia32 during RetransformClasses.
jiangli
parents:
4891
diff
changeset
|
43 ifeq ($(COMPILER_REV_NUMERIC), 510) |
43541217e9f7
7187046: Crash in ClassFileParser on solaris-ia32 during RetransformClasses.
jiangli
parents:
4891
diff
changeset
|
44 # CC 5.10 has bug XXXXX with -xO4 |
43541217e9f7
7187046: Crash in ClassFileParser on solaris-ia32 during RetransformClasses.
jiangli
parents:
4891
diff
changeset
|
45 OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/O2) |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6243
diff
changeset
|
46 # Avoid apparent crash because of corrupted methodHandle in a tail call |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6243
diff
changeset
|
47 OPT_CFLAGS/simpleThresholdPolicy.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) |
6243
43541217e9f7
7187046: Crash in ClassFileParser on solaris-ia32 during RetransformClasses.
jiangli
parents:
4891
diff
changeset
|
48 endif # COMPILER_REV_NUMERIC == 510 |
43541217e9f7
7187046: Crash in ClassFileParser on solaris-ia32 during RetransformClasses.
jiangli
parents:
4891
diff
changeset
|
49 |
1547
fb1a39993f69
6951319: enable solaris builds using Sun Studio 12 update 1
jcoomes
parents:
430
diff
changeset
|
50 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) |
fb1a39993f69
6951319: enable solaris builds using Sun Studio 12 update 1
jcoomes
parents:
430
diff
changeset
|
51 # dtrace cannot handle tail call optimization (6672627, 6693876) |
fb1a39993f69
6951319: enable solaris builds using Sun Studio 12 update 1
jcoomes
parents:
430
diff
changeset
|
52 OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) |
fb1a39993f69
6951319: enable solaris builds using Sun Studio 12 update 1
jcoomes
parents:
430
diff
changeset
|
53 endif # COMPILER_NUMERIC_REV >= 509 |
158
a49545cab84a
6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
ohair
parents:
91
diff
changeset
|
54 |
a49545cab84a
6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
ohair
parents:
91
diff
changeset
|
55 # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) |
430
4d20a3aaf1ab
6769748: Fix solaris makefiles for the case when "CC -V" produces several lines
kvn
parents:
196
diff
changeset
|
56 ifeq ($(COMPILER_REV_NUMERIC),508) |
0 | 57 OPT_CFLAGS/ciTypeFlow.o = $(OPT_CFLAGS/O2) |
430
4d20a3aaf1ab
6769748: Fix solaris makefiles for the case when "CC -V" produces several lines
kvn
parents:
196
diff
changeset
|
58 endif # COMPILER_REV_NUMERIC == 508 |
158
a49545cab84a
6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
ohair
parents:
91
diff
changeset
|
59 |
0 | 60 endif # Platform_compiler == sparcWorks |
61 | |
62 # If you set HOTSPARC_GENERIC=yes, you disable all OPT_CFLAGS settings | |
63 CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE) | |
64 # Set the environment variable HOTSPARC_GENERIC to "true" | |
65 # to inhibit the effect of the previous line on CFLAGS. | |
66 | |
67 # Linker mapfiles | |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
68 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers |
0 | 69 |
3895
19241ae0d839
7082263: Reflection::resolve_field/field_get/field_set are broken
never
parents:
2042
diff
changeset
|
70 ifndef USE_GCC |
0 | 71 # This mapfile is only needed when compiling with dtrace support, |
72 # and mustn't be otherwise. | |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
73 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) |
0 | 74 |
75 endif | |
76 | |
3954 | 77 # If we can create .debuginfo files, then the VM is stripped in vm.make |
78 # and this macro is not used. | |
4891
719f7007c8e8
7141242: build-infra merge: Rename CPP->CXX and LINK->LD
erikj
parents:
3954
diff
changeset
|
79 # LINK_LIB.CXX/POST_HOOK += $(STRIP_LIB.CXX/POST_HOOK) |
0 | 80 |
81 SYSDEFS += -DPRODUCT | |
82 VERSION = optimized |