--- old/make/bsd/makefiles/gcc.make	2016-02-10 21:04:56.000000000 +0100
+++ new/make/bsd/makefiles/gcc.make	2016-02-10 21:04:56.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -189,10 +189,10 @@
 endif
 
 ifeq ($(STATIC_BUILD),true)
-CXXFLAGS += -DSTATIC_BUILD
-CFLAGS += -DSTATIC_BUILD
+  CXXFLAGS += -DSTATIC_BUILD
+  CFLAGS += -DSTATIC_BUILD
 else
-CFLAGS += $(VM_PICFLAG)
+  CFLAGS += $(VM_PICFLAG)
 endif
 
 CFLAGS += -fno-rtti
@@ -239,7 +239,7 @@
 ASFLAGS    += $(ARCHFLAG)
 
 ifdef E500V2
-CFLAGS += -DE500V2
+  CFLAGS += -DE500V2
 endif
 
 # Use C++ Interpreter
@@ -275,11 +275,12 @@
   # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
   # conversions which might affect the values. Only enable it in earlier versions.
   ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
-    WARNINGS_FLAGS += -Wconversion
+    WARNING_FLAGS += -Wconversion
   endif
 endif
 
 CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
+
 # Special cases
 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
 # XXXDARWIN: for _dyld_bind_fully_image_containing_address
@@ -341,7 +342,7 @@
   # 6835796. Problem in GCC 4.3.0 with mulnode.o optimized compilation.
   ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1)
     OPT_CFLAGS/mulnode.o += $(OPT_CFLAGS/NOOPT)
-  endif 
+  endif
 endif
 
 # Flags for generating make dependency flags.
@@ -354,7 +355,7 @@
 
 # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
 ifeq ($(USE_PRECOMPILED_HEADER),0)
-CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
+  CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
 endif
 
 ifeq ($(OS_VENDOR), Darwin)