Changeset 447

Timestamp:

Aug 27, 2016, 10:10:17 PM (9 years ago)

Author:

dmik

Message:

Fix more echo -e issues (addon to r444).

Location:

trunk/openjdk

Files:

• hotspot/make/os2/makefiles/vm.make (modified) (1 diff)
• jdk/make/java/hpi/windows/Makefile (modified) (1 diff)
• jdk/make/java/instrument/Makefile (modified) (1 diff)
• jdk/make/java/java/Makefile (modified) (1 diff)
• jdk/make/java/jli/Makefile (modified) (1 diff)
• jdk/make/java/npt/Makefile (modified) (1 diff)
• jdk/make/java/zip/Makefile (modified) (1 diff)
• jdk/make/jpda/transport/shmem/Makefile (modified) (1 diff)
• jdk/make/jpda/transport/socket/Makefile (modified) (1 diff)
• jdk/make/sun/image/generic/Makefile (modified) (1 diff)

trunk/openjdk/hotspot/make/os2/makefiles/vm.make

@@ -83 +83 @@
 AGCT_EXPORT=
 else
-AGCT_EXPORT=_AsyncGetCallTrace \n  AsyncGetCallTrace = _AsyncGetCallTrace \n
+AGCT_EXPORT=_AsyncGetCallTrace\n  AsyncGetCallTrace=_AsyncGetCallTrace\n
 endif
 
 Def_File = vm.def
 $(Def_File): $(MAKEFILE)
-        @printf 'LIBRARY jvm INITINSTANCE TERMINSTANCE \n \
-EXPORTS \n \
-  _jio_snprintf \n \
-  _jio_printf \n \
-  _jio_fprintf \n \
-  _jio_vfprintf \n \
-  _jio_vsnprintf \n \
-  $(AGCT_EXPORT) \
-' > $(Def_File)
+        @printf "LIBRARY jvm INITINSTANCE TERMINSTANCE\n\
+EXPORTS\n\
+  _jio_snprintf\n\
+  _jio_printf\n\
+  _jio_fprintf\n\
+  _jio_vfprintf\n\
+  _jio_vsnprintf\n\
+  $(AGCT_EXPORT)\
+" > $(Def_File)
 
 LINK_FLAGS += -Zdll

trunk/openjdk/jdk/make/java/hpi/windows/Makefile

@@ -66 +66 @@
 
 ifeq ($(PLATFORM),os2)
-
 # exports live in .def file
 DEF_FILE = $(OBJDIR)/$(LIBRARY).def
 $(DEF_FILE): $(MAKEFILE_LIST)
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
-        @$(ECHO) 'EXPORTS \n \
-  DLL_Initialize \n \
-' >> $@
-
+        @$(ECHO) "EXPORTS\n  DLL_Initialize\n" >> $@
 clean::
         -$(RM) $(DEF_FILE)
-
 endif
 

trunk/openjdk/jdk/make/java/instrument/Makefile

@@ -129 +129 @@
 $(DEF_FILE): $(MAKEFILE_LIST)
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
-        @$(ECHO) 'EXPORTS \n \
-  Agent_OnAttach \n \
-' >> $@
+        @$(ECHO) "EXPORTS\n  Agent_OnAttach\n" >> $@
 clean::
         -$(RM) $(DEF_FILE)

trunk/openjdk/jdk/make/java/java/Makefile

