This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-316-gde2139a
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 Sep 2012 21:17:27 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-316-gde2139a
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via de2139a9f25d8f7fb76f260fe7cc86ffd736a5d9 (commit)
via 5ca78dd02444d7a19d676d5c6aca9e0837f1b791 (commit)
via e9ceaf254cf54569baa266fcb29677c392360edc (commit)
via 691bc9c1e449a9c3a277926fa28f7f41b63cd7df (commit)
from 65cafb1c3f698f9382c318da88415014dbdf675b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=de2139a9f25d8f7fb76f260fe7cc86ffd736a5d9
commit de2139a9f25d8f7fb76f260fe7cc86ffd736a5d9
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Sep 7 14:14:08 2012 -0700
Check if deriv->steps is NULL before freeing it
diff --git a/ChangeLog b/ChangeLog
index 6d3823e..77ae95c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-09-07 H.J. Lu <hongjiu.lu@intel.com>
+ * iconv/gconv_db.c (free_derivation): Check if deriv->steps
+ is NULL.
+
* debug/Makefile (LDFLAGS-tst-chk4): Renamed to ...
(LDLIBS-tst-chk4): This.
(LDFLAGS-tst-chk5): Renamed to ...
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index a081205..5bc7ff8 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -193,10 +193,13 @@ free_derivation (void *p)
}
/* Free the name strings. */
- free ((char *) deriv->steps[0].__from_name);
- free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
+ if (deriv->steps != NULL)
+ {
+ free ((char *) deriv->steps[0].__from_name);
+ free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
+ free ((struct __gconv_step *) deriv->steps);
+ }
- free ((struct __gconv_step *) deriv->steps);
free (deriv);
}
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5ca78dd02444d7a19d676d5c6aca9e0837f1b791
commit 5ca78dd02444d7a19d676d5c6aca9e0837f1b791
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Sep 7 14:12:12 2012 -0700
Rename LDFLAGS-XXX to LDLIBS-XXX for -lstdc++
diff --git a/ChangeLog b/ChangeLog
index f7a7692..6d3823e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2012-09-07 H.J. Lu <hongjiu.lu@intel.com>
+ * debug/Makefile (LDFLAGS-tst-chk4): Renamed to ...
+ (LDLIBS-tst-chk4): This.
+ (LDFLAGS-tst-chk5): Renamed to ...
+ (LDLIBS-tst-chk5): This.
+ (LDFLAGS-tst-chk6): Renamed to ...
+ (LDLIBS-tst-chk6): This.
+ (LDFLAGS-tst-lfschk4): Renamed to ...
+ (LDLIBS-tst-lfschk4): This.
+ (LDFLAGS-tst-lfschk5): Renamed to ...
+ (LDLIBS-tst-lfschk5): This.
+ (LDFLAGS-tst-lfschk6): Renamed to ...
+ (LDLIBS-tst-lfschk6): This.
+
* Makefile ($(inst_includedir)/gnu/stubs.h): Remove dependency
on $(common-objpfx)soversions.mk.
diff --git a/debug/Makefile b/debug/Makefile
index f4e38b4..ae5b674 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -114,12 +114,12 @@ tst-lfschk3-ENV = LOCPATH=$(common-objpfx)localedata
tst-lfschk4-ENV = LOCPATH=$(common-objpfx)localedata
tst-lfschk5-ENV = LOCPATH=$(common-objpfx)localedata
tst-lfschk6-ENV = LOCPATH=$(common-objpfx)localedata
-LDFLAGS-tst-chk4 = -lstdc++
-LDFLAGS-tst-chk5 = -lstdc++
-LDFLAGS-tst-chk6 = -lstdc++
-LDFLAGS-tst-lfschk4 = -lstdc++
-LDFLAGS-tst-lfschk5 = -lstdc++
-LDFLAGS-tst-lfschk6 = -lstdc++
+LDLIBS-tst-chk4 = -lstdc++
+LDLIBS-tst-chk5 = -lstdc++
+LDLIBS-tst-chk6 = -lstdc++
+LDLIBS-tst-lfschk4 = -lstdc++
+LDLIBS-tst-lfschk5 = -lstdc++
+LDLIBS-tst-lfschk6 = -lstdc++
tests = backtrace-tst tst-longjmp_chk tst-chk1 tst-chk2 tst-chk3 \
tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk \
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e9ceaf254cf54569baa266fcb29677c392360edc
commit e9ceaf254cf54569baa266fcb29677c392360edc
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Sep 7 14:11:47 2012 -0700
Rename LDFLAGS-XXX to LDLIBS-XXX for -lstdc++
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 34b3698..d722e15 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-07 H.J. Lu <hongjiu.lu@intel.com>
+
+ * debug/Makefile (LDFLAGS-tst-cancel24): Renamed to ...
+ (LDLIBS-tst-cancel24): This.
+
2012-09-06 H.J. Lu <hongjiu.lu@intel.com>
[BZ #14545]
diff --git a/nptl/Makefile b/nptl/Makefile
index ad7ac05..6f2b66c 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -507,7 +507,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a
$(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a
endif
-LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++
+LDLIBS-tst-cancel24 = $(no-as-needed) -lstdc++
extra-B-pthread.so = -B$(common-objpfx)nptl/
$(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=691bc9c1e449a9c3a277926fa28f7f41b63cd7df
commit 691bc9c1e449a9c3a277926fa28f7f41b63cd7df
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Sep 7 14:09:34 2012 -0700
Remove gnu/stubs.h dependency on soversions.mk
diff --git a/ChangeLog b/ChangeLog
index 9a3b132..f7a7692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-07 H.J. Lu <hongjiu.lu@intel.com>
+
+ * Makefile ($(inst_includedir)/gnu/stubs.h): Remove dependency
+ on $(common-objpfx)soversions.mk.
+
2012-09-07 Joseph Myers <joseph@codesourcery.com>
[BZ #10014]
diff --git a/Makefile b/Makefile
index 50c3eed..5617acc 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ installed-stubs = $(inst_includedir)/gnu/stubs.h
else
installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h
-$(inst_includedir)/gnu/stubs.h: $(common-objpfx)soversions.mk $(+force)
+$(inst_includedir)/gnu/stubs.h: $(+force)
$(make-target-directory)
{ \
echo '/* This file is automatically generated.';\
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 21 +++++++++++++++++++++
Makefile | 2 +-
debug/Makefile | 12 ++++++------
iconv/gconv_db.c | 9 ++++++---
nptl/ChangeLog | 5 +++++
nptl/Makefile | 2 +-
6 files changed, 40 insertions(+), 11 deletions(-)
hooks/post-receive
--
GNU C Library master sources