rpms/kdelibs/devel kdelibs-4.2.1-kjs-gcc44-crash.patch, NONE, 1.1 kdelibs.spec, 1.449, 1.450 kdelibs-4.2.0-kjs-gcc44-crash.patch, 1.2, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8685/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.1-kjs-gcc44-crash.patch 
Removed Files:
	kdelibs-4.2.0-kjs-gcc44-crash.patch 
Log Message:
* Tue Mar 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3
- better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing)

kdelibs-4.2.1-kjs-gcc44-crash.patch:

--- NEW FILE kdelibs-4.2.1-kjs-gcc44-crash.patch ---
diff -ur kdelibs-4.2.1/kjs/dtoa.cpp kdelibs-4.2.1-kjs-gcc44-crash/kjs/dtoa.cpp
--- kdelibs-4.2.1/kjs/dtoa.cpp	2008-05-21 13:06:47.000000000 +0200
+++ kdelibs-4.2.1-kjs-gcc44-crash/kjs/dtoa.cpp	2009-03-03 20:18:46.000000000 +0100
@@ -299,6 +299,15 @@
 #define word0(x) ((ULong *)&x)[0]
 #define word1(x) ((ULong *)&x)[1]
 #endif
+#elif defined __GNUC__
+#define dval(x) x
+#ifdef IEEE_8087
+#define word0(x) (__extension__ ((U) { d: (x) }).L[1])
+#define word1(x) (__extension__ ((U) { d: (x) }).L[0])
+#else
+#define word0(x) (__extension__ ((U) { d: (x) }).L[0])
+#define word1(x) (__extension__ ((U) { d: (x) }).L[1])
+#endif
 #else
 #ifdef IEEE_8087
 #define word0(x) ((U*)&x)->L[1]
@@ -314,7 +323,9 @@
  * An alternative that might be better on some machines is
  * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
  */
-#if defined(IEEE_8087) + defined(VAX)
+#if !defined(YES_ALIAS) && defined(__GNUC__)
+#define Storeinc(a,b,c) (*a++ = b << 16 | (c & 0xffff))
+#elif defined(IEEE_8087) + defined(VAX)
 #define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
 ((unsigned short *)a)[0] = (unsigned short)c, a++)
 #else


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- kdelibs.spec	1 Mar 2009 11:21:50 -0000	1.449
+++ kdelibs.spec	3 Mar 2009 19:40:16 -0000	1.450
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -79,8 +79,8 @@
 Patch20: kdelibs-4.1.70-cmake.patch
 Patch22: kdelibs-4.1.96-cmake.patch
 Patch23: kdelibs-4.2.0-gcc44-workaround.patch
-# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
-Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
+# fix aliasing problems in kjs/dtoa.cpp (GCC 4.4 crash) (#485968)
+Patch24: kdelibs-4.2.1-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
 
 # upstream
@@ -401,6 +401,9 @@
 
 
 %changelog
+* Tue Mar 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.1-3
+- better fix for #485968 (fix aliasing instead of using -fno-strict-aliasing)
+
 * Sun Mar 01 2009 Than Ngo <than at redhat.com> - 4.2.1-2
 - respin
 


--- kdelibs-4.2.0-kjs-gcc44-crash.patch DELETED ---