From d59e481e05edcb9eecebcd278ae174e0fdf03984 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 22 Sep 2008 02:56:50 +0000 Subject: [PATCH] re PR target/37528 (boostrap failure due to configure problems) PR target/37528 * config/i386/t-cygming (SHLIB_LC): Remove. (SHLIB_LINK): Don't add static objects to SHLIB_IMPLIB * config/i386/t-cygwin (SHLIB_LC): Specify all required libraries. From-SVN: r140541 --- gcc/ChangeLog | 8 ++++++++ gcc/config/i386/t-cygming | 3 --- gcc/config/i386/t-cygwin | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 195457c5ba0..eb2fa8a93ae 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2008-09-22 Danny Smith + + PR target/37528 + * config/i386/t-cygming (SHLIB_LC): Remove. + (SHLIB_LINK): Don't add static objects to SHLIB_IMPLIB + * config/i386/t-cygwin (SHLIB_LC): Specify all required + libraries. + 2008-09-22 Hans-Peter Nilsson PR middle-end/37170 diff --git a/gcc/config/i386/t-cygming b/gcc/config/i386/t-cygming index c6e6cac7811..ecfe2d1d2a3 100644 --- a/gcc/config/i386/t-cygming +++ b/gcc/config/i386/t-cygming @@ -54,7 +54,6 @@ SHLIB_MAP = @shlib_map_file@ SHLIB_OBJS = @shlib_objs@ SHLIB_DIR = @multilib_dir@/shlib SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@ -SHLIB_LC = -luser32 -lkernel32 -ladvapi32 -lshell32 SHLIB_LINK = $(LN_S) $(SHLIB_MAP) $(SHLIB_MAP).def && \ if [ ! -d $(SHLIB_DIR) ]; then \ @@ -65,8 +64,6 @@ SHLIB_LINK = $(LN_S) $(SHLIB_MAP) $(SHLIB_MAP).def && \ -Wl,--out-implib,$(SHLIB_DIR)/$(SHLIB_IMPLIB).tmp \ -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ $(SHLIB_OBJS) $(SHLIB_LC) && \ - $(AR_FOR_TARGET) -r $(SHLIB_DIR)/$(SHLIB_IMPLIB).tmp \ - _chkstk.o _ctors.o gthr-win32.o && \ if [ -f $(SHLIB_DIR)/$(SHLIB_SONAME) ]; then \ mv -f $(SHLIB_DIR)/$(SHLIB_SONAME) \ $(SHLIB_DIR)/$(SHLIB_SONAME).backup; \ diff --git a/gcc/config/i386/t-cygwin b/gcc/config/i386/t-cygwin index 3715c0b450c..7433138d692 100644 --- a/gcc/config/i386/t-cygwin +++ b/gcc/config/i386/t-cygwin @@ -15,4 +15,4 @@ cygwin2.o: $(srcdir)/config/i386/cygwin2.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(srcdir)/config/i386/cygwin2.c # Cygwin-specific parts of LIB_SPEC -SHLIB_LC += -lcygwin +SHLIB_LC = -lcygwin -luser32 -lkernel32 -ladvapi32 -lshell32