make/linux/makefiles/i486.make

*** 1,7 ****
  #
! # Copyright (c) 1999, 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) 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.
*** 30,34 ****
--- 30,42 ----
  OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
  # Must also specify if CPU is little endian
  CFLAGS += -DVM_LITTLE_ENDIAN
  
  OPT_CFLAGS/compactingPermGenGen.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/sharedRuntimeTrig.o += -g
+    OPT_CFLAGS/sharedRuntimeTrans.o += -g
+    OPT_CFLAGS/compactingPermGenGen.o += -g
+ endif