--- old/make/linux/makefiles/gcc.make	2016-02-10 21:05:01.000000000 +0100
+++ new/make/linux/makefiles/gcc.make	2016-02-10 21:05:01.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
@@ -48,6 +48,7 @@
     HOSTCC  = $(CC)
     STRIP = strip
   endif
+
   AS  = $(CC) -c
 endif
 
@@ -132,7 +133,6 @@
   CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
 endif
 
-
 #------------------------------------------------------------------------
 # Compiler flags
 
@@ -144,11 +144,11 @@
 VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
 
 ifeq ($(JVM_VARIANT_ZERO), true)
-CFLAGS += $(LIBFFI_CFLAGS)
+  CFLAGS += $(LIBFFI_CFLAGS)
 endif
 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
-CFLAGS += $(LIBFFI_CFLAGS)
-CFLAGS += $(LLVM_CFLAGS)
+  CFLAGS += $(LIBFFI_CFLAGS)
+  CFLAGS += $(LLVM_CFLAGS)
 endif
 CFLAGS += $(VM_PICFLAG)
 CFLAGS += -fno-rtti
@@ -392,7 +392,6 @@
   endif
 endif
 
-
 # If we are building HEADLESS, pass on to VM
 # so it can set the java.awt.headless property
 ifdef HEADLESS