diff --git a/gcc/Make-lang.in b/gcc/Make-lang.in
index a3e6d85..efc7687 100644
--- a/gcc/Make-lang.in
+++ b/gcc/Make-lang.in
@@ -34,6 +34,11 @@ gelna$(exeext): $(ELNA_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS)
 	  $(ELNA_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a \
 	  $(EXTRA_GCC_LIBS) $(LIBS)
 
+# Create a version of the gelna driver which calls the cross-compiler.
+gelna-cross$(exeext): gelna$(exeext)
+	-rm -f gelna-cross$(exeext)
+	cp gelna$(exeext) gelna-cross$(exeext)
+
 # The compiler proper
 
 elna_OBJS = \
@@ -56,7 +61,7 @@ elna1$(exeext): attribs.o $(elna_OBJS) $(BACKEND) $(LIBDEPS)
 	+$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \
 	      attribs.o $(elna_OBJS) $(BACKEND) $(LIBS) $(BACKENDLIBS)
 
-elna.all.cross:
+elna.all.cross: gelna-cross$(exeext)
 
 elna.start.encap: gelna$(exeext)
 elna.rest.encap:
@@ -75,9 +80,15 @@ ELNA_TEXI_FILES = \
 elna.install-common: installdirs
 	-rm -f $(DESTDIR)$(bindir)/$(ELNA_INSTALL_NAME)$(exeext)
 	$(INSTALL_PROGRAM) gelna$(exeext) $(DESTDIR)$(bindir)/$(ELNA_INSTALL_NAME)$(exeext)
-	rm -f $(DESTDIR)$(bindir)/$(ELNA_TARGET_INSTALL_NAME)$(exeext); \
-	( cd $(DESTDIR)$(bindir) && \
-      $(LN) $(ELNA_INSTALL_NAME)$(exeext) $(ELNA_TARGET_INSTALL_NAME)$(exeext) ); \
+	-if test -f elna1$(exeext); then \
+	  if test -f gelna-cross$(exeext); then \
+	    :; \
+	  else \
+	    rm -f $(DESTDIR)$(bindir)/$(ELNA_TARGET_INSTALL_NAME)$(exeext); \
+	    ( cd $(DESTDIR)$(bindir) && \
+          $(LN) $(ELNA_INSTALL_NAME)$(exeext) $(ELNA_TARGET_INSTALL_NAME)$(exeext) ); \
+	  fi; \
+	fi
 
 $(build_htmldir)/gelna/index.html: $(ELNA_TEXI_FILES)
 	$(mkinstalldirs) $(@D)