1 # |
1 # |
2 # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
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 |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. |
7 # published by the Free Software Foundation. |
33 # is inlined, the resulting dtrace object file needs a reference to this |
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 |
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) |
35 # for this method for now. (fix this when dtrace bug 6258412 is fixed) |
36 ifndef USE_GCC |
36 ifndef USE_GCC |
37 OPT_CFLAGS/ciEnv.o = $(OPT_CFLAGS) -xinline=no%__1cFciEnvbFpost_compiled_method_load_event6MpnHnmethod__v_ |
37 OPT_CFLAGS/ciEnv.o = $(OPT_CFLAGS) -xinline=no%__1cFciEnvbFpost_compiled_method_load_event6MpnHnmethod__v_ |
|
38 # The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides |
|
39 # of OPT_CFLAGS. Restore it here. |
|
40 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
|
41 OPT_CFLAGS/ciEnv.o += -g0 -xs |
|
42 endif |
38 endif |
43 endif |
39 |
44 |
40 # Need extra inlining to get oop_ps_push_contents functions to perform well enough. |
45 # Need extra inlining to get oop_ps_push_contents functions to perform well enough. |
41 ifndef USE_GCC |
46 ifndef USE_GCC |
42 OPT_CFLAGS/psPromotionManager.o = $(OPT_CFLAGS) -W2,-Ainline:inc=1000 |
47 OPT_CFLAGS/psPromotionManager.o = $(OPT_CFLAGS) -W2,-Ainline:inc=1000 |
|
48 # The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides |
|
49 # of OPT_CFLAGS. Restore it here. |
|
50 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
|
51 OPT_CFLAGS/psPromotionManager.o += -g0 -xs |
|
52 endif |
43 endif |
53 endif |
44 |
54 |
45 # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) |
55 # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) |
46 ifeq ("${Platform_compiler}", "sparcWorks") |
56 ifeq ("${Platform_compiler}", "sparcWorks") |
47 |
57 |
53 endif # COMPILER_REV_NUMERIC == 510 |
63 endif # COMPILER_REV_NUMERIC == 510 |
54 |
64 |
55 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) |
65 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) |
56 # dtrace cannot handle tail call optimization (6672627, 6693876) |
66 # dtrace cannot handle tail call optimization (6672627, 6693876) |
57 OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) |
67 OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) |
|
68 # The -g0 -xs flag is added to OPT_CFLAGS in sparcWorks.make, but lost in case of |
|
69 # per-file overrides of OPT_CFLAGS. Restore it here. This is mainly needed |
|
70 # to provide a good baseline to compare the new build against. |
|
71 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
|
72 OPT_CFLAGS/jni.o += -g0 -xs |
|
73 endif |
58 endif # COMPILER_NUMERIC_REV >= 509 |
74 endif # COMPILER_NUMERIC_REV >= 509 |
59 |
75 |
60 # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) |
76 # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) |
61 ifeq ($(COMPILER_REV_NUMERIC),508) |
77 ifeq ($(COMPILER_REV_NUMERIC),508) |
62 OPT_CFLAGS/ciTypeFlow.o = $(OPT_CFLAGS/O2) |
78 OPT_CFLAGS/ciTypeFlow.o = $(OPT_CFLAGS/O2) |