make/linux/makefiles/gcc.make

*** 114,128 ****
  # Use C++ Interpreter
  ifdef CC_INTERP
    CFLAGS += -DCC_INTERP
  endif
  
- # Build for embedded targets
- ifdef JAVASE_EMBEDDED
-   CFLAGS += -DJAVASE_EMBEDDED
- endif
- 
  # Keep temporary files (.ii, .s)
  ifdef NEED_ASM
    CFLAGS += -save-temps
  else
    CFLAGS += -pipe
--- 114,123 ----
*** 144,164 ****
  CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
  # Special cases
  CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
  
  # The flags to use for an Optimized g++ build
! OPT_CFLAGS += -O3
  
  # Hotspot uses very unstrict aliasing turn this optimization off
! OPT_CFLAGS += -fno-strict-aliasing
  
  # The gcc compiler segv's on ia64 when compiling bytecodeInterpreter.cpp 
  # if we use expensive-optimizations
  ifeq ($(BUILDARCH), ia64)
! OPT_CFLAGS += -fno-expensive-optimizations
  endif
  
  OPT_CFLAGS/NOOPT=-O0
  
  # 6835796. Problem in GCC 4.3.0 with mulnode.o optimized compilation. 
  ifneq "$(shell expr \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) = 3 \) \))" "0"
  OPT_CFLAGS/mulnode.o += -O0
--- 139,168 ----
  CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
  # Special cases
  CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
  
  # The flags to use for an Optimized g++ build
! OPT_CFLAGS/SIZE=-Os
! OPT_CFLAGS/SPEED=-O3
  
  # Hotspot uses very unstrict aliasing turn this optimization off
! OPT_EXTRAS += -fno-strict-aliasing
  
  # The gcc compiler segv's on ia64 when compiling bytecodeInterpreter.cpp 
  # if we use expensive-optimizations
  ifeq ($(BUILDARCH), ia64)
! OPT_EXTRAS += -fno-expensive-optimizations
! endif
! 
! OPT_CFLAGS_DEFAULT ?= SPEED
! 
! ifdef OPT_CFLAGS
!   $(error "$(OPT_CFLAGS) Use OPT_CFLAGS_EXTRAS instead of OPT_CFLAGS to add extra flags to OPT_CFLAGS")
  endif
  
+ OPT_CFLAGS = $(OPT_CFLAGS/$(OPT_CFLAGS_DEFAULT)) $(OPT_EXTRAS)
+ 
  OPT_CFLAGS/NOOPT=-O0
  
  # 6835796. Problem in GCC 4.3.0 with mulnode.o optimized compilation. 
  ifneq "$(shell expr \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) = 3 \) \))" "0"
  OPT_CFLAGS/mulnode.o += -O0