--- old/make/gensrc/Gensrc-jdk.hotspot.agent.gmk	2018-06-22 02:30:22.692000000 +0530
+++ new/make/gensrc/Gensrc-jdk.hotspot.agent.gmk	2018-06-22 02:30:22.468000000 +0530
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -34,12 +34,24 @@
 
 SA_BUILD_VERSION_PROP_NAME := "sun.jvm.hotspot.runtime.VM.saBuildVersion"
 
+MIG_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent
+MACH_EXC_HEADER := $(MIG_OUTPUT_DIR)/mach_exc.h
+MACH_EXC_USER := $(MIG_OUTPUT_DIR)/mach_excUser.c
+MACH_EXC_SERVER := $(MIG_OUTPUT_DIR)/mach_excServer.c
+
 $(SA_PROPERTIES): $(call DependOnVariable, VERSION_STRING)
 	$(MKDIR) -p $(@D)
 	$(ECHO) "$(SA_BUILD_VERSION_PROP_NAME)=$(VERSION_STRING)" > $@
 
+$(MACH_EXC_SERVER): $(SDKROOT)/usr/include/mach/mach_exc.defs
+	$(MIG) -isysroot $(SDKROOT) -server $@ -user $(MACH_EXC_USER) -header $(MACH_EXC_HEADER) $(SDKROOT)/usr/include/mach/mach_exc.defs
+
 TARGETS += $(SA_PROPERTIES)
 
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+   TARGETS += $(MACH_EXC_SERVER)
+endif
+
 ################################################################################
 
 all: $(TARGETS)