# HG changeset patch
# User ihse
# Date 1421332856 -3600
# Node ID 75a20253de17adc8b127ce697e28fe831f5540b3
# Parent  3b985eeacb08f08e6eaaaf36c44a3f23e50c35a9
8069063: More merge errors following JDK-8049367
Reviewed-by: erikj

diff -r 3b985eeacb08 -r 75a20253de17 make/common/NativeCompilation.gmk
--- a/make/common/NativeCompilation.gmk	Thu Jan 15 15:09:37 2015 +0100
+++ b/make/common/NativeCompilation.gmk	Thu Jan 15 15:40:56 2015 +0100
@@ -577,7 +577,7 @@
 
     $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE) \
         $$($1_DEBUGINFO_EXTRA_DEPS)
-		$$(call LINKING_MSG,$$($1_BASENAME))
+		$(ECHO) $(LOG_INFO) "Linking $$($1_BASENAME)"
 		$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(SYSROOT_LDFLAGS) \
 		    $(LD_OUT_OPTION)$$@ \
 		    $$($1_EXPECTED_OBJS) $$($1_RES) \
@@ -605,7 +605,7 @@
 
     $$($1_TARGET): $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) \
         $$($1_DEBUGINFO_EXTRA_DEPS)
-		$$(call LINKING_EXE_MSG,$$($1_BASENAME))
+		$(ECHO) $(LOG_INFO) "Linking executable $$($1_BASENAME)"
 		$$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(SYSROOT_LDFLAGS) \
 		    $(EXE_OUT_OPTION)$$($1_TARGET) \
 		    $$($1_EXPECTED_OBJS) $$($1_RES) \