Changeset 259 for trunk/src

Timestamp:

May 28, 2003, 3:41:18 PM (22 years ago)

Author:

zap

Message:

See changelog.

Location:

trunk/src

Files:

• emx/Makefile (modified) (6 diffs, 1 prop)
• emx/include/include.smak (modified) (2 diffs, 1 prop)
• emx/include/sys/uio.h (modified) (1 diff, 1 prop)
• emx/mkexe.smak (modified) (1 diff, 1 prop)
• emx/mkomflib.smak (modified) (3 diffs, 1 prop)
• emx/src/emxbind/emxbind.smak (modified) (1 diff, 1 prop)
• emx/src/emxbind/exec.c (modified) (1 diff, 1 prop)
• emx/src/emxexp/emxexp.c (modified) (1 diff, 1 prop)
• emx/src/ld/ld.c (modified) (7 diffs, 1 prop)
• emx/src/lib/alias/alias.smak (modified) (2 diffs, 1 prop)
• emx/src/lib/dlfcn/dl.smak (modified) (1 diff, 1 prop)
• emx/src/lib/io/clearerr.c (modified) (1 diff, 1 prop)
• emx/src/lib/libc.smak (modified) (1 diff, 1 prop)
• emx/src/lib/os2_386/os2.smak (modified) (1 diff, 1 prop)
• emx/src/lib/socket/socket.smak (modified) (1 diff, 1 prop)
• emx/src/lib/startup/startup.smak (modified) (1 diff, 1 prop)
• emx/src/libdl/dl.smak (modified) (1 diff, 1 prop)
• emx/src/libos2/os2.smak (modified) (1 diff, 1 prop)
• emx/src/libsocket/socket.smak (modified) (1 diff, 1 prop)
• gcc/gcc/config/i386/xm-emx.h (modified) (1 diff, 1 prop)

trunk/src/emx/Makefile

@@ -70 +70 @@
 LDFLAGS.DLL = $(LDFLAGS) -Zdll
 # Linker flags for different build modes
-LDFLAGS.opt = -s
+LDFLAGS.opt = -s -Zcrtdll=c_dll -Zstack 64
 LDFLAGS.dbg = -g
 LDFLAGS.aout =
-LDFLAGS.omf = -Zomf -Zsys -Zsmall-conv -Zlinker /PM:VIO
+LDFLAGS.omf = -Zomf -Zsys -Zlinker /PM:VIO
 LDFLAGS.prof = -pg
 # Linker flags for different kinds of target
@@ -82 +82 @@
 DO.LINK.dll = $(LD) $(strip $(LDFLAGS.DLL) $(filter-out -l%,$1)) -o $@ $(^O) $(^DEF) $(^LIB) $(filter -l%,$1)
 
+# Pack executables and DLLs right after they are linked
+ifeq ($(MODE),opt)
+DO.LINK.exe += $(NL)lxlite $@
+DO.LINK.dll += $(NL)lxlite $@
+endif
+
 # emxbind tool
 #EMXBIND = $(call FINDTOOL,emxbind)
 EMXBIND = $.$(TOOLFMT)/emxbind$E
-EMXBIND.DEPON = emxbind $.$(TOOLFMT)/emxbind$E
 # emxbind flags
-EMXBINDFLAGS = -q $(EMXBINDFLAGS.$(MODE))
+EMXBINDFLAGS = -bq $(EMXBINDFLAGS.$(MODE))
 EMXBINDFLAGS.opt = -s
 EMXBINDFLAGS.dbg =
@@ -109 +114 @@
 #EMXEXP = $(call FINDTOOL,emxexp)
 EMXEXP = $.$(TOOLFMT)/emxexp$E
-EMXEXP.DEPON = emxexp $.$(TOOLFMT)/emxexp$E
 EMXEXPFLAGS = -u
 DO.EMXEXP = $(EMXEXP) $(strip $(EMXEXPFLAGS) $1) $^ | sed -e "/^$$/d" -e "/^ *;/d" | sort -d >>$@
