make/linux/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.
*** 46,55 ****
--- 46,56 ----
  
      HOSTCXX = $(CXX)
      HOSTCC  = $(CC)
      STRIP = strip
    endif
+ 
    AS  = $(CC) -c
  endif
  
  
  ifeq ($(USE_CLANG), true)
*** 130,140 ****
  # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
  ifeq ($(USE_PRECOMPILED_HEADER),0)
    CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
  endif
  
- 
  #------------------------------------------------------------------------
  # Compiler flags
  
  # position-independent code
  PICFLAG = -fPIC
--- 131,140 ----
*** 142,156 ****
  VM_PICFLAG/LIBJVM = $(PICFLAG)
  VM_PICFLAG/AOUT   =
  VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
  
  ifeq ($(JVM_VARIANT_ZERO), true)
! CFLAGS += $(LIBFFI_CFLAGS)
  endif
  ifeq ($(JVM_VARIANT_ZEROSHARK), true)
! CFLAGS += $(LIBFFI_CFLAGS)
! CFLAGS += $(LLVM_CFLAGS)
  endif
  CFLAGS += $(VM_PICFLAG)
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
  CFLAGS += -D_REENTRANT
--- 142,156 ----
  VM_PICFLAG/LIBJVM = $(PICFLAG)
  VM_PICFLAG/AOUT   =
  VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
  
  ifeq ($(JVM_VARIANT_ZERO), true)
!   CFLAGS += $(LIBFFI_CFLAGS)
  endif
  ifeq ($(JVM_VARIANT_ZEROSHARK), true)
!   CFLAGS += $(LIBFFI_CFLAGS)
!   CFLAGS += $(LLVM_CFLAGS)
  endif
  CFLAGS += $(VM_PICFLAG)
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
  CFLAGS += -D_REENTRANT
*** 390,400 ****
      # stack smashing checks.
      DEBUG_CFLAGS += -fstack-protector-all --param ssp-buffer-size=1
    endif
  endif
  
- 
  # If we are building HEADLESS, pass on to VM
  # so it can set the java.awt.headless property
  ifdef HEADLESS
  CFLAGS += -DHEADLESS
  endif
--- 390,399 ----