1.1 --- a/make/solaris/makefiles/fastdebug.make Wed Nov 12 23:26:45 2008 -0800
1.2 +++ b/make/solaris/makefiles/fastdebug.make Thu Nov 13 14:50:04 2008 -0800
1.3 @@ -54,39 +54,33 @@
1.4 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \<= 504), 1)
1.5 # Compilation of *_<arch>.cpp can take an hour or more at O3. Use O2
1.6 # See comments at top of sparc.make.
1.7 -OPT_CFLAGS/ad_$(Platform_arch).o = $(OPT_CFLAGS/SLOWER)
1.8 -OPT_CFLAGS/dfa_$(Platform_arch).o = $(OPT_CFLAGS/SLOWER)
1.9 +OPT_CFLAGS/ad_$(Platform_arch_model).o = $(OPT_CFLAGS/SLOWER)
1.10 +OPT_CFLAGS/dfa_$(Platform_arch_model).o = $(OPT_CFLAGS/SLOWER)
1.11 endif # COMPILER_REV_NUMERIC <= 504
1.12
1.13 -ifeq (${COMPILER_REV_NUMERIC}, 500)
1.14 -# Avoid a compiler bug caused by using -xO<level> -g<level>
1.15 -# Since the bug also occurs with -xO0, use an innocuous value (must not be null)
1.16 -OPT_CFLAGS/c1_LIROptimizer_i486.o = -c
1.17 -endif
1.18 -
1.19 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 505), 1)
1.20 -# Same problem with Solaris/x86 compiler (both 5.0 and 5.2) on ad_i486.cpp.
1.21 -# CC build time is also too long for ad_i486_{gen,misc}.o
1.22 -OPT_CFLAGS/ad_i486.o = -c
1.23 -OPT_CFLAGS/ad_i486_gen.o = -c
1.24 -OPT_CFLAGS/ad_i486_misc.o = -c
1.25 -ifeq ($(Platform_arch), i486)
1.26 +# Same problem with Solaris/x86 compiler (both 5.0 and 5.2) on ad_x86_{32,64}.cpp.
1.27 +# CC build time is also too long for ad_$(Platform_arch_model)_{gen,misc}.o
1.28 +OPT_CFLAGS/ad_$(Platform_arch_model).o = -c
1.29 +OPT_CFLAGS/ad_$(Platform_arch_model)_gen.o = -c
1.30 +OPT_CFLAGS/ad_$(Platform_arch_model)_misc.o = -c
1.31 +ifeq ($(Platform_arch), x86)
1.32 # Same problem for the wrapper roosts: jni.o jvm.o
1.33 OPT_CFLAGS/jni.o = -c
1.34 OPT_CFLAGS/jvm.o = -c
1.35 # Same problem in parse2.o (probably the Big Switch over bytecodes)
1.36 OPT_CFLAGS/parse2.o = -c
1.37 -endif # Platform_arch == i486
1.38 +endif # Platform_arch == x86
1.39 endif
1.40
1.41 # Frame size > 100k if we allow inlining via -g0!
1.42 DEBUG_CFLAGS/bytecodeInterpreter.o = -g
1.43 DEBUG_CFLAGS/bytecodeInterpreterWithChecks.o = -g
1.44 -ifeq ($(Platform_arch), i486)
1.45 +ifeq ($(Platform_arch), x86)
1.46 # ube explodes on x86
1.47 OPT_CFLAGS/bytecodeInterpreter.o = -xO1
1.48 OPT_CFLAGS/bytecodeInterpreterWithChecks.o = -xO1
1.49 -endif # Platform_arch == i486
1.50 +endif # Platform_arch == x86
1.51
1.52 endif # Platform_compiler == sparcWorks
1.53
