--- old/make/autoconf/basics.m4	2019-04-04 15:11:53.109559034 -0700
+++ new/make/autoconf/basics.m4	2019-04-04 15:11:52.473537308 -0700
@@ -881,10 +881,11 @@
     fi
 
     if test "x$CUSTOM_ROOT" != x; then
-      OUTPUTDIR="${CUSTOM_ROOT}/build/${CONF_NAME}"
+      WORKSPACE_ROOT="${CUSTOM_ROOT}"
     else
-      OUTPUTDIR="${TOPDIR}/build/${CONF_NAME}"
+      WORKSPACE_ROOT="${TOPDIR}"
     fi
+    OUTPUTDIR="${WORKSPACE_ROOT}/build/${CONF_NAME}"
     $MKDIR -p "$OUTPUTDIR"
     if test ! -d "$OUTPUTDIR"; then
       AC_MSG_ERROR([Could not create build directory $OUTPUTDIR])
@@ -940,6 +941,7 @@
   AC_SUBST(SPEC)
   AC_SUBST(CONF_NAME)
   AC_SUBST(OUTPUTDIR)
+  AC_SUBST(WORKSPACE_ROOT)
   AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR)
 
   # The spec.gmk file contains all variables for the make system.
--- old/make/autoconf/flags-cflags.m4	2019-04-04 15:11:54.489606175 -0700
+++ new/make/autoconf/flags-cflags.m4	2019-04-04 15:11:53.893585815 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
@@ -799,15 +799,36 @@
     $1_WARNING_CFLAGS_JVM="-Wno-format-zero-length -Wtype-limits -Wuninitialized"
   fi
 
+  # Calculate offset to use for getting relative paths from __FILE__ macro.
+  # On Windows, this needs to be a Windows path
+  windows_safe_workspace_root="${WORKSPACE_ROOT}"
+  BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([windows_safe_workspace_root])
+  # Add trailing slash if missing
+  workspace_root_trailing_slash="${windows_safe_workspace_root%/}/"
+  FILE_MACRO_OFFSET="${#workspace_root_trailing_slash}"
+  FILE_MACRO_CFLAGS="-DFILE_MACRO_OFFSET=${FILE_MACRO_OFFSET}"
+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+    # Check if compiler supports -fmacro-prefix-map. If so, use that instead
+    # of FILE_MACRO_OFFSET.
+    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [-fmacro-prefix-map=/=/],
+        PREFIX: $3,
+        IF_TRUE: [
+            FILE_MACRO_CFLAGS="-DFILE_MACRO_OFFSET=0 \
+                -fmacro-prefix-map=${workspace_root_trailing_slash}="
+        ]
+    )
+  fi
+
   # EXPORT to API
   CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
       $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
       $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
-      $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG"
+      $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS"
 
   CFLAGS_JDK_COMMON="$ALWAYS_CFLAGS_JDK $ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
       $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
-      $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK"
+      $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
+      $FILE_MACRO_CFLAGS"
 
   # Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
   # (Currently we don't have any OPENJDK_BUILD_EXTRA_CFLAGS, but that might
--- old/make/autoconf/spec.gmk.in	2019-04-04 15:11:56.009658098 -0700
+++ new/make/autoconf/spec.gmk.in	2019-04-04 15:11:55.389636919 -0700
@@ -138,7 +138,9 @@
 
 # The top-level directory of the source repository
 TOPDIR:=@TOPDIR@
-
+# Usually the top level directory, but could be something else if a custom
+# root is defined.
+WORKSPACE_ROOT:=@WORKSPACE_ROOT@
 
 IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@
 IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@
--- old/make/common/NativeCompilation.gmk	2019-04-04 15:11:58.049727786 -0700
+++ new/make/common/NativeCompilation.gmk	2019-04-04 15:11:57.433706742 -0700
@@ -236,8 +236,10 @@
     # This is the definite source file to use for $1_FILENAME.
     $1_SRC_FILE := $$($1_FILE)
 
-    ifneq ($$($1_DISABLE_THIS_FILE_DEFINE), true)
-      $1_THIS_FILE = -DTHIS_FILE='"$$($1_FILENAME)"'
+    ifneq ($$($1_DEFINE_THIS_FILE), false)
+      ifneq ($$($$($1_BASE)_DEFINE_THIS_FILE), false)
+        $1_THIS_FILE = -DTHIS_FILE='"$$($1_FILENAME)"'
+      endif
     endif
 
     ifeq ($$($1_OPTIMIZATION), )
@@ -426,6 +428,7 @@
 #   STRIPFLAGS Optionally change the flags given to the strip command
 #   PRECOMPILED_HEADER Header file to use as precompiled header
 #   PRECOMPILED_HEADER_EXCLUDE List of source files that should not use PCH
+#   DEFINE_THIS_FILE Set to false to not set the THIS_FILE preprocessor macro
 #
 # After being called, some variables are exported from this macro, all prefixed
 # with parameter 1 followed by a '_':
@@ -703,7 +706,7 @@
             FILE := $$($1_GENERATED_PCH_SRC), \
             BASE := $1, \
             EXTRA_CXXFLAGS := -Fp$$($1_PCH_FILE) -Yc$$(notdir $$($1_PRECOMPILED_HEADER)), \
-            DISABLE_THIS_FILE_DEFINE := true, \
+            DEFINE_THIS_FILE := false, \
         ))
 
         $1_USE_PCH_FLAGS := \
