*** old/make/bsd/makefiles/gcc.make	Fri Sep 21 10:48:15 2012
--- new/make/bsd/makefiles/gcc.make	Fri Sep 21 10:48:15 2012

*** 1,7 ****
--- 1,7 ----
  #
! # Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.

*** 149,163 ****
--- 149,158 ----
  # 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

*** 184,212 ****
--- 179,215 ----
  # XXXDARWIN: for _dyld_bind_fully_image_containing_address
  ifeq ($(OS_VENDOR), Darwin)
    CFLAGS_WARN/os_bsd.o = $(CFLAGS_WARN/DEFAULT) -Wno-deprecated-declarations
  endif
  
+ 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
  
  # The flags to use for an Optimized g++ build
  ifeq ($(OS_VENDOR), Darwin)
    # use -Os by default, unless -O3 can be proved to be worth the cost, as per policy
    # <http://wikis.sun.com/display/OpenJDK/Mac+OS+X+Port+Compilers>
!   OPT_CFLAGS += -Os
!   OPT_CFLAGS_DEFAULT ?= SIZE
  else
!   OPT_CFLAGS += -O3
!   OPT_CFLAGS_DEFAULT ?= SPEED
  endif
  
  # 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
+ ifdef OPT_CFLAGS
+   $(error "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