@@ -56 +56 @@
 $(DEF_FILE): $(MAKEFILE_LIST)
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
-        @$(ECHO) 'EXPORTS \n \
-  Canonicalize = _Canonicalize \n \
-  getEncodingFromLangID = _getEncodingFromLangID \n \
-  getJavaIDFromLangID = _getJavaIDFromLangID \n \
-  GetStringPlatformChars = _GetStringPlatformChars \n \
-  _handleLseek \n \
-  _handleRead \n \
-  _handleSync \n \
-  _handleWrite \n \
-  handleLseek = _handleLseek \n \
-  handleRead = _handleRead \n \
-  handleSync = _handleSync \n \
-  handleWrite = _handleWrite \n \
-  JDK_GetVersionInfo0 = _JDK_GetVersionInfo0 \n \
-  _jio_fprintf \n \
-  _jio_snprintf \n \
-  jio_fprintf = _jio_fprintf \n \
-  jio_snprintf = _jio_snprintf \n \
-  NewStringPlatform = _NewStringPlatform \n \
-  VerifyClassCodesForMajorVersion = _VerifyClassCodesForMajorVersion \n \
-  VerifyClassCodes = _VerifyClassCodes \n \
-  _winFileHandleOpen \n \
-  winFileHandleOpen = _winFileHandleOpen \n \
-' >> $@
+        @$(ECHO) "EXPORTS\n\
+  Canonicalize = _Canonicalize\n\
+  getEncodingFromLangID = _getEncodingFromLangID\n\
+  getJavaIDFromLangID = _getJavaIDFromLangID\n\
+  GetStringPlatformChars = _GetStringPlatformChars\n\
+  _handleLseek\n\
+  _handleRead\n\
+  _handleSync\n\
+  _handleWrite\n\
+  handleLseek = _handleLseek\n\
+  handleRead = _handleRead\n\
+  handleSync = _handleSync\n\
+  handleWrite = _handleWrite\n\
+  JDK_GetVersionInfo0 = _JDK_GetVersionInfo0\n\
+  _jio_fprintf\n\
+  _jio_snprintf\n\
+  jio_fprintf = _jio_fprintf\n\
+  jio_snprintf = _jio_snprintf\n\
+  NewStringPlatform = _NewStringPlatform n\
+  VerifyClassCodesForMajorVersion = _VerifyClassCodesForMajorVersion\n\
+  VerifyClassCodes = _VerifyClassCodes\n\
+  _winFileHandleOpen\n\
+  winFileHandleOpen = _winFileHandleOpen\n\
+" >> $@
 
 clean::

trunk/openjdk/jdk/make/java/jli/Makefile

@@ -106 +106 @@
 $(DEF_FILE): $(MAKEFILE_LIST)
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
-        @$(ECHO) 'EXPORTS \n \
-  _JLI_ParseManifest \n \
-  _JLI_JarUnpackFile \n \
-  _JLI_FreeManifest \n \
-  _JLI_ManifestIterate \n \
-  _JLI_ExactVersionId \n \
-  _JLI_PrefixVersionId \n \
-  _JLI_AcceptableRelease \n \
-  _JLI_ValidVersionString \n \
-  _JLI_WildcardExpandClasspath \n \
-  _JLI_MemAlloc \n \
-  _JLI_MemRealloc \n \
-  _JLI_StringDup \n \
-  _JLI_MemFree \n \
-  JLI_ParseManifest = _JLI_ParseManifest \n \
-  JLI_JarUnpackFile = _JLI_JarUnpackFile \n \
-  JLI_FreeManifest = _JLI_FreeManifest \n \
-  JLI_ManifestIterate = _JLI_ManifestIterate \n \
-  JLI_ExactVersionId = _JLI_ExactVersionId \n \
-  JLI_PrefixVersionId = _JLI_PrefixVersionId \n \
-  JLI_AcceptableRelease = _JLI_AcceptableRelease \n \
-  JLI_ValidVersionString = _JLI_ValidVersionString \n \
-  JLI_WildcardExpandClasspath = _JLI_WildcardExpandClasspath \n \
-  JLI_MemAlloc = _JLI_MemAlloc \n \
-  JLI_MemRealloc = _JLI_MemRealloc \n \
-  JLI_StringDup = _JLI_StringDup \n \
-  JLI_MemFree = _JLI_MemFree \n \
-' >> $@
+        @$(ECHO) "EXPORTS\n\
+  _JLI_ParseManifest\n\
+  _JLI_JarUnpackFile\n\
+  _JLI_FreeManifest\n\
+  _JLI_ManifestIterate\n\
+  _JLI_ExactVersionId\n\
+  _JLI_PrefixVersionId\n\
+  _JLI_AcceptableRelease\n\
+  _JLI_ValidVersionString\n\
+  _JLI_WildcardExpandClasspath\n\
+  _JLI_MemAlloc\n\
+  _JLI_MemRealloc\n\
+  _JLI_StringDup\n\
+  _JLI_MemFree\n\
+  JLI_ParseManifest = _JLI_ParseManifest\n\
+  JLI_JarUnpackFile = _JLI_JarUnpackFile\n\
+  JLI_FreeManifest = _JLI_FreeManifest\n\
+  JLI_ManifestIterate = _JLI_ManifestIterate\n\
+  JLI_ExactVersionId = _JLI_ExactVersionId\n\
+  JLI_PrefixVersionId = _JLI_PrefixVersionId\n\
+  JLI_AcceptableRelease = _JLI_AcceptableRelease\n\
+  JLI_ValidVersionString = _JLI_ValidVersionString\n\
+  JLI_WildcardExpandClasspath = _JLI_WildcardExpandClasspath\n\
+  JLI_MemAlloc = _JLI_MemAlloc\n\
+  JLI_MemRealloc = _JLI_MemRealloc\n\
+  JLI_StringDup = _JLI_StringDup\n\
+  JLI_MemFree = _JLI_MemFree\n\
+" >> $@
 
 clean::

