make/bsd/makefiles/gcc.make

*** 1,7 ****
  #
! # Copyright (c) 1999, 2015, 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) 1999, 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.
*** 328,337 ****
--- 328,344 ----
        \( $(CC_VER_MAJOR) = 6 \& $(CC_VER_MINOR) \<= 1 \) \| \
        \( $(CC_VER_MAJOR) = 7 \& $(CC_VER_MINOR) \<= 0 \) \
      ), 1)
      OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
      OPT_CFLAGS/unsafe.o += -O1
+ 
+     # 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/loopTransform.o += -g
+       OPT_CFLAGS/unsafe.o += -g
+     endif
    else
      $(error "Update compiler workarounds for Clang $(CC_VER_MAJOR).$(CC_VER_MINOR)")
    endif
  else
    # Do not allow GCC 4.1.1