make/solaris/makefiles/amd64.make

*** 1,7 ****
  #
! # Copyright (c) 2004, 2010, 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.
--- 1,7 ----
  #
! # Copyright (c) 2004, 2016, 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.
*** 32,41 ****
--- 32,49 ----
  
  # Temporary until SS10 C++ compiler is fixed
  OPT_CFLAGS/generateOptoStub.o = -xO2
  # Temporary util SS12u1 C++ compiler is fixed
  OPT_CFLAGS/c1_LinearScan.o = -xO2
+ 
+ # The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+ # of OPT_CFLAGS. Restore it here.
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+   OPT_CFLAGS/generateOptoStub.o += -g0 -xs
+   OPT_CFLAGS/LinearScan.o += -g0 -xs
+ endif
+ 
  else
  
  ifeq ("${Platform_compiler}", "gcc")
  # gcc
  # The serviceability agent relies on frame pointer (%rbp) to walk thread stack