1
# DP: Update the gdc driver to use the up-to-date system zlib
3
--- a/src/gcc/d/d-spec.c 2011-07-24 15:48:55.820035782 +0100
4
+++ b/src/gcc/d/d-spec.c 2011-07-24 18:12:57.750888801 +0100
6
/* The number of arguments being added to what's in argv, other than
7
libraries. We use this to track the number of times we've inserted
10
+ int added = 1; /* -lz */
12
/* The new argument list will be contained in this. */
13
struct cl_decoded_option *new_decoded_options;
16
/* Handled in gcc.c */
18
+ /* Use the up-to-date system zlib with libphobos */
19
+ generate_option (OPT_l, "z", 1, CL_DRIVER,
20
+ &new_decoded_options[j]);
26
--- a/src/gcc/d/phobos2/etc/c/zlib.d 2011-07-24 15:48:57.068041974 +0100
27
+++ b/src/gcc/d/phobos2/etc/c/zlib.d 2011-07-24 18:14:18.775290585 +0100
32
-const char[] ZLIB_VERSION = "1.2.3";
33
-const ZLIB_VERNUM = 0x1230;
34
+const char[] ZLIB_VERSION = "1.2.3.4";
35
+const ZLIB_VERNUM = 0x1234;
38
The 'zlib' compression library provides in-memory compression and
39
--- a/src/gcc/d/phobos2/Makefile.am 2011-07-24 15:48:57.004041665 +0100
40
+++ b/src/gcc/d/phobos2/Makefile.am 2011-07-24 18:16:01.115798057 +0100
42
std/stream.t.o: std/stream.d $(D_PREREQ_SRCS)
43
$(GDC) -o $@ $(ALL_DFLAGS) -fdeprecated -c $<
45
-ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS)
46
+ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS)
49
libgphobos2.a : libgdruntime.a $(ALL_PHOBOS_OBJS)
50
--- a/src/gcc/d/phobos2/Makefile.in 2011-07-24 15:48:57.016041704 +0100
51
+++ b/src/gcc/d/phobos2/Makefile.in 2011-07-24 18:16:08.787836103 +0100
53
std/windows/charset.o std/windows/iunknown.o std/windows/registry.o \
54
std/windows/syserror.o std/__fileinit.o
56
-ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS)
57
+ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS)
59
# Work around what appears to be a GNU make bug handling MAKEFLAGS
60
# values defined in terms of make variables, as is the case for CC and