make/bsd/makefiles/gcc.make

rev 4938 : 8024648: 8016131 & new build (7141426) break Zero port
Summary: Fix breakages in Zero port caused by 7141426 and 8016131.
Reviewed-by: amurillo, dholmes

*** 1,7 ****
--- 1,8 ----
  #
  # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ # Copyright (c) 2013 Red Hat, Inc.
  # 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.
*** 103,116 ****
  
  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
--- 104,117 ----
  
  VM_PICFLAG/LIBJVM = $(PICFLAG)
  VM_PICFLAG/AOUT   =
  VM_PICFLAG        = $(VM_PICFLAG/$(LINK_INTO))
  
! ifeq ($(TYPE),ZERO)
    CFLAGS += $(LIBFFI_CFLAGS)
  endif
! ifeq ($(TYPE),SHARK)
    CFLAGS += $(LIBFFI_CFLAGS)
    CFLAGS += $(LLVM_CFLAGS)
  endif
  CFLAGS += $(VM_PICFLAG)
  CFLAGS += -fno-rtti