aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2008-09-22 02:56:50 +0000
committerDanny Smith <dannysmith@gcc.gnu.org>2008-09-22 02:56:50 +0000
commitd59e481e05edcb9eecebcd278ae174e0fdf03984 (patch)
tree8492f7f0dc0fdbff8766898a3b9357f353585756
parent187fcb85b64e556f8e1142fa944ed05e5a21fc57 (diff)
downloadgcc-d59e481e05edcb9eecebcd278ae174e0fdf03984.zip
gcc-d59e481e05edcb9eecebcd278ae174e0fdf03984.tar.gz
gcc-d59e481e05edcb9eecebcd278ae174e0fdf03984.tar.bz2
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
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/config/i386/t-cygming3
-rw-r--r--gcc/config/i386/t-cygwin2
3 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 195457c..eb2fa8a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-22 Danny Smith <dannysmith@users.sourceforge.net>
+
+ 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 <hp@axis.com>
PR middle-end/37170
diff --git a/gcc/config/i386/t-cygming b/gcc/config/i386/t-cygming
index c6e6cac..ecfe2d1 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 3715c0b..7433138 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