Changeset 222


Ignore:
Timestamp:
Dec 29, 2010, 9:26:11 PM (15 years ago)
Author:
dmik
Message:

make: Added INITINSTANCE/TERMINSTANCE to .def files since ILINK doesn't assume that.

Location:
trunk/openjdk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/hotspot/make/os2/makefiles/shared.make

    r81 r222  
    6161endif
    6262
    63 MAKEFILE = $(word 1,$(MAKEFILE_LIST))
    64 
    6563FORCE:

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

    r219 r222  
    8181endif
    8282
    83 MAKEFILE = $(word 1,$(MAKEFILE_LIST))
    84 
    8583Def_File = vm.def
    86 $(Def_File): $(MAKEFILE)
    87         @echo -e 'EXPORTS \n \
     84$(Def_File): $(MAKEFILE_LIST)
     85        @echo -e 'LIBRARY jvm INITINSTANCE TERMINSTANCE \n \
     86EXPORTS \n \
    8887  JNI_GetDefaultJavaVMInitArgs = "_JNI_GetDefaultJavaVMInitArgs@4" \n \
    8988  JNI_CreateJavaVM = "_JNI_CreateJavaVM@12" \n \

  • trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk

    r219 r222  
    8080  endif
    8181
    82   # current makefile reference (assumes GNU make)
    83   MAKEFILE = $(word 1,$(MAKEFILE_LIST))
    84 
    8582endif
    8683

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

    r94 r222  
    6565# exports live in .def file
    6666DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    67 $(DEF_FILE): $(MAKEFILE)
     67$(DEF_FILE): $(MAKEFILE_LIST)
     68        @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
    6869        @$(ECHO) 'EXPORTS \n \
    6970  DLL_Initialize = "_DLL_Initialize@8" \n \
    70 ' > $@
     71' >> $@
    7172
    7273clean::

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

    r203 r222  
    125125# exports live in .def file
    126126DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    127 $(DEF_FILE): $(MAKEFILE)
     127$(DEF_FILE): $(MAKEFILE_LIST)
     128        @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
    128129        @$(ECHO) 'EXPORTS \n \
    129130  Agent_OnAttach = "_Agent_OnAttach@12" \n \
    130 ' > $@
     131' >> $@
    131132clean::
    132133        -$(RM) $(DEF_FILE)

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

    r118 r222  
    5454DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    5555
    56 $(DEF_FILE): $(MAKEFILE)
     56$(DEF_FILE): $(MAKEFILE_LIST)
     57        @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
    5758        @$(ECHO) 'EXPORTS \n \
    5859  Canonicalize = _Canonicalize \n \
    … …  
    8283  _winFileHandleOpen \n \
    8384  winFileHandleOpen = _winFileHandleOpen \n \
    84 ' > $@
     85' >> $@
    8586
    8687clean::

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

    r189 r222  
    104104# exports live in .def file
    105105DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    106 $(DEF_FILE): $(MAKEFILE)
     106$(DEF_FILE): $(MAKEFILE_LIST)
     107        @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
    107108        @$(ECHO) 'EXPORTS \n \
    108109  _JLI_ParseManifest \n \
    … …  
    132133  JLI_StringDup = _JLI_StringDup \n \
    133134  JLI_MemFree = _JLI_MemFree \n \
    134 ' > $@
     135' >> $@
    135136
    136137clean::

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

    r97 r222  
    7070# exports live in .def file
    7171DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    72 $(DEF_FILE): $(MAKEFILE)
     72$(DEF_FILE): $(MAKEFILE_LIST)
     73        @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
    7374        @$(ECHO) 'EXPORTS \n \
    7475  nptInitialize = "_nptInitialize@12" \n \
    7576  nptTerminate = "_nptTerminate@8" \n \
    76 ' > $@
     77' >> $@
    7778
    7879clean::

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

    r118 r222  
    7272# exports live in .def file
    7373DEF_FILE = $(OBJDIR)/$(LIBRARY).def
    74 $(DEF_FILE): $(MAKEFILE)
     74$(DEF_FILE): $(MAKEFILE_LIST)
     75        @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
    7576        @$(ECHO) 'EXPORTS \n \
    7677  ZIP_CRC32 = _ZIP_CRC32 \n \
    … …  
    8081  ZIP_ReadEntry = "_ZIP_ReadEntry@16" \n \
    8182  ZIP_GetNextEntry = "_ZIP_GetNextEntry@8" \n \
    82 ' > $@
     83' >> $@
    8384clean::
    8485        -$(RM) $(DEF_FILE)
Note: See TracChangeset for help on using the changeset viewer.