diff options
| author | Zack Weinberg <zackw@stanford.edu> | 2001-05-01 17:45:05 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2001-05-01 17:45:05 +0000 |
| commit | 4e70264f826ec25e36cdc66bda9560a4652f9ca6 (patch) | |
| tree | d9efe798282ba0020467e2e9372c1db251ad69e0 /gcc/Makefile.in | |
| parent | 358c9f4b427a2b7380223594e2040e62e9340fbd (diff) | |
| download | gcc-4e70264f826ec25e36cdc66bda9560a4652f9ca6.zip gcc-4e70264f826ec25e36cdc66bda9560a4652f9ca6.tar.gz gcc-4e70264f826ec25e36cdc66bda9560a4652f9ca6.tar.bz2 | |
config.gcc: Don't default xmake_file to ${cpu_type}/x-${cpu_type}.
2001-05-01 Zack Weinberg <zackw@stanford.edu>
* config.gcc: Don't default xmake_file to ${cpu_type}/x-${cpu_type}.
Remove references to deleted files.
(*-*-openbsd): No need to override xmake_file.
(*-*-sysv4): Treat like *-*-sysv.
* configure.in: Probe for ldopen in various places, and set up
collect2 to be linked with them if found.
Don't dink with Windows registry stuff unless $host_os is a
Win32 os name. Check to see if we need -ladvapi32.
* configure: Regenerate.
* Makefile: Get rid of CLIB and HOST_CLIB.
Substitute in COLLECT2_LIBS and link collect2 against its contents.
* build-make: Get rid of HOST_CLIB.
* config/a29k/x-unix, config/alpha/x-osf, config/i386/x-aix,
config/i386/x-osfrose, config/m68k/x-dpx2, config/mips/x-iris3,
config/mips/x-mips, config/mips/x-osfrose, config/mips/x-sony,
config/mips/x-sysv, config/rs6000/x-aix31, config/rs6000/x-aix41,
config/rs6000/x-rs6000: Delete.
* config/i386/x-cygwin, config/m68k/t-aux, config/mips/x-iris:
Don't set CLIB.
24 x-host fragments remain, 0 x-cpu, 3 top level.
2001-05-01 Zack Weinberg <zackw@stanford.edu>
* aclocal.m4 (gcc_AC_C_CHAR_BIT): Correct test program.
* configure: Regenerate.
From-SVN: r41732
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index dac77e7..7b9508e 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -353,9 +353,6 @@ INTLLIBS = @INTLLIBS@ POSUB = @POSUB@ INTL_SUBDIRS = intl $(POSUB) -# Additional system libraries to link with. -CLIB= - # Change this to a null string if obstacks are installed in the # system library. OBSTACK=obstack.o @@ -513,7 +510,6 @@ HOST_CC=$(CC) # If you change any of the following variables, check whether a # similar change is needed in build-make. HOST_CFLAGS=$(ALL_CFLAGS) -DGENERATOR_FILE -HOST_CLIB=$(CLIB) HOST_LDFLAGS=$(LDFLAGS) HOST_CPPFLAGS=$(ALL_CPPFLAGS) HOST_OBSTACK=$(OBSTACK) @@ -628,12 +624,12 @@ HOST_LIBDEPS= $(HOST_PREFIX)$(HOST_OBSTACK) \ # How to link with both our special library facilities # and the system's installed libraries. LIBS = $(OBSTACK) $(INTLLIBS) @LIBS@ $(VFPRINTF) $(DOPRINT) \ - $(STRSTR) $(CLIB) ../libiberty/libiberty.a + $(STRSTR) ../libiberty/libiberty.a # Likewise, for use in the tools that must run on this machine # even if we are cross-building GCC. HOST_LIBS = $(USE_HOST_OBSTACK) $(USE_HOST_VFPRINTF) \ - $(USE_HOST_DOPRINT) $(USE_HOST_STRSTR) $(HOST_CLIB) + $(USE_HOST_DOPRINT) $(USE_HOST_STRSTR) HOST_RTL = $(HOST_PREFIX)rtl.o $(HOST_PREFIX)bitmap.o \ $(HOST_PREFIX)ggc-none.o gensupport.o hashtab.o safe-ctype.o @@ -680,7 +676,6 @@ ORDINARY_FLAGS_TO_PASS = \ "BISON=$(BISON)" \ "BISONFLAGS=$(BISONFLAGS)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ - "CLIB=$(CLIB)" \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ "LDFLAGS=$(LDFLAGS)" \ "FLEX=$(FLEX)" \ @@ -1224,10 +1219,12 @@ sbitmap.o: sbitmap.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) flags.h hard-reg-set.h \ $(BASIC_BLOCK_H) COLLECT2_OBJS = collect2.o tlink.o hash.o intl.o underscore.o version.o +COLLECT2_LIBS = @COLLECT2_LIBS@ collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS) # Don't try modifying collect2 (aka ld) in place--it might be linking this. - -rm -f collect2$(exeext) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(COLLECT2_OBJS) $(LIBS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@T \ + $(COLLECT2_OBJS) $(LIBS) $(COLLECT2_LIBS) + mv -f $@T $@ collect2.o : collect2.c $(CONFIG_H) $(SYSTEM_H) gstab.h intl.h \ $(OBSTACK_H) $(DEMANGLE_H) collect2.h version.h |