--- old/make/hotspot/gensrc/GensrcAdlc.gmk	2019-04-04 15:12:00.045795970 -0700
+++ new/make/hotspot/gensrc/GensrcAdlc.gmk	2019-04-04 15:11:59.433775064 -0700
@@ -76,6 +76,7 @@
       DEBUG_SYMBOLS := false, \
       DISABLED_WARNINGS_clang := tautological-compare, \
       DISABLED_WARNINGS_solstudio := notemsource, \
+      DEFINE_THIS_FILE := false, \
   ))
 
   ADLC_TOOL := $(BUILD_ADLC_TARGET)
--- old/make/hotspot/gensrc/GensrcDtrace.gmk	2019-04-04 15:12:01.505845845 -0700
+++ new/make/hotspot/gensrc/GensrcDtrace.gmk	2019-04-04 15:12:00.889824802 -0700
@@ -80,6 +80,7 @@
         EXTRA_DEPS := $(JVMTI_H) $(JFR_FILES), \
         OBJECT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets/objs, \
         OUTPUT_DIR := $(JVM_VARIANT_OUTPUTDIR)/tools/dtrace-gen-offsets, \
+        DEFINE_THIS_FILE := false, \
     ))
 
     DTRACE_GEN_OFFSETS_TOOL := $(BUILD_DTRACE_GEN_OFFSETS_TARGET)
--- old/make/hotspot/lib/CompileDtraceLibraries.gmk	2019-04-04 15:12:03.025897769 -0700
+++ new/make/hotspot/lib/CompileDtraceLibraries.gmk	2019-04-04 15:12:02.409876726 -0700
@@ -42,6 +42,7 @@
         LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
         LIBS := $(LIBDL) -lthread -ldoor, \
         OBJECT_DIR := $(LIBJVM_DTRACE_OUTPUTDIR)/objs, \
+        DEFINE_THIS_FILE := false, \
     ))
 
     # Note that libjvm_db.c has tests for COMPILER2, but this was never set by
@@ -54,6 +55,7 @@
         CFLAGS := -I$(DTRACE_GENSRC_DIR) $(JNI_INCLUDE_FLAGS) -m64 -G -mt -KPIC -xldscope=hidden, \
         LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
         OBJECT_DIR := $(LIBJVM_DB_OUTPUTDIR)/objs, \
+        DEFINE_THIS_FILE := false, \
     ))
 
     TARGETS += $(BUILD_LIBJVM_DTRACE) $(BUILD_LIBJVM_DB)
--- old/make/hotspot/lib/CompileGtest.gmk	2019-04-04 15:12:04.545949693 -0700
+++ new/make/hotspot/lib/CompileGtest.gmk	2019-04-04 15:12:03.921928377 -0700
@@ -92,6 +92,7 @@
     STRIP_SYMBOLS := false, \
     PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
     PRECOMPILED_HEADER_EXCLUDE := gtest-all.cc gtestMain.cpp, \
+    DEFINE_THIS_FILE := false, \
 ))
 
 TARGETS += $(BUILD_GTEST_LIBJVM)
@@ -115,6 +116,7 @@
     LIBS_windows := $(JVM_OUTPUTDIR)/gtest/objs/jvm.lib, \
     COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
     ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \
+    DEFINE_THIS_FILE := false, \
 ))
 
 $(BUILD_GTEST_LAUNCHER): $(BUILD_GTEST_LIBJVM)
--- old/make/hotspot/lib/CompileJvm.gmk	2019-04-04 15:12:06.074001891 -0700
+++ new/make/hotspot/lib/CompileJvm.gmk	2019-04-04 15:12:05.425979755 -0700
@@ -202,6 +202,7 @@
     VERSIONINFO_RESOURCE := $(TOPDIR)/src/hotspot/os/windows/version.rc, \
     PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
     PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
+    DEFINE_THIS_FILE := false, \
 ))
 
 # Always recompile vm_version.cpp if libjvm needs to be relinked. This ensures
--- old/src/hotspot/share/utilities/exceptions.hpp	2019-04-04 15:12:07.598053953 -0700
+++ new/src/hotspot/share/utilities/exceptions.hpp	2019-04-04 15:12:06.978032773 -0700
@@ -237,11 +237,7 @@
 // visible within the scope containing the THROW. Usually this is achieved by declaring the function
 // with a TRAPS argument.
 
-#ifdef THIS_FILE
 #define THREAD_AND_LOCATION                      THREAD, THIS_FILE, __LINE__
-#else
-#define THREAD_AND_LOCATION                      THREAD, __FILE__, __LINE__
-#endif
 
 #define THROW_OOP(e)                                \
   { Exceptions::_throw_oop(THREAD_AND_LOCATION, e);                             return;  }
--- old/src/hotspot/share/utilities/macros.hpp	2019-04-04 15:12:08.906098635 -0700
+++ new/src/hotspot/share/utilities/macros.hpp	2019-04-04 15:12:08.354079778 -0700
@@ -640,4 +640,10 @@
 #define NOT_CDS_JAVA_HEAP_RETURN_(code) { return code; }
 #endif
 
+// THIS_FILE will always be the relative path to the source file from the
+// workspace root. FILE_MACRO_OFFSET is calculated in configure to be the
+// absolute path length of the workspace root dir (or 0 if
+// -fmacro-prefix-map is used to limit the length of __FILE__).
+#define THIS_FILE (__FILE__ + FILE_MACRO_OFFSET)
+
 #endif // SHARE_UTILITIES_MACROS_HPP