From b189e892be0878befd658925944e9c046b5efc52 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 18 Aug 1992 20:48:29 +0000 Subject: [PATCH] Moved in from p3: Tue Aug 18 13:41:36 1992 Ian Lance Taylor (ian@cygnus.com) * configure.in: accept all m68K family members. * Makefile.in: always create installation directories. --- ld/ChangeLog | 6 ++++++ ld/Makefile.in | 9 +++++++++ ld/configure.in | 36 ++++++++++++++++++++++++++---------- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 37745056577..ffd19ef8971 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +Tue Aug 18 13:41:36 1992 Ian Lance Taylor (ian@cygnus.com) + + * configure.in: accept all m68K family members. + + * Makefile.in: always create installation directories. + Thu Aug 13 11:49:34 1992 Steve Chamberlain (sac@thepub.cygnus.com) * ldlex.l: now parses comment correctly, added ~ to acceptable diff --git a/ld/Makefile.in b/ld/Makefile.in index abc6d34bc49..fa0d4e5e698 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -435,6 +435,12 @@ objdump:objdump.c .PHONY: install install: $(LD_PROG) + -parent=`echo $(bindir)|sed -e 's@/[^/]*$$@@'`; \ + if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi + -if [ -d $(bindir) ] ; then true ; else mkdir $(bindir) ; fi + -parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \ + if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi + -if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; fi -rm -f $(bindir)/$(program_prefix)ld$(program_suffix) $(INSTALL_PROGRAM) ld.new $(bindir)/$(program_prefix)ld$(program_suffix) -rm -f $(tooldir)/ld @@ -443,6 +449,9 @@ install: $(LD_PROG) $(INSTALL_DATA) $(srcdir)/ld.1 $(man1dir)/$(program_prefix)ld$(program_suffix).1 install-info: info + -parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \ + if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi + -if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi for i in ld.info* ; do \ $(INSTALL_DATA) $$i $(infodir)/$$i ; \ done diff --git a/ld/configure.in b/ld/configure.in index 462f248a7c1..8e295c36324 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -14,6 +14,17 @@ case "${host_cpu}" in rs6000) my_host=rs6000 ;; +hppa*) + case "${host_vendor}" in + hp) + case "${host_os}" in + hpux) my_host=hppahpux ;; + bsd) my_host=hppabsd ;; + esac + ;; + esac + ;; + mips) case "${host_vendor}" in dec) my_host=decstation ;; @@ -32,7 +43,7 @@ m88k) esac ;; -m68k) +m68*) case "${host_vendor}" in cbm) case ${host_os} in @@ -102,9 +113,9 @@ links="sysdep.h" if [ ! -f ${srcdir}/${files} ] ; then if [ -n "${my_host}" ] ; then - echo '***' No file ${srcdir}/${files} + echo '***' No file ${srcdir}/${files} 1>&2 fi - echo '***' ${srcname} does not support host ${host} + echo '***' ${srcname} does not support host ${host} 1>&2 exit 1 fi host_makefile_frag= @@ -127,11 +138,12 @@ wrs) i960) my_target=vxworks960 ;; m68k) my_target=vxworks68;; m680[01234]0) my_target=vxworks68;; + m683?2) my_target=vxworks68;; + sparc) my_target=vxsparc;; esac ;; -tandem) - my_target=st2000 - ;; +ericsson) my_target=OSE68 ;; +tandem) my_target=st2000 ;; *) case ${target_cpu} in i386) my_target=go32 ;; @@ -147,14 +159,18 @@ tandem) xray) my_target=ieee-h8300 ;; esac ;; - m68k) + m68*) case ${target_vendor} in sony) my_target=news ;; hp) my_target=hp300bsd ;; - *) - echo "Unknown m68k target vendor:" ${target_vendor} - exit 1 + case "${target_os}" in + aout) my_target=m68k-aout ;; + coff) my_target=m68k-coff ;; + *) echo "Unknown m68k target vendor:" ${target_vendor} 1>&2 + exit 1 + ;; + esac ;; esac ;; -- 2.30.2