Changeset 1564

Timestamp:

Oct 10, 2004, 4:52:31 AM (21 years ago)

Author:

bird

Message:

...

Location:

trunk/src/emx/src

Files:

• emximp/emximp.c (modified) (3 diffs, 1 prop)
• lib/libc.def (modified) (1 diff, 1 prop)
• lib/libc.smak (modified) (7 diffs, 1 prop)
• libend/386/end.asm (modified) (2 diffs, 1 prop)
• libos2/os2.smak (modified) (1 diff, 1 prop)

trunk/src/emx/src/emximp/emximp.c

@@ -567 +567 @@
 
 
+static unsigned hash (const char *name)
+{
+  unsigned h = 0;
+  for (; *name; name++)
+    h = (h << 2) ^ (unsigned char)*name;
+  return h;
+}
+
 static void set_ar (char *dst, const char *src, int size)
 {
@@ -913 +921 @@
       aout_dreloc (aout_data_size, N_TEXT, 0, 2, 0); /* pfn: .long resolve */
       aout_data_dword (off_resolver);
-      sprintf (tmp1, "LAZYIMP#%ld", seq_no);
+      sprintf (tmp1, "LAZY#%ld#%x", seq_no, hash (func_name));
     }
   /*
@@ -951 +959 @@
       aout_sym (tmp2, N_IMP1|N_EXT, 0, 0, 0);
       aout_sym (tmp3, N_IMP2|N_EXT, 0, 0, 0);
-      sprintf (tmp1, "IMPORT#%ld", seq_no);
+      sprintf (tmp1, "IMPORT#%ld#%x", seq_no, hash (func_name));
     }
 

trunk/src/emx/src/lib/libc.def

@@ -1207 +1207 @@
     "___lazyldr_uconv_resolver" @1231
     "___lazyldr_libuni_resolver" @1232
+

trunk/src/emx/src/lib/libc.smak

@@ -107 +107 @@
         $(LIBC.OBJS.COMMON)
 LIBC.LIBS       := $.omf/libc_s.lib $.omf/libc_app.lib
-LIBC.DEPS       := $(LIBC.STUB) $.omf/libc_alias.lib
+LIBC.DEPS       := $(LIBC.STUB) $.omf/libc_alias.lib $.omf/liblazyimp.lib $.omf-lazy/libos2_unicode_lazy.lib $.omf/libos2.lib
 LIBC.DLL.OBJS   :=
 LIBC.DIRS       := $(sort $(dir $(LIBC.OBJS) $(LIBC.DEPS) $(LIBC.DLL.OBJS)))
@@ -117 +117 @@
         $(subst /omf/,/omf-prof/,$(LIBC.OBJS.COMMON))
 LIBC.PRF.LIBS   := $.omf-prof/libc_p_s.lib $.omf-prof/libc_app_p.lib
-LIBC.PRF.DEPS   := $(LIBC.DEPS)
+LIBC.PRF.DEPS   := $(LIBC.STUB) $.omf/libc_alias.lib $.omf-prof/liblazyimp_p.lib $.omf-lazy/libos2_unicode_lazy.lib $.omf-prof/libos2_p.lib
 LIBC.PRF.DIRS   := $(sort $(dir $(LIBC.PRF.OBJS) $(LIBC.PRF.DEPS)))
 
@@ -156 +156 @@
                 $(LIBC.OBJS) \
                 $(LIBC.LIBS) \
-                -L$.omf -L$.omf-lazy -lgcc -lgcc_eh -lc_alias -los2_unicode_lazy -llazyimp -los2 -lend $(LIBC.STUBARG)
+                $(filter %.lib,$(LIBC.DEPS)) \
+                -L$.omf -lgcc -lgcc_eh $.omf/libend.lib $(LIBC.STUBARG)
 ifeq ($(MODE),opt)      
         cp $@ $(@:.dll=.dbg)
@@ -188 +189 @@
                 $(LIBC.LOG.OBJS) \
                 $(LIBC.LOG.LIBS) \
-                -L$.omf -L$.omf-lazy -lgcc -lgcc_eh -lc_alias -los2_unicode_lazy -llazyimp -los2 -lend $(LIBC.STUBARG)
+                $(filter %.lib,$(LIBC.LOG.DEPS)) \
+                -L$.omf -lgcc -lgcc_eh $.omf/libend.lib $(LIBC.STUBARG)
         echo $@         
 
 # LIBC.PRF - Profiling version of libcXY.dll
-## @todo: use os2_p, but that appeares to be broken at the moment.
 $(LIBC.PRF.DLL): $(LIBC.PRF.OBJS) $(LIBC.PRF.LIBS) $(LIBC.PRF.DEF) $(LIBC.PRF.DEPS)
         $(LD) -o $@ -Zomf $(subst -s,,$(LDFLAGS.DLL)) -Zmap=$@.map -nostdlib  \
@@ -198 +199 @@
                 $(LIBC.PRF.OBJS) \
                 $(LIBC.PRF.LIBS) \
-                -L$.omf -L$.omf-lazy -lgcc -lgcc_eh -lc_alias -los2_unicode_lazy -llazyimp -los2 -lend $(LIBC.STUBARG)
+                $(filter %.lib,$(LIBC.PRF.DEPS)) \
+                -L$.omf-prof -L$.omf -lgcc -lgcc_eh $.omf/libend.lib $(LIBC.STUBARG)
         echo $@         
 
@@ -218 +220 @@
                 $(LIBC.ELH.OBJS) \
                 $(LIBC.ELH.LIBS) \
-                -L$.omf -L$.omf-lazy -lgcc -lgcc_eh -lc_alias -los2_unicode_lazy -llazyimp -los2 -lend $(LIBC.STUBARG)
+                $(filter %.lib,$(LIBC.ELH.DEPS)) \
+                -L$.omf -lgcc -lgcc_eh $.omf/libend.lib $(LIBC.STUBARG)
         echo $@         
 
@@ -224 +227 @@
 # Man! This sucks! Isn't there support for inline files (<<\nfile\n<<) in GNU MAKE?
 # Even M$/IBM nmake     have that. ;-)
-# And no, I couldn't care less about performance with this type of DLL.
+# And no, I couldn't care less about performance with this type of DLL. No need for ordinals.
 $(LIBC.ELH.DEF): $(LIBC.DEF) src/lib/libc.smak
         $(call RM,$@)

trunk/src/emx/src/libend/386/end.asm

@@ -4 +4 @@
 
                 PUBLIC  _end
+                PUBLIC  _edata
+                PUBLIC  _etext
+
+TEXT32          SEGMENT PUBLIC USE32 'BSS'
+TEXT32          ENDS
+
+________CODE    SEGMENT PUBLIC USE32 'CODE'
+_etext          db 0cch
+________CODE    ENDS
+
+CGROUP          GROUP TEXT32, ________CODE
+
+
+DATA32          SEGMENT PUBLIC USE32 'DATA'
+DATA32          ENDS
+
+________DATA    SEGMENT PUBLIC USE32 'BSS'
+_edata          db 0
+________DATA    ENDS
+
 
 c_common        SEGMENT PUBLIC USE32 'BSS'
@@ -12 +32 @@
 ________BSS     ENDS
 
-DGROUP          GROUP   c_common, ________BSS
+DGROUP          GROUP   DATA32, ________DATA, c_common, ________BSS
 
                 END

trunk/src/emx/src/libos2/os2.smak

@@ -17 +17 @@
 .TARGET := libos2_p.a
 .TKIND  := aout prof
+.IMPS   := $(wildcard src/libos2/*.imp)
 .TCF    := -Wno-unused
 include mkimplib.smak