make/hotspot/gensrc/GensrcAdlc.gmk

*** 1,7 ****
  #
! # Copyright (c) 2013, 2017, 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.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2013, 2018, 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.  Oracle designates this
*** 61,79 ****
    ADLC_CFLAGS += -D$(HOTSPOT_TARGET_CPU_DEFINE)
  
    ADLC_CFLAGS += -I$(TOPDIR)/src/hotspot/share
  
    $(eval $(call SetupNativeCompilation, BUILD_ADLC, \
        TOOLCHAIN := TOOLCHAIN_BUILD_LINK_CXX, \
        SRC := $(TOPDIR)/src/hotspot/share/adlc, \
        EXTRA_FILES := $(TOPDIR)/src/hotspot/share/opto/opcodes.cpp, \
        CFLAGS := $(ADLC_CFLAGS) $(ADLC_CFLAGS_WARNINGS), \
        LDFLAGS := $(ADLC_LDFLAGS), \
        LIBS := $(ADLC_LIBS), \
        OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/adlc/objs, \
        OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/adlc, \
-       PROGRAM := adlc, \
        DEBUG_SYMBOLS := false, \
        DISABLED_WARNINGS_clang := tautological-compare, \
        DISABLED_WARNINGS_solstudio := notemsource, \
    ))
  
--- 61,80 ----
    ADLC_CFLAGS += -D$(HOTSPOT_TARGET_CPU_DEFINE)
  
    ADLC_CFLAGS += -I$(TOPDIR)/src/hotspot/share
  
    $(eval $(call SetupNativeCompilation, BUILD_ADLC, \
+       NAME := adlc, \
+       TYPE := EXECUTABLE, \
        TOOLCHAIN := TOOLCHAIN_BUILD_LINK_CXX, \
        SRC := $(TOPDIR)/src/hotspot/share/adlc, \
        EXTRA_FILES := $(TOPDIR)/src/hotspot/share/opto/opcodes.cpp, \
        CFLAGS := $(ADLC_CFLAGS) $(ADLC_CFLAGS_WARNINGS), \
        LDFLAGS := $(ADLC_LDFLAGS), \
        LIBS := $(ADLC_LIBS), \
        OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/adlc/objs, \
        OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/adlc, \
        DEBUG_SYMBOLS := false, \
        DISABLED_WARNINGS_clang := tautological-compare, \
        DISABLED_WARNINGS_solstudio := notemsource, \
    ))