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.20-553-gd742385
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Jan 2015 22:40:09 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-553-gd742385
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 d7423856b5949401e08136d8db8ece1d9dc229f9 (commit)
from 6b2ba95b6baab6b1789e8823c8a808e09bc98794 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d7423856b5949401e08136d8db8ece1d9dc229f9
commit d7423856b5949401e08136d8db8ece1d9dc229f9
Author: Joseph Myers <joseph@codesourcery.com>
Date: Thu Jan 22 22:39:26 2015 +0000
soft-fp: Use __label__ for all labels within macros.
soft-fp has various macros containing labels and goto statements.
Because label names are function-scoped, this is problematic for using
the same macro more than once within a function, which some
architectures do in the Linux kernel (the soft-fp version there
predates the addition of any of these labels and gotos). This patch
fixes this by using __label__ to make the labels local to the block
with the __label__ declaration.
Tested for powerpc-nofpu that installed stripped shared libraries are
unchanged by this patch.
* soft-fp/op-common.h (_FP_ADD_INTERNAL): Declare labels with
__label__.
(_FP_FMA): Likewise.
(_FP_TO_INT_ROUND): Likewise.
(_FP_FROM_INT): Likewise.
diff --git a/ChangeLog b/ChangeLog
index a8cc4e5..ae428c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-22 Joseph Myers <joseph@codesourcery.com>
+
+ * soft-fp/op-common.h (_FP_ADD_INTERNAL): Declare labels with
+ __label__.
+ (_FP_FMA): Likewise.
+ (_FP_TO_INT_ROUND): Likewise.
+ (_FP_FROM_INT): Likewise.
+
2015-01-21 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
[BZ #16418]
diff --git a/soft-fp/op-common.h b/soft-fp/op-common.h
index f92e3b2..6b8b52f 100644
--- a/soft-fp/op-common.h
+++ b/soft-fp/op-common.h
@@ -414,6 +414,7 @@
if (X##_s == Y##_s) \
{ \
/* Addition. */ \
+ __label__ add1, add2, add3, add_done; \
R##_s = X##_s; \
int _FP_ADD_INTERNAL_ediff = X##_e - Y##_e; \
if (_FP_ADD_INTERNAL_ediff > 0) \
@@ -599,6 +600,7 @@
else \
{ \
/* Subtraction. */ \
+ __label__ sub1, sub2, sub3, norm, sub_done; \
int _FP_ADD_INTERNAL_ediff = X##_e - Y##_e; \
if (_FP_ADD_INTERNAL_ediff > 0) \
{ \
@@ -933,6 +935,7 @@
#define _FP_FMA(fs, wc, dwc, R, X, Y, Z) \
do \
{ \
+ __label__ done_fma; \
FP_DECL_##fs (_FP_FMA_T); \
_FP_FMA_T##_s = X##_s ^ Y##_s; \
_FP_FMA_T##_e = X##_e + Y##_e + 1; \
@@ -1531,6 +1534,7 @@
#define _FP_TO_INT_ROUND(fs, wc, r, X, rsize, rsigned) \
do \
{ \
+ __label__ _FP_TO_INT_ROUND_done; \
if (X##_e < _FP_EXPBIAS_##fs) \
{ \
int _FP_TO_INT_ROUND_rounds_away = 0; \
@@ -1742,6 +1746,7 @@
#define _FP_FROM_INT(fs, wc, X, r, rsize, rtype) \
do \
{ \
+ __label__ pack_semiraw; \
if (r) \
{ \
rtype _FP_FROM_INT_ur; \
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
soft-fp/op-common.h | 5 +++++
2 files changed, 13 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources