From e42b2520842a3cbafa2afd9fc3809f9cfc5debfb Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 29 Jul 1997 00:54:28 +0000 Subject: [PATCH] * configure.in: Use CYGWIN and EXEEXT autoconf macro to look for win32 dependencies. * configure: Regenerated with autoconf 2.12. * Makefile.in: Add $(EXEEXT) to all executables. --- gas/Makefile.in | 23 ++++---- gas/configure | 143 +++++++++++++++++++++++++++++++++-------------- gas/configure.in | 4 ++ 3 files changed, 116 insertions(+), 54 deletions(-) diff --git a/gas/Makefile.in b/gas/Makefile.in index 11c66979bba..acfeb66e5c1 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -78,6 +78,7 @@ RPATH_ENVVAR = @RPATH_ENVVAR@ CFLAGS = @CFLAGS@ LDFLAGS = DEP = mkdep +EXEEXT = @EXEEXT@ MAKEOVERRIDES= @@ -431,7 +432,7 @@ GASPOBJS = \ sb.o \ hash.o -all: .gdbinit as.new gasp.new +all: .gdbinit as.new$(EXEEXT) gasp.new$(EXEEXT) @cd doc; $(MAKE) $(FLAGS_TO_PASS) all dvi info install-info clean-info: @@ -477,8 +478,8 @@ STAGESTUFF = *.o as.new gasp.new $(OBJS): @ALL_OBJ_DEPS@ -as.new: $(OBJS) $(LIBDEPS) - $(HLDENV) $(CC) $(HLDFLAGS) $(ALL_CFLAGS) $(LDFLAGS) -o as.new $(OBJS) $(LIBS) $(LOADLIBES) +as.new$(EXEEXT): $(OBJS) $(LIBDEPS) + $(HLDENV) $(CC) $(HLDFLAGS) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(LOADLIBES) # Stuff that every object file depends upon. If anything is removed # from this list, remove it from dep-in.sed as well. @@ -486,8 +487,8 @@ $(OBJS): config.h as.h $(TARG_ENV_H) $(OBJ_FORMAT_H) $(TARG_CPU_H) flonum.h \ expr.h struc-symbol.h write.h frags.h hash.h read.h symbols.h tc.h \ obj.h listing.h bignum.h bit_fix.h $(INCDIR)/libiberty.h -gasp.new: $(GASPOBJS) ../libiberty/libiberty.a - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o gasp.new $(GASPOBJS) ../libiberty/libiberty.a $(LOADLIBES) +gasp.new$(EXEEXT): $(GASPOBJS) ../libiberty/libiberty.a + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GASPOBJS) ../libiberty/libiberty.a $(LOADLIBES) installcheck: @echo No installcheck target is available yet for the GNU assembler. @@ -684,15 +685,15 @@ maintainer-clean realclean: clean-here # Entry points `install', `includes' and `uninstall'. # Copy the files into directories where they will be run. -install: as.new gasp.new installdirs +install: as.new$(EXEEXT) gasp.new$(EXEEXT) installdirs n=`echo as | sed '$(program_transform_name)'`; \ - $(INSTALL_PROGRAM) as.new $(bindir)/$$n; \ + $(INSTALL_PROGRAM) as.new$(EXEEXT) $(bindir)/$$n$(EXEEXT); \ $(INSTALL_DATA) $(srcdir)/doc/as.1 $(man1dir)/$$n.1; \ - rm -f $(tooldir)/bin/as; \ - ln $(bindir)/$$n $(tooldir)/bin/as >/dev/null 2>/dev/null \ - || $(INSTALL_PROGRAM) as.new $(tooldir)/bin/as + rm -f $(tooldir)/bin/as$(EXEEXT); \ + ln $(bindir)/$$n $(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \ + || $(INSTALL_PROGRAM) as.new$(EXEEXT) $(tooldir)/bin/as$(EXEEXT) n=`echo gasp | sed '$(program_transform_name)'`; \ - $(INSTALL_PROGRAM) gasp.new $(bindir)/$$n + $(INSTALL_PROGRAM) gasp.new$(EXEEXT) $(bindir)/$$n$(EXEEXT) installdirs: $(SHELL) $(srcdir)/../mkinstalldirs $(bindir) $(man1dir) $(tooldir)/bin diff --git a/gas/configure b/gas/configure index cce2a5aec4c..bc3b039e18b 100755 --- a/gas/configure +++ b/gas/configure @@ -1806,22 +1806,77 @@ EOF fi echo "$ac_t""$cross_gas" 1>&6 +# Look for win32 specific settings. +echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 +echo "configure:1812: checking for Cygwin32 environment" >&5 +if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + am_cv_cygwin32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + am_cv_cygwin32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$am_cv_cygwin32" 1>&6 +CYGWIN32= +test "$am_cv_cygwin32" = yes && CYGWIN32=yes +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:1841: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN32" = yes; then +am_cv_exeext=.exe +else +cat > am_c_test.c << 'EOF' +int main() { +/* Nothing needed here */ +} +EOF +${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5 +am_cv_exeext=`ls am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//` +rm -f am_c_test* +fi + +test x"${am_cv_exeext}" = x && am_cv_exeext=no +fi +EXEEXT="" +test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext} +echo "$ac_t""${am_cv_exeext}" 1>&6 + + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1813: checking for working alloca.h" >&5 +echo "configure:1868: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1842,12 +1897,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1846: checking for alloca" >&5 +echo "configure:1901: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1902,12 +1957,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1906: checking whether alloca needs Cray hooks" >&5 +echo "configure:1961: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1936: checking for $ac_func" >&5 +echo "configure:1991: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1987,7 +2042,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1991: checking stack direction for C alloca" >&5 +echo "configure:2046: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1995,7 +2050,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2036,21 +2091,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2040: checking for inline" >&5 +echo "configure:2095: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2080,12 +2135,12 @@ esac for ac_func in unlink remove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2084: checking for $ac_func" >&5 +echo "configure:2139: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2137,12 +2192,12 @@ done for ac_func in sbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2141: checking for $ac_func" >&5 +echo "configure:2196: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2194,12 +2249,12 @@ done # enough, but on some of those systems, the assert macro relies on requoting # working properly! echo $ac_n "checking for working assert macro""... $ac_c" 1>&6 -echo "configure:2198: checking for working assert macro" >&5 +echo "configure:2253: checking for working assert macro" >&5 if eval "test \"`echo '$''{'gas_cv_assert_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2215,7 +2270,7 @@ assert (a == b ; return 0; } EOF -if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gas_cv_assert_ok=yes else @@ -2256,12 +2311,12 @@ gas_test_headers=" " echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6 -echo "configure:2260: checking whether declaration is required for strstr" >&5 +echo "configure:2315: checking whether declaration is required for strstr" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gas_cv_decl_needed_strstr=no else @@ -2293,12 +2348,12 @@ EOF echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6 -echo "configure:2297: checking whether declaration is required for malloc" >&5 +echo "configure:2352: checking whether declaration is required for malloc" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gas_cv_decl_needed_malloc=no else @@ -2330,12 +2385,12 @@ EOF echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6 -echo "configure:2334: checking whether declaration is required for free" >&5 +echo "configure:2389: checking whether declaration is required for free" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gas_cv_decl_needed_free=no else @@ -2367,12 +2422,12 @@ EOF echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6 -echo "configure:2371: checking whether declaration is required for sbrk" >&5 +echo "configure:2426: checking whether declaration is required for sbrk" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_sbrk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gas_cv_decl_needed_sbrk=no else @@ -2407,12 +2462,12 @@ EOF # for it? echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6 -echo "configure:2411: checking whether declaration is required for errno" >&5 +echo "configure:2466: checking whether declaration is required for errno" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* gas_cv_decl_needed_errno=no else @@ -2663,6 +2718,7 @@ s%@CC@%$CC%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@CPP@%$CPP%g +s%@EXEEXT@%$EXEEXT%g s%@ALLOCA@%$ALLOCA%g s%@HLDFLAGS@%$HLDFLAGS%g s%@HLDENV@%$HLDENV%g @@ -2738,6 +2794,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + ?:*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" top_srcdir="$ac_dots$ac_given_srcdir" ;; @@ -2757,7 +2814,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then *) ac_comsub= ;; esac - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%" -e "s%^%$ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g s%@srcdir@%$srcdir%g @@ -2804,7 +2861,7 @@ for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + ac_file_inputs=`echo $ac_file_in|sed -e "s%:% $ac_given_srcdir/%" -e "s%^%$ac_given_srcdir/%g"` cat $ac_file_inputs > conftest.in EOF diff --git a/gas/configure.in b/gas/configure.in index 0af0c91a82d..8d03edd6327 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -707,6 +707,10 @@ else fi AC_MSG_RESULT($cross_gas) +# Look for win32 specific settings. +CY_CYGWIN32 +CY_EXEEXT + dnl ansidecl.h will deal with const dnl AC_CONST AC_FUNC_ALLOCA -- 2.30.2