--- old/make/linux/makefiles/amd64.make	2014-07-16 10:05:24.187333692 -0700
+++ new/make/linux/makefiles/amd64.make	2014-07-16 10:05:24.067333686 -0700
@@ -19,16 +19,17 @@
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.
-#  
+#
 #
 
 # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
 OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+DEBUG_CFLAGS/sharedRuntimeTrig.o = -U_FORTIFY_SOURCE
 # The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
 OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
+DEBUG_CFLAGS/sharedRuntimeTrans.o = -U_FORTIFY_SOURCE
+
 # Must also specify if CPU is little endian
 CFLAGS += -DVM_LITTLE_ENDIAN
 
 CFLAGS += -D_LP64=1
-
-OPT_CFLAGS/compactingPermGenGen.o = -O1