Changeset 224 for trunk/src/gcc

Timestamp:

May 22, 2003, 10:07:21 PM (22 years ago)

Author:

bird

Message:

#424: Skip the multilib phun. New hacks.

File:

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

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

@@ +1 @@
+# bird: dropping multilibs. Old hacks - START
+## 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 \
+#    && 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 $$@
+#SHLIB_SUBDIR  = `echo @shlib_base_name@ | sed -e "s/^libgcc_s_//" -e "s,_,/,g"`
+#SHLIB_INSTALL = $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_DLLNAME) $$(DESTDIR)$$(slibdir)/ \
+#    && $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_BASENAME).a $$(DESTDIR)$$(libsubdir)/$(SHLIB_SUBDIR)/
+#
+## EMX Multi-threaded/Single-threaded libraries.
+#MULTILIB_OPTIONS    = Zmt
+#MULTILIB_DIRNAMES   = mt st
+#MULTILIB_MATCHES    = Zmt=Zmts Zmt=Zmtd
+#MULTILIB_EXCEPTIONS =
+#MULTILIB_EXTRA_OPTS =
+# bird: dropping multilibs. Old hacks - END
+
 # 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_MULTINAME= $(SHLIB_BASENAME)
 SHLIB_DLLNAME  = $(SHLIB_MULTINAME).dll
 SHLIB_LINK     = export DLLAR_CMDLINE="@shlib_objs@" && \
@@ -11 +37 @@
         -d "GNU C runtime shared library version $(gcc_version)" \
         -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 $$@
-SHLIB_SUBDIR  = `echo @shlib_base_name@ | sed -e "s/^libgcc_s_//" -e "s,_,/,g"`
+SHLIB_SUBDIR  = .
 SHLIB_INSTALL = $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_DLLNAME) $$(DESTDIR)$$(slibdir)/ \
     && $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_BASENAME).a $$(DESTDIR)$$(libsubdir)/$(SHLIB_SUBDIR)/
-
-# EMX Multi-threaded/Single-threaded libraries.
-MULTILIB_OPTIONS    = Zmt
-MULTILIB_DIRNAMES   = mt st
-MULTILIB_MATCHES    = Zmt=Zmts Zmt=Zmtd
-MULTILIB_EXCEPTIONS =
-MULTILIB_EXTRA_OPTS =
 
 # Dont use collect2
@@ -83 +101 @@
 gccdll_version = $(subst .,,$(gcc_version))
 
+# bird (#424): dropping multilibs. Old hacks - START
+#stage1 stage2 stage3 stage4:
+#       echo "t-emx hacks: $@ starting"
+#       -mv -f *.exe *.ready st mt s-libgcc $@
+#       -rm -f $@/$(LIBGCC)
+#       echo "t-emx hacks: $@ done"
+
+## Some final polishing of libgcc ...
+## r=bird: Moved parts of this up to the SHLIB_LINK command.
+##   Use cp as mv causes recreation of libversions during make install.
+##   Is there ANY chance we could juse leave them as libgcc*.a? That would've
+##   been much more convenient... 8.3 isn't an argument.
+#$(ALL): s-libgcc
+#s-libgcc: $(LIBGCC)
+#       echo "t-emx hacks: $@ starting"
+#       cp -f st/libgcc.a st/gcc.a
+#       cp -f st/libgcc_eh.a st/gcc_eh.a
+#       cp -f mt/libgcc.a mt/gcc.a
+#       cp -f mt/libgcc_eh.a mt/gcc_eh.a
+#       $(STAMP) s-libgcc
+#       echo "t-emx hacks: $@ done"
+# bird (#424): dropping multilibs. Old hacks - END
+
+# bird (#424): New gcc*dll hacks
 stage1 stage2 stage3 stage4:
         echo "t-emx hacks: $@ starting"
-        -mv -f *.exe *.ready st mt s-libgcc $@
-        -rm -f $@/$(LIBGCC)
-        echo "t-emx hacks: $@ done"
-
-# Some final polishing of libgcc ...
-# r=bird: Moved parts of this up to the SHLIB_LINK command.
-#   Use cp as mv causes recreation of libversions during make install.
-#   Is there ANY chance we could juse leave them as libgcc*.a? That would've
-#   been much more convenient... 8.3 isn't an argument.
-$(ALL): s-libgcc
-s-libgcc: $(LIBGCC)
-        echo "t-emx hacks: $@ starting"
-        cp -f st/libgcc.a st/gcc.a
-        cp -f st/libgcc_eh.a st/gcc_eh.a
-        cp -f mt/libgcc.a mt/gcc.a
-        cp -f mt/libgcc_eh.a mt/gcc_eh.a
-        $(STAMP) s-libgcc
+        -mv -f gcc3*.dll gcc3*.a gcc3*.def $@
         echo "t-emx hacks: $@ done"