From 542a6f62afe483fe282adaf60f5c0a185c12e824 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 24 Aug 2006 07:09:54 +0000
Subject: [BZ #2734]

2006-08-24  Ulrich Drepper  <drepper@redhat.com>
	[BZ #2734]
	* sysdeps/i386/bits/byteswap.h (__bswap_32): Use same conditions
	as in the x86-64 code to use bswap.
---
 ChangeLog                    |  6 ++++++
 localedata/ChangeLog         |  6 ++++++
 localedata/locales/et_EE     | 26 ++++++++++++++++++--------
 sysdeps/i386/bits/byteswap.h |  5 +++--
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf6c657177..4e9bd87c44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-24  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #2734]
+	* sysdeps/i386/bits/byteswap.h (__bswap_32): Use same conditions
+	as in the x86-64 code to use bswap.
+
 2006-05-21  Joseph S. Myers  <joseph@codesourcery.com>
 
 	[BZ #2680]
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 7ce7be02be..df44366657 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-24  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #2695]
+	* locales/et_EE: Update LC_ADDRESS category.
+	Patch by Priit Laes <amd@store20.com>.
+
 2006-08-23  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #2662]
diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE
index 3c70cdf624..e44e0c88c7 100644
--- a/localedata/locales/et_EE
+++ b/localedata/locales/et_EE
@@ -2228,12 +2228,22 @@ name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
 END LC_NAME
 
 LC_ADDRESS
-postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
-<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
-<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
-<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
-<U004E><U0025><U0063><U0025><U004E>"
-country_ab2 "<U0045><U0045>"
-country_ab3 "<U0045><U0053><U0054>"
-country_num 233
+postal_fmt      "<U0025><U0061><U0025><U004E>/
+                 <U0025><U0066><U0025><U004E>/
+                 <U0025><U0064><U0025><U004E>/
+                 <U0025><U0062><U0025><U004E>/
+                 <U0025><U0073><U0025><U0074><U0025><U0068><U0025><U0074><U0025><U0065><U0025><U0074><U0025><U0072><U0025><U004E>/
+                 <U0025><U0043><U002D><U0025><U007A><U0020><U0025><U0054><U0025><U004E>/
+                 <U0025><U0063><U0025><U004E>"
+country_name    "<U0045><U0065><U0073><U0074><U0069>"
+country_post    "<U0045><U0045>"
+country_ab2     "<U0045><U0045>"
+country_ab3     "<U0045><U0053><U0054>"
+country_num     233
+country_car     "<U0045><U0053><U0054>"
+country_isbn    "<U0039><U0039><U0038><U0035>"
+lang_name       "<U0065><U0065><U0073><U0074><U0069><U0020><U006B><U0065><U0065><U006C>"
+lang_ab         "<U0065><U0074>"
+lang_term       "<U0065><U0073><U0074>"
+lang_lib        "<U0065><U0073><U0074>"
 END LC_ADDRESS
diff --git a/sysdeps/i386/bits/byteswap.h b/sysdeps/i386/bits/byteswap.h
index 33af208888..bed27559c5 100644
--- a/sysdeps/i386/bits/byteswap.h
+++ b/sysdeps/i386/bits/byteswap.h
@@ -1,5 +1,5 @@
 /* Macros to swap the order of bytes in integer values.
-   Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997,1998,2000,2002,2003,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -65,7 +65,8 @@ __bswap_16 (unsigned short int __bsx)
 /* To swap the bytes in a word the i486 processors and up provide the
    `bswap' opcode.  On i386 we have to use three instructions.  */
 #  if !defined __i486__ && !defined __pentium__ && !defined __pentiumpro__ \
-      && !defined __pentium4__
+      && !defined __pentium4__ && !defined __k8__ && !defined __athlon__ \
+      && !defined __k6__
 #   define __bswap_32(x)						      \
      (__extension__							      \
       ({ register unsigned int __v, __x = (x);				      \
-- 
cgit v1.2.3