GNU C Library master sources branch, master, updated. glibc-2.14-87-gaae3030

[drepper at sourceware dot org]

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  aae30307aed7b29b7423132b4d40e9ec4ef0a0dc (commit)
       via  c0cfb5eb3da59b9ed1fd1e06825b6dd62534b42b (commit)
      from  ecaddd66991f5dc237f26cfdef51507019cfcc01 (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=aae30307aed7b29b7423132b4d40e9ec4ef0a0dc

commit aae30307aed7b29b7423132b4d40e9ec4ef0a0dc
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Wed Jul 6 21:42:59 2011 -0400

    iconvdata/johab.c: Don't inline unlikely called function

diff --git a/ChangeLog b/ChangeLog
index 8ad847a..38bfec4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-30  Marek Polacek  <mpolacek@redhat.com>
+
+	* iconvdata/johab.c: Don't inline `johab_sym_hanja_to_ucs' function.
+
 2011-06-21  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules):
diff --git a/iconvdata/johab.c b/iconvdata/johab.c
index 58cb5bc..a2f6fc8 100644
--- a/iconvdata/johab.c
+++ b/iconvdata/johab.c
@@ -1,5 +1,5 @@
 /* Mapping tables for JOHAB handling.
-   Copyright (C) 1998, 1999, 2000-2002, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1998-2002, 2007, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jungshik Shin <jshin@pantheon.yale.edu>
    and Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -93,7 +93,7 @@ static const int init_to_bit[19] =
 
 static const int mid_to_bit[21] =
 {
-          0x0060, 0x0080, 0x00a0, 0x00c0, 0x00e0,
+	  0x0060, 0x0080, 0x00a0, 0x00c0, 0x00e0,
   0x0140, 0x0160, 0x0180, 0x01a0, 0x01c0, 0x1e0,
   0x0240, 0x0260, 0x0280, 0x02a0, 0x02c0, 0x02e0,
   0x0340, 0x0360, 0x0380, 0x03a0
@@ -132,7 +132,7 @@ static const uint16_t jamo_from_ucs_table[51] =
 };
 
 
-static inline uint32_t
+static uint32_t
 johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 {
   if (idx <= 0xdefe)
@@ -255,7 +255,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2)
 						   + ch2 - (ch2 > 0x90	      \
 							    ? 0x43 : 0x31)];  \
 		       else						      \
-		         ch = __ksc5601_hanja_to_ucs[(ch - 0xe0) *192	      \
+			 ch = __ksc5601_hanja_to_ucs[(ch - 0xe0) *192	      \
 						     + ch2 -  (ch2 > 0x90     \
 							       ?0x43 : 0x31)];\
 		    */							      \

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c0cfb5eb3da59b9ed1fd1e06825b6dd62534b42b

commit c0cfb5eb3da59b9ed1fd1e06825b6dd62534b42b
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Wed Jul 6 21:38:49 2011 -0400

    Fix for installation in sysdeps/s390/s390-64/Makefile

diff --git a/ChangeLog b/ChangeLog
index 6ac3ae0..8ad847a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-21  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules):
+	Copy rule from iconvdata/Makefile.
+
 2011-07-06  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #12922]
diff --git a/sysdeps/s390/s390-64/Makefile b/sysdeps/s390/s390-64/Makefile
index 1814f37..1dd3acf 100644
--- a/sysdeps/s390/s390-64/Makefile
+++ b/sysdeps/s390/s390-64/Makefile
@@ -74,5 +74,17 @@ $(objpfx)gconv-modules-s390: gconv-modules $(+force)
 
 $(inst_gconvdir)/gconv-modules: $(objpfx)gconv-modules-s390 $(+force)
 	$(do-install)
+ifeq (no,$(cross-compiling))
+# Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
+# if this libc has more gconv modules than the previously installed one.
+	if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
+	   LC_ALL=C LANGUAGE=C \
+	   $(common-objpfx)elf/ld.so --library-path $(rpath-link) \
+	   $(common-objpfx)iconv/iconvconfig \
+	     $(addprefix --prefix=,$(install_root)); \
+	fi
+else
+	@echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache'
+endif
 
 endif

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |    9 +++++++++
 iconvdata/johab.c             |    8 ++++----
 sysdeps/s390/s390-64/Makefile |   12 ++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources