aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJanne Blomqvist <jb@gcc.gnu.org>2013-04-25 22:16:46 +0300
committerJanne Blomqvist <jb@gcc.gnu.org>2013-04-25 22:16:46 +0300
commit9c818d13d45ea00592462bdc31125bc3908f6d99 (patch)
tree1d94e7388a351613f77b84e7887f8534815efb15 /gcc
parent09962a4aa380c5c8297cee5be122c0b4b849a623 (diff)
downloadgcc-9c818d13d45ea00592462bdc31125bc3908f6d99.zip
gcc-9c818d13d45ea00592462bdc31125bc3908f6d99.tar.gz
gcc-9c818d13d45ea00592462bdc31125bc3908f6d99.tar.bz2
PR 57028 Bootstrap regression wrt zlib.
2013-04-25 Janne Blomqvist <jb@gcc.gnu.org> PR bootstrap/57028 * Make-lang.in (f951): Link in ZLIB. (CFLAGS-fortran/module.o): Add zlib include directory. From-SVN: r198318
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/Make-lang.in4
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 95c448b..7d85d9d 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-25 Janne Blomqvist <jb@gcc.gnu.org>
+
+ PR bootstrap/57028
+ * Make-lang.in (f951): Link in ZLIB.
+ (CFLAGS-fortran/module.o): Add zlib include directory.
+
2013-04-22 Janus Weil <janus@gcc.gnu.org>
PR fortran/53685
diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index 5ce2a24..c3f826c 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -99,7 +99,8 @@ gfortran-cross$(exeext): gfortran$(exeext)
f951$(exeext): $(F95_OBJS) \
$(BACKEND) $(LIBDEPS) attribs.o
+$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \
- $(F95_OBJS) $(BACKEND) $(LIBS) attribs.o $(BACKENDLIBS)
+ $(F95_OBJS) $(BACKEND) $(ZLIB) $(LIBS) attribs.o \
+ $(BACKENDLIBS)
gt-fortran-trans.h : s-gtype; @true
#
@@ -370,4 +371,5 @@ fortran/data.o: fortran/data.h
fortran/options.o: $(PARAMS_H) $(TARGET_H) fortran/cpp.h
fortran/cpp.o: fortran/cpp.c incpath.h incpath.o cppbuiltin.h
fortran/scanner.o: fortran/scanner.h
+CFLAGS-fortran/module.o += $(ZLIBINC)
fortran/module.o: fortran/scanner.h