*** old/make/solaris/makefiles/fastdebug.make	Thu Nov 13 14:14:15 2008
--- new/make/solaris/makefiles/fastdebug.make	Thu Nov 13 14:14:15 2008

*** 52,94 ****
--- 52,88 ----
  endif # COMPILER_REV_NUMERIC == 505
  
  ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \<= 504), 1)
  # Compilation of *_<arch>.cpp can take an hour or more at O3.  Use O2
  # See comments at top of sparc.make.
! OPT_CFLAGS/ad_$(Platform_arch_model).o = $(OPT_CFLAGS/SLOWER)
! OPT_CFLAGS/dfa_$(Platform_arch).o = $(OPT_CFLAGS/SLOWER)
! OPT_CFLAGS/dfa_$(Platform_arch_model).o = $(OPT_CFLAGS/SLOWER)
  endif # COMPILER_REV_NUMERIC <= 504
  
  ifeq (${COMPILER_REV_NUMERIC}, 500)
  # Avoid a compiler bug caused by using -xO<level> -g<level>
  # Since the bug also occurs with -xO0, use an innocuous value (must not be null)
  OPT_CFLAGS/c1_LIROptimizer_i486.o = -c
  endif
  
  ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 505), 1)
! # Same problem with Solaris/x86 compiler (both 5.0 and 5.2) on ad_i486.cpp.
! # CC build time is also too long for ad_i486_{gen,misc}.o
! OPT_CFLAGS/ad_i486.o = -c
! OPT_CFLAGS/ad_i486_gen.o = -c
! OPT_CFLAGS/ad_i486_misc.o = -c
! ifeq ($(Platform_arch), i486)
! # Same problem with Solaris/x86 compiler (both 5.0 and 5.2) on ad_x86_{32,64}.cpp.
! # CC build time is also too long for ad_$(Platform_arch_model)_{gen,misc}.o
! OPT_CFLAGS/ad_$(Platform_arch_model).o = -c
! OPT_CFLAGS/ad_$(Platform_arch_model)_gen.o = -c
! OPT_CFLAGS/ad_$(Platform_arch_model)_misc.o = -c
! ifeq ($(Platform_arch), x86)
  # Same problem for the wrapper roosts: jni.o jvm.o
  OPT_CFLAGS/jni.o = -c
  OPT_CFLAGS/jvm.o = -c
  # Same problem in parse2.o (probably the Big Switch over bytecodes)
  OPT_CFLAGS/parse2.o = -c
! endif # Platform_arch == i486
! endif # Platform_arch == x86
  endif
  
  # Frame size > 100k  if we allow inlining via -g0!
  DEBUG_CFLAGS/bytecodeInterpreter.o = -g
  DEBUG_CFLAGS/bytecodeInterpreterWithChecks.o = -g
! ifeq ($(Platform_arch), i486)
! ifeq ($(Platform_arch), x86)
  # ube explodes on x86
  OPT_CFLAGS/bytecodeInterpreter.o = -xO1
  OPT_CFLAGS/bytecodeInterpreterWithChecks.o =  -xO1
! endif # Platform_arch == i486
! endif # Platform_arch == x86
  
  endif # Platform_compiler == sparcWorks
  
  # Workaround for a bug in dtrace.  If ciEnv::post_compiled_method_load_event()
  # is inlined, the resulting dtrace object file needs a reference to this