@@ -116 +120 @@
 #IMPLIB = $(call FINDTOOL,emximp)
 IMPLIB = $.$(TOOLFMT)/emximp$E
-EMXIMP.DEPON = emximp $.$(TOOLFMT)/emximp$E
 IMPLIBFLAGS.prof = -m
 IMPLIBFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(IMPLIBFLAGS.$x))
@@ -131 +134 @@
 # We must use FINDTOOL here 'cause of the two libs which emxomf depends on
 EMXOMF = $(call FINDTOOL,emxomf)
-EMXOMF.DEPON = emxomf $.$(TOOLFMT)/emxomf$E
 DO.EMXOMF = $(EMXOMF) $(strip $1 -o) $@ $<
 
@@ -273 +275 @@
 
 # The general a.out -> OMF conversion rule for object files
-$.omf/%.obj: $.aout/%.o
+$.omf/%.obj:
         $(call DO.EMXOMF)
 
 # The general a.out -> OMF conversion rule for libraries
-$.omf%.lib: $.aout%.a
+$.omf%.lib:
         $(call DO.EMXOMF)
 

trunk/src/emx/include/include.smak

@@ -6 +6 @@
 $(INS)include/sys/%.h: include/sys/%.h
         $(call CP,$<,$@)
-                        
+
 INS.FILES += $(addprefix $(INS), $(wildcard include/386/*.h))
 $(INS)include/386/%.h: include/386/%.h
         $(call CP,$<,$@)
-        
+
 INS.FILES += $(addprefix $(INS), $(wildcard include/arpa/*.h))
 $(INS)include/arpa/%.h: include/arpa/%.h
         $(call CP,$<,$@)
-        
+
 INS.FILES += $(addprefix $(INS), $(wildcard include/machine/*.h))
 $(INS)include/machine/%.h: include/machine/%.h
         $(call CP,$<,$@)
-                        
+
 INS.FILES += $(addprefix $(INS), $(wildcard include/net/*.h))
 $(INS)include/net/%.h: include/net/%.h
         $(call CP,$<,$@)
-                        
+
 INS.FILES += $(addprefix $(INS), $(wildcard include/netinet/*.h))
 $(INS)include/netinet/%.h: include/netinet/%.h
@@ -30 +30 @@
 $(INS)include/netnb/%.h: include/netnb/%.h
         $(call CP,$<,$@)
-                        
+
 INS.FILES += $(addprefix $(INS), $(wildcard include/protocol/*.h))
 $(INS)include/protocol/%.h: include/protocol/%.h
         $(call CP,$<,$@)
-        
+
 INS.FILES += $(addprefix $(INS), $(wildcard include/protocols/*.h))
 $(INS)include/protocols/%.h: include/protocols/%.h
         $(call CP,$<,$@)
 
-        
 INS.FILES += $(addprefix $(INS), $(wildcard include/bsd/*.h))
 $(INS)include/bsd/%.h: include/bsd/%.h
         $(call CP,$<,$@)
-                        
+
 INS.FILES += $(addprefix $(INS), $(wildcard include/emx/*.h))
 $(INS)include/emx/%.h: include/emx/%.h
         $(call CP,$<,$@)
-                        
+
 INS.FILES += $(addprefix $(INS), $(wildcard include/gnu/*.h))
 $(INS)include/gnu/%.h: include/gnu/%.h
         $(call CP,$<,$@)
-        
+
 #INS.FILES += $(addprefix $(INS), $(wildcard include/objc/*.h))
 #$(INS)include/objc/%.h: include/objc/%.h
 #       $(call CP,$<,$@)
-

trunk/src/emx/include/sys/uio.h

@@ -52 +52 @@
 /* @} */
 
-int _System readv (int, __const__ struct iovec *, int);
-int _System writev (int, __const__ struct iovec *, int);
+//@@@ name conflict - a.z. int _System readv (int, __const__ struct iovec *, int);
+//@@@ name conflict - a.z. int _System writev (int, __const__ struct iovec *, int);
 
 #if defined (__cplusplus)

trunk/src/emx/mkexe.smak

@@ -10 +10 @@
 RULES += \
         $(call FECHO,_@,$$.$(.TARG): $(.OBJS) $(.DEPS))$(NL)\
-        $(call FECHO,_@,        $$(DO.LINK.exe) $(.TLDF))$(NL)
+        $(call FECHO,_@,        $$(call DO.LINK.exe,$(.TLDF)))$(NL)
 
 include comend.smak

trunk/src/emx/mkomflib.smak

@@ -5 +5 @@
 ifneq ($(findstring aout,$(.TKIND)),)
 
-# Remove the .a suffix from library name
-.TARGET := $(patsubst %.a,%,$(.TARGET))
+# Remove the .a suffix from library name and append .lib instead
+.TARGET := $(patsubst %.a,%.lib,$(.TARGET))
 
 # Replace 'aout' with 'omf' in .TKIND
@@ -14 +14 @@
 .TKIND.DIR := $(subst $(SPACE),-,$(.TKIND))/
 
-# Append the .lib suffix to target name
-.TARGET := $(.TARGET).lib
-
 # Compute the name of target file to build
 .TARG@OMF := $(.TKIND.DIR)$(.TARGET)
@@ -23 +20 @@
 .PHONY: $(.MODULE)@omf
 
+# Add this module to the list of all modules
 MODULES += $(.MODULE)@omf
+# ... and to the list of libraries
+libs: $(.MODULE)@omf
 
 INS.FILES += $(INS)$(.INSDIR)$(.TARGET)

trunk/src/emx/src/emxbind/emxbind.smak

@@ -7 +7 @@
 .TKIND  := $(TOOLFMT)
 .TSRC   := $(wildcard src/emxbind/*.c)
-.TCF    := $(CFLAGS.DEF.VERSION)
+# -fno-inline because of a bug in 3.2.2 optimizer :-(
+.TCF    := $(CFLAGS.DEF.VERSION) -fno-inline
 .TLDF   := -lmoddef
 .TKEEP  := 1

trunk/src/emx/src/emxbind/exec.c

@@ -154 +154 @@
   my_read (&stub_h1, sizeof (stub_h1), &stub_file);
   if (stub_h1.magic != 0x5a4d)
-    error ("invalid <emx>.exe");
+    error ("invalid stub file");
   src_image = (long)stub_h1.hdr_size << 4;
   stub_size = ((long)stub_h1.pages << 9) - src_image;

trunk/src/emx/src/emxexp/emxexp.c

@@ -207 +207 @@
         export (name);
       }
-    else if ((sym_ptr[i].n_type == N_EXT ||
-              sym_ptr[i].n_type == (N_BSS|N_EXT) ||
-              (weak_flag && sym_ptr[i].n_type == N_WEAKB)) &&
-             sym_ptr[i].n_value != 0)
+    else if (sym_ptr[i].n_type == (N_BSS|N_EXT) ||
+             (weak_flag && sym_ptr[i].n_type == N_WEAKB))
       {
         name = str_ptr + sym_ptr[i].n_un.n_strx;

trunk/src/emx/src/ld/ld.c

@@ -2538 +2538 @@
 {
   register int i;
-  int setv_fill_count;
+  int setv_fill_count = 0;
 
   if (trace_files)
@@ -2888 +2888 @@
   fprintf (outfile, "\nFiles:\n\n");
 
-  each_file (describe_file_sections, outfile);
+  each_file (describe_file_sections, (int)outfile);
 
   fprintf (outfile, "\nGlobal symbols:\n\n");
@@ -2906 +2906 @@
     }
 
-  each_file (list_file_locals, outfile);
+  each_file (list_file_locals, (int)outfile);
 }
 
@@ -3323 +3323 @@
   struct line_debug_entry *text_scan, *data_scan;
   int i;
-  char *errfmt, *file_name;
-  int line_number;
+  char *errfmt, *file_name = NULL;
+  int line_number = 0;
   int dont_allow_symbol_name;
 
@@ -3472 +3472 @@
     return;
 
-  each_file (do_file_warnings, outfile);
+  each_file (do_file_warnings, (int)outfile);
 
   if (list_unresolved_refs || list_multiple_defs)
@@ -3492 +3492 @@
 initialize_a_out_text_start ()
 {
-  int magic;
+  int magic = 0;
 
   switch (output_style)
@@ -4652 +4652 @@
   /* Write the local symbols defined by the various files.  */
 
-  each_file (write_file_syms, &syms_written);
+  each_file (write_file_syms, (int)&syms_written);
   file_close ();
 

trunk/src/emx/src/lib/alias/alias.smak

@@ -16 +16 @@
 ALIAS.FUNCS = $(shell gawk -f src/lib/alias/aliasfuncs.awk $. _)
 ALIAS._FUNCS = $(shell gawk -f src/lib/alias/aliasfuncs.awk $. __)
-
-$(.MODULE): $.$(.TARG)
 
 DO.STDALIAS = \
@@ -40 +38 @@
           $(addsuffix .o,$(ALIAS.FUNCS) $(addprefix _,$(ALIAS._FUNCS)))))
 
+include mkomflib.smak
 include comend.smak

trunk/src/emx/src/lib/dlfcn/dl.smak

@@ -4 +4 @@
 .MODULE := libdl
 .MDESC  := The dynamic loading library
-#.MDEP   := $(EMXIMP.DEPON) $(EMXOMF.DEPON)
+#.MDEP   := emximp emxomf
 
 .TARGET := libdl_p.a

trunk/src/emx/src/lib/io/clearerr.c

@@ -4 +4 @@
 #include <stdio.h>
 
-void clearerr (FILE *stream)
+void _STD(clearerr) (FILE *stream)
 {
   stream->_flags &= ~(_IOERR|_IOEOF);

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

@@ -60 +60 @@
 libc-dll: emxbind emxexp app alias libc os2 $(LIBC.DLL) $(LIBC.IMPLIB)
 
+# Never strip symbols before running through emxbind!
 $(LIBC.DLL): $.aout/src/lib/startup/386/dll0.o $(.OBJS) $(.DEPS) \
                 $(LIBC.DLL.OBJS) $.aout/libc.def
-        $(LD) $(LDFLAGS.DLL) -nostdlib -o __libc__ $^ \
+        $(LD) $(subst -s,,$(LDFLAGS.DLL)) -nostdlib -o __libc__ $^ \
           -L$.aout -los2 -lgcc -lc_alias
         $(call DO.EMXBIND,-d$.aout/libc.def __libc__)
         @$(call RM,__libc__)
+ifeq ($(MODE),opt)
+        lxlite $@
+endif
 
 $(LIBC.IMPLIB): $.aout/libc.def

trunk/src/emx/src/lib/os2_386/os2.smak

@@ -3 +3 @@
 .MODULE := os2
 .MDESC  := OS/2 import library (similar to os2386.lib)
-.MDEP   := $(EMXIMP.DEPON) $(EMXOMF.DEPON)
+.MDEP   := emximp emxomf
 .INSDIR := lib/
 

trunk/src/emx/src/lib/socket/socket.smak

@@ -3 +3 @@
 .MODULE := libsocket
 .MDESC  := The socket library
-.MDEP   := $(EMXIMP.DEPON) $(EMXOMF.DEPON)
+.MDEP   := emximp emxomf
 
 .TARGET := libsocket_p.a

trunk/src/emx/src/lib/startup/startup.smak

@@ -27 +27 @@
         $(CC) $(CFLAGS) -x assembler-with-cpp -DMCRT0 -o tmp1.o $<
         $(CC) $(CFLAGS) -o tmp2.o src/lib/startup/gmon.c
-        strip --strip-debug tmp1.o tmp2.o
         ld -r -o $@ tmp1.o tmp2.o
         $(call RM,tmp1.o tmp2.o)
 
-$.omf/src/lib/startup/%.obj: $.aout/src/lib/startup/%.o
+# This rule doesnt work if the aout/src/lib/startup/ directory does not
+# exist when make is started, and is ignored because of this (shit!)
+#$.omf/src/lib/startup/%.obj: $.aout/src/lib/startup/%.o
+#       $(call DO.EMXOMF,-m__text)
+
+# Additional dependencies to help stupid make.
+$.omf/src/lib/startup/mcrt0.obj: $.aout/src/lib/startup/mcrt0.o
+        $(call DO.EMXOMF,-m__text)
+$.omf/src/lib/startup/gcrt0.obj: $.aout/src/lib/startup/gcrt0.o
+        $(call DO.EMXOMF,-m__text)
+$.omf/src/lib/startup/386/dll0.obj: $.aout/src/lib/startup/386/dll0.o
+        $(call DO.EMXOMF,-m__text)
+$.omf/src/lib/startup/386/crt0.obj: $.aout/src/lib/startup/386/crt0.o
+        $(call DO.EMXOMF,-m__text)
+$.omf/src/lib/startup/386/res0.obj: $.aout/src/lib/startup/386/res0.o
         $(call DO.EMXOMF,-m__text)
 
-# Additional dependencies to help stupid make.
-$.omf/src/lib/startup/mcrt0.obj: $.aout/src/lib/startup/mcrt0.o $(EMXOMF.DEPON)
-$.omf/src/lib/startup/gcrt0.obj: $.aout/src/lib/startup/gcrt0.o $(EMXOMF.DEPON)
-$.omf/src/lib/startup/386/dll0.obj: $.aout/src/lib/startup/386/dll0.o $(EMXOMF.DEPON)
-$.omf/src/lib/startup/386/crt0.obj: $.aout/src/lib/startup/386/crt0.o $(EMXOMF.DEPON)
-$.omf/src/lib/startup/386/res0.obj: $.aout/src/lib/startup/386/res0.o $(EMXOMF.DEPON)
-
 include comend.smak

trunk/src/emx/src/libdl/dl.smak

@@ -4 +4 @@
 .MODULE := libdl
 .MDESC  := The dynamic loading library
-#.MDEP   := $(EMXIMP.DEPON) $(EMXOMF.DEPON)
+#.MDEP   := emximp emxomf
 
 .TARGET := libdl_p.a

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

@@ -3 +3 @@
 .MODULE := os2
 .MDESC  := OS/2 import library (similar to os2386.lib)
-.MDEP   := $(EMXIMP.DEPON) $(EMXOMF.DEPON)
+.MDEP   := emximp emxomf
 .INSDIR := lib/
 

trunk/src/emx/src/libsocket/socket.smak

@@ -3 +3 @@
 .MODULE := libsocket
 .MDESC  := The socket library
-.MDEP   := $(EMXIMP.DEPON) $(EMXOMF.DEPON)
+.MDEP   := emximp emxomf
 
 .TARGET := libsocket_p.a

trunk/src/gcc/gcc/config/i386/xm-emx.h

@@ -142 +142 @@
           {                                                                    \
             arg [0] = "-Zmt";                                                  \
-            arg [1] = "-Zcrtdll=c_import";                                     \
+            arg [1] = "-Zcrtdll=c_dll";                                        \
             arg_count = 2;                                                     \
           }                                                                    \
         else if (!strcmp (argv [i], "-Zcrtdll"))                               \
-            arg [0] = "-Zcrtdll=c_import";                                     \
+            arg [0] = "-Zcrtdll=c_dll";                                        \
         else if (!strcmp (argv [i], "-Zlinker"))                               \
           {                                                                    \