Changeset 72 for trunk/src/gcc

Timestamp:

Apr 30, 2003, 11:02:48 PM (22 years ago)

Author:

bird

Message:

Shared gcclib prettifications. Moved BOOT flags to topleve makefile.

File:

• trunk/src/gcc/gcc/config/i386/t-emx (modified) (6 diffs, 1 prop)

trunk/src/gcc/gcc/config/i386/t-emx

@@ -1 @@
-# Build a shared libgcc library.
-SHLIB_EXT =
-SHLIB_LINK = touch $$@ && export DLLAR_CMDLINE="@shlib_objs@" && \
-        kRx.exe dllar.cmd -o `echo $$@ | sed -e "s,\(.\)\(.*\)libgcc_s_.*,\1\2gcc$(gccdll_version)\1.dll,"` \
+# EMX target have share libgcc, but the names are release specific and constrained by 8.3 limits.
+# The link command depends heavily on the directory structure.
+SHLIB_EXT      = 
+SHLIB_BASENAME = gcc$(gccdll_version)
+SHLIB_MULTINAME= $(SHLIB_BASENAME)`echo @shlib_so_name@ | cut -b10`
+SHLIB_DLLNAME  = $(SHLIB_MULTINAME).dll
+SHLIB_LINK     = export DLLAR_CMDLINE="@shlib_objs@" && \
+        kRx.exe dllar.cmd -o $$(@D)/$(SHLIB_DLLNAME) \
         -ordinal @multilib_flags@ -nocrtdll \
         -ex "__main __do_global_* _GLOBAL* _exit_dummy_ref __ctordtor* __eh* _DLL_InitTerm" \
         -d "GNU C runtime shared library version $(gcc_version)" \
-        -libf "INITINSTANCE TERMGLOBAL" -lc_static -lc_import
-SHLIB_INSTALL =
+        -libf "INITINSTANCE TERMGLOBAL" -lc_static -lc_import \
+    && mv -f $$(@D)/$(SHLIB_MULTINAME).a $$(@D)/$(SHLIB_BASENAME).a \
+        && ar rs $$(@D)/$(SHLIB_BASENAME).a libgcc/$$(@D)/__main.o libgcc/$$(@D)/emx-ctordtor.o libgcc/$$(@D)/emx-eh.o libgcc/$$(@D)/emx-dllinit.o \
+    && touch $$@
 
-# Allow multi-threaded/single-threaded libraries
+SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_DLLNAME) $$(DESTDIR)$$(slibdir)/
+
+# EMX Multi-threaded/Single-threaded libraries.
 MULTILIB_OPTIONS    = Zmt
 MULTILIB_DIRNAMES   = mt st
@@ -29 +37 @@
 LDFLAGS = -Zexe -Zcrtdll
 
-# GCC Boot Flags (stage2+)
-# Note! -Zcrtdll requires the st&mt subdirs of each stage[1-3] to be in the libpath - env.cmd takes care of that.
-BOOT_LDFLAGS = -s -Zexe -Zcrtdll
-BOOT_CFLAGS  = -s -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -malign-strings=0 -falign-loops=2 -falign-jumps=2 -falign-functions=2
-
 # Add the 's' flag to $AR so that we don't need ranlib
 AR_FLAGS = rcs
 
-# We don`t want debug information in libgcc
+# We don't want debug information in libgcc
 LIBGCC2_DEBUG_CFLAGS = -s
 # We also want epilogues for each function in libgcc
@@ -53 +56 @@
   $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c
 #LIB2ADDEHDEP
+
 
 # EMX include directory
@@ -85 +89 @@
 
 # Some final polishing of libgcc ...
-# r=bird: Isn't this done a little bit too late to link all the gcc compilers
-#         and such agains the right [sm]t/gcc$(gccdll_version).a?
+# r=bird: Moved parts of this up to the SHLIB_LINK command.
 $(ALL): s-libgcc
 s-libgcc: $(LIBGCC)
@@ -92 +95 @@
         mv -f st/libgcc.a st/gcc.a
         mv -f st/libgcc_eh.a st/gcc_eh.a
-        if [ -f st/gcc$(gccdll_version)s.a ]; then \
-          mv -f st/gcc$(gccdll_version)s.a st/gcc$(gccdll_version).a; \
-        fi
         mv -f mt/libgcc.a mt/gcc.a
         mv -f mt/libgcc_eh.a mt/gcc_eh.a
-        if [ -f mt/gcc$(gccdll_version)m.a ]; then \
-          mv -f mt/gcc$(gccdll_version)m.a mt/gcc$(gccdll_version).a; \
-        fi
-        ar x st/gcc.a __main.o emx-ctordtor.o
-        ar x st/gcc_eh.a emx-eh.o emx-dllinit.o
-        ar rs st/gcc$(gccdll_version).a __main.o emx-ctordtor.o emx-eh.o emx-dllinit.o
-        ar rs mt/gcc$(gccdll_version).a __main.o emx-ctordtor.o emx-eh.o emx-dllinit.o
-        rm -f __main.o emx-ctordtor.o emx-eh.o emx-dllinit.o
         $(STAMP) s-libgcc
         echo "t-emx hacks: $@ done"
@@ -110 +102 @@
 emx.o: $(srcdir)/config/i386/emx.c $(RTL_H) $(TREE_H) $(CONFIG_H)
         $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/i386/emx.c
+