trunk/openjdk/jdk/make/java/npt/Makefile

@@ -76 +76 @@
 $(DEF_FILE): $(MAKEFILE_LIST)
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
-        @$(ECHO) 'EXPORTS \n \
-  nptInitialize \n \
-  nptTerminate \n \
-' >> $@
+        @$(ECHO) "EXPORTS\n\
+  nptInitialize\n\
+  nptTerminate\n\
+" >> $@
 
 clean::

trunk/openjdk/jdk/make/java/zip/Makefile

@@ -79 +79 @@
 $(DEF_FILE): $(MAKEFILE_LIST)
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
-        @$(ECHO) 'EXPORTS \n \
-  ZIP_CRC32 = _ZIP_CRC32 \n \
-  ZIP_Open \n \
-  ZIP_Close \n \
-  ZIP_FindEntry \n \
-  ZIP_ReadEntry \n \
-  ZIP_GetNextEntry \n \
-' >> $@
+        @$(ECHO) "EXPORTS\n\
+  ZIP_CRC32 = _ZIP_CRC32\n\
+  ZIP_Open\n\
+  ZIP_Close\n\
+  ZIP_FindEntry\n\
+  ZIP_ReadEntry\n\
+  ZIP_GetNextEntry\n\
+" >> $@
 clean::
         -$(RM) $(DEF_FILE)

trunk/openjdk/jdk/make/jpda/transport/shmem/Makefile

@@ -84 +84 @@
 $(DEF_FILE): $(MAKEFILE_LIST)
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
-        @$(ECHO) 'EXPORTS \n \
-  jdwpTransport_OnLoad \n \
-' >> $@
+        @$(ECHO) "EXPORTS\n\
+  jdwpTransport_OnLoad\n\
+" >> $@
 
 clean::

trunk/openjdk/jdk/make/jpda/transport/socket/Makefile

@@ -98 +98 @@
 $(DEF_FILE): $(MAKEFILE_LIST)
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
-        @$(ECHO) 'EXPORTS \n \
-  jdwpTransport_OnLoad \n \
-' >> $@
+        @$(ECHO) "EXPORTS\n\
+  jdwpTransport_OnLoad\n\
+" >> $@
 
 clean::

trunk/openjdk/jdk/make/sun/image/generic/Makefile

@@ -61 +61 @@
 $(DEF_FILE): $(MAKEFILE_LIST)
         @$(ECHO) "LIBRARY $(LIBRARY_NAME) INITINSTANCE TERMINSTANCE" > $@
-        @$(ECHO) 'EXPORTS \n \
-  j2d_mlib_ImageConvMxN = _j2d_mlib_ImageConvMxN \n \
-  j2d_mlib_ImageConvKernelConvert = _j2d_mlib_ImageConvKernelConvert \n \
-  j2d_mlib_ImageCreateStruct = _j2d_mlib_ImageCreateStruct \n \
-  j2d_mlib_ImageCreate = _j2d_mlib_ImageCreate \n \
-  j2d_mlib_ImageDelete = _j2d_mlib_ImageDelete \n \
-  j2d_mlib_ImageAffine = _j2d_mlib_ImageAffine \n \
-  j2d_mlib_ImageLookUp = _j2d_mlib_ImageLookUp \n \
-' >> $@
+        @$(ECHO) "EXPORTS\n\
+  j2d_mlib_ImageConvMxN = _j2d_mlib_ImageConvMxN\n\
+  j2d_mlib_ImageConvKernelConvert = _j2d_mlib_ImageConvKernelConvert\n\
+  j2d_mlib_ImageCreateStruct = _j2d_mlib_ImageCreateStruct\n\
+  j2d_mlib_ImageCreate = _j2d_mlib_ImageCreate\n\
+  j2d_mlib_ImageDelete = _j2d_mlib_ImageDelete\n\
+  j2d_mlib_ImageAffine = _j2d_mlib_ImageAffine\n\
+  j2d_mlib_ImageLookUp = _j2d_mlib_ImageLookUp\n\
+" >> $@
 
 clean::