rpms/gcc/devel gcc43-altivec-tests.patch, NONE, 1.1 gcc43-libtool-no-rpath.patch, NONE, 1.1 gcc43.spec, 1.41, 1.42

[Jakub Jelinek]

Author: jakub

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

Modified Files:
	gcc43.spec 
Added Files:
	gcc43-altivec-tests.patch gcc43-libtool-no-rpath.patch 
Log Message:
4.3.2-3

gcc43-altivec-tests.patch:

--- NEW FILE gcc43-altivec-tests.patch ---
2008-08-26  Janis Johnson  <janis187 at us.ibm.com>

	* g++.dg/ext/altivec-3.C: Move AltiVec code out of main.

2008-04-04  Janis Johnson  <janis187 at us.ibm.com>

	* gcc.dg/var-expand3.c: Skip for powerpc-linux if not on AltiVec HW.

--- gcc/testsuite/g++.dg/ext/altivec-3.C	(revision 139609)
+++ gcc/testsuite/g++.dg/ext/altivec-3.C	(revision 139610)
@@ -120,16 +120,19 @@ void baz2 (int i, ... )
     CHECK_INVARIANT (vec_all_eq (vxi.v, vx_g.v));
 }
 
-int main(void)
+void main1(void)
 {
     CHECK_INVARIANT (sizeof(struct foo) == 8 && sizeof(struct vfoo) == 48);
 
-    altivec_check();
-
     bar(i_1, x_g, (short)i_2, (float)d_2, ld_1, (char)i_1, d_3);
     baz(i_1, v_g, i_1, vx_g, i_1, v2_g, i_1, vx2_g); 
     quux(i_1, v_g, v_g);
     baz2(i_1, vx_g);
-    
+}
+
+int main(void)
+{
+    altivec_check();
+    main1();
     return 0;
 }
--- gcc/testsuite/gcc.dg/var-expand3.c	(revision 133910)
+++ gcc/testsuite/gcc.dg/var-expand3.c	(revision 133911)
@@ -1,4 +1,4 @@
-/* { dg-do run { target { powerpc*-*-* && powerpc_altivec_ok } } }} */
+/* { dg-do run { target { powerpc*-*-* && vmx_hw } } }} */
 /* { dg-options "-O2 -funroll-loops -ffast-math -fvariable-expansion-in-unroller -maltivec -fdump-rtl-loop2" } */
 
 #include "altivec.h"

gcc43-libtool-no-rpath.patch:

--- NEW FILE gcc43-libtool-no-rpath.patch ---
libtool sucks.
--- ltmain.sh.jj	2007-12-07 14:53:21.000000000 +0100
+++ ltmain.sh	2008-09-05 21:51:48.000000000 +0200
@@ -5394,6 +5394,7 @@ EOF
 	  rpath="$finalize_rpath"
 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
+	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
 		if test -z "$hardcode_libdirs"; then
@@ -6071,6 +6072,7 @@ EOF
       rpath=
       hardcode_libdirs=
       for libdir in $compile_rpath $finalize_rpath; do
+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
@@ -6120,6 +6122,7 @@ EOF
       rpath=
       hardcode_libdirs=
       for libdir in $finalize_rpath; do
+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then


Index: gcc43.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc43.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gcc43.spec	5 Sep 2008 08:43:54 -0000	1.41
+++ gcc43.spec	5 Sep 2008 22:15:57 -0000	1.42
@@ -51,7 +51,7 @@
 %define fastjar_ver 0.95
 Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
 URL: http://gcc.gnu.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n))
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Need binutils with -pie support >= 2.14.90.0.4-4
 # Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
 # Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
@@ -152,6 +152,8 @@
 Patch16: gcc43-libgomp-omp_h-multilib.patch
 Patch17: gcc43-x86_64-va_start.patch
 Patch18: gcc43-pr37189.patch
+Patch19: gcc43-altivec-tests.patch
+Patch20: gcc43-libtool-no-rpath.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -454,6 +456,8 @@
 %patch16 -p0 -b .libgomp-omp_h-multilib~
 %patch17 -p0 -b .x86_64-va_start~
 %patch18 -p0 -b .pr37189~
+%patch19 -p0 -b .altivec-tests~
+%patch20 -p0 -b .libtool-no-rpath~
 
 tar xzf %{SOURCE4}
 
@@ -1702,6 +1706,12 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sat Sep  6 2008 Jakub Jelinek <jakub at redhat.com> 4.3.2-3
+- don't run tests that require Altivec hw on non-Altivec powerpcs
+- make sure none of libgcj binaries/libraries contains /usr/%{lib} in
+  RPATH
+- fix up BuildRoot
+
 * Fri Sep  5 2008 Jakub Jelinek <jakub at redhat.com> 4.3.2-2
 - update from gcc-4_3-branch
   - PRs c++/37348, c/37261, fortran/36371, fortran/37193, middle-end/36449,