[vector]RFR(M): 8244866: Build of vectorIntrinsics branch fails on Windows

[Viswanathan, Sandhya]

Hi Shravya,

The patch looks good. Thanks for fixing this.

Best Regards,
Sandhya

From: Rukmannagari, Shravya <shravya.rukmannagari at intel.com>
Sent: Wednesday, May 20, 2020 6:30 PM
To: panama-dev <panama-dev at openjdk.java.net>
Cc: Aundhe, Shirish <shirish.aundhe at intel.com>; Viswanathan, Sandhya <sandhya.viswanathan at intel.com>; Rukmannagari, Shravya <shravya.rukmannagari at intel.com>
Subject: [vector]RFR(M): 8244866: Build of vectorIntrinsics branch fails on Windows

Hi All,
Please find the patch below which fixes the Windows build for vectorIntrinsics branch. Please let me know if you have any questions or comments.
BugID: https://bugs.openjdk.java.net/browse/JDK-8244866

--- old/make/common/NativeCompilation.gmk  2020-05-20 18:12:11.737612500 -0700
+++ new/make/common/NativeCompilation.gmk            2020-05-20 18:12:11.071980700 -0700
@@ -430,20 +430,20 @@
           # on Windows. No need to save exit code from compilation since
           # pipefail is always active on Windows.
           ifeq ($$(filter %.s, $$($1_FILENAME)), )
-                $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-                       $$($1_COMPILER) -showIncludes $$($1_COMPILE_OPTIONS))) \
-                       | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
+                $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
+                    $$($1_COMPILER) -showIncludes $$($1_COMPILE_OPTIONS))) \
+                    | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
                         -e "^$$($1_FILENAME)$$$$" || test "$$$$?" = "1" ; \
-                     $(ECHO) $$@: \\ > $$($1_DEPS_FILE) ; \
-                     $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_OBJ).log \
-                       | $(SORT) -u >> $$($1_DEPS_FILE) ; \
-                     $(ECHO) >> $$($1_DEPS_FILE) ; \
-                     $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) > $$($1_DEPS_TARGETS_FILE)
+                $(ECHO) $$@: \\ > $$($1_DEPS_FILE) ; \
+                $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_OBJ).log \
+                    | $(SORT) -u >> $$($1_DEPS_FILE) ; \
+                $(ECHO) >> $$($1_DEPS_FILE) ; \
+                $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) > $$($1_DEPS_TARGETS_FILE)
           else
-                     # For assembler calls, no need to build dependency list.
-                $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-                       $$($1_COMPILER) $$($1_FLAGS) \
-                         $(CC_OUT_OPTION)$$($1_OBJ) /Ta $$($1_SRC_FILE)))
+            # For assembler calls, no need to build dependency list.
+                $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
+                    $$($1_COMPILER) $$($1_FLAGS) \
+                      $(CC_OUT_OPTION)$$($1_OBJ) /Ta $$($1_SRC_FILE)))
           endif
         endif
   endif

Thanks,
Shravya.