rpms/gcc/devel gcc41-pr32550.patch, NONE, 1.1 gcc41.spec, 1.162, 1.163 gcc41-pr31748.patch, 1.1, NONE gcc41-pr32468-2.patch, 1.1, NONE gcc41-pr32468.patch, 1.1, NONE gcc41-rh245424.patch, 1.1, NONE

[Jakub Jelinek (jakub)]

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1506

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-pr32550.patch 
Removed Files:
	gcc41-pr31748.patch gcc41-pr32468-2.patch gcc41-pr32468.patch 
	gcc41-rh245424.patch 
Log Message:
4.1.2-15

gcc41-pr32550.patch:

--- NEW FILE gcc41-pr32550.patch ---
2007-07-02  Jakub Jelinek  <jakub at redhat.com>

	PR fortran/32550
	* trans.h (GFC_POINTER_TYPE_P): Define.
	* trans-types.c (gfc_sym_type): Set it for types on attr->sym.pointer.
	* trans-openmp.c (gfc_omp_privatize_by_reference): Return false
	if GFC_POINTER_TYPE_P is set on the type.

	* testsuite/libgomp.fortran/pr32550.f90: New test.
	* testsuite/libgomp.fortran/crayptr2.f90: New test.

--- gcc/fortran/trans.h.jj	2007-05-30 14:54:52.000000000 +0200
+++ gcc/fortran/trans.h	2007-07-02 13:02:08.000000000 +0200
@@ -603,6 +603,8 @@ struct lang_decl		GTY(())
 #define GFC_DESCRIPTOR_TYPE_P(node) TYPE_LANG_FLAG_1(node)
 /* An array without a descriptor.  */
 #define GFC_ARRAY_TYPE_P(node) TYPE_LANG_FLAG_2(node)
+/* Fortran POINTER type.  */
+#define GFC_POINTER_TYPE_P(node) TYPE_LANG_FLAG_3(node)
 /* The GFC_TYPE_ARRAY_* members are present in both descriptor and
    descriptorless array types.  */
 #define GFC_TYPE_ARRAY_LBOUND(node, dim) \
--- gcc/fortran/trans-openmp.c.jj	2007-05-30 14:54:52.000000000 +0200
+++ gcc/fortran/trans-openmp.c	2007-07-02 13:10:19.000000000 +0200
@@ -50,9 +50,12 @@ gfc_omp_privatize_by_reference (tree dec
 
   if (TREE_CODE (type) == POINTER_TYPE)
     {
-      /* POINTER/ALLOCATABLE have aggregate types, all user variables
-	 that have POINTER_TYPE type are supposed to be privatized
-	 by reference.  */
+      /* Array POINTER/ALLOCATABLE have aggregate types, all user variables
+	 that have POINTER_TYPE type and don't have GFC_POINTER_TYPE_P
+	 set are supposed to be privatized by reference.  */
+      if (GFC_POINTER_TYPE_P (type))
+	return false;
+
       if (!DECL_ARTIFICIAL (decl))
 	return true;
 
--- gcc/fortran/trans-types.c.jj	2007-06-13 17:38:49.000000000 +0200
+++ gcc/fortran/trans-types.c	2007-07-02 13:03:22.000000000 +0200
@@ -1364,6 +1364,8 @@ gfc_sym_type (gfc_symbol * sym)
     {
       if (sym->attr.allocatable || sym->attr.pointer)
 	type = gfc_build_pointer_type (sym, type);
+      if (sym->attr.pointer)
+	GFC_POINTER_TYPE_P (type) = 1;
     }
 
   /* We currently pass all parameters by reference.
--- libgomp/testsuite/libgomp.fortran/crayptr2.f90.jj	2007-07-02 13:23:11.000000000 +0200
+++ libgomp/testsuite/libgomp.fortran/crayptr2.f90	2007-07-02 13:38:34.000000000 +0200
@@ -0,0 +1,30 @@
+! { dg-do run }
+! { dg-options "-fopenmp -fcray-pointer" }
+
+  use omp_lib
+  integer :: a, b, c, d, p
+  logical :: l
+  pointer (ip, p)
+  save ip
+!$omp threadprivate (ip)
+  a = 1
+  b = 2
+  c = 3
+  l = .false.
+!$omp parallel num_threads (3) reduction (.or.:l)
+  if (omp_get_thread_num () .eq. 0) then
+    ip = loc (a)
+  elseif (omp_get_thread_num () .eq. 1) then
+    ip = loc (b)
+  else
+    ip = loc (c)
+  end if
+  l = p .ne. omp_get_thread_num () + 1
+!$omp single
+  d = omp_get_thread_num ()
+!$omp end single copyprivate (d, ip)
+  l = l .or. (p .ne. d + 1)
+!$omp end parallel
+
+  if (l) call abort
+end
--- libgomp/testsuite/libgomp.fortran/pr32550.f90.jj	2007-07-02 13:17:59.000000000 +0200
+++ libgomp/testsuite/libgomp.fortran/pr32550.f90	2007-07-02 13:18:10.000000000 +0200
@@ -0,0 +1,20 @@
+! PR fortran/32550
+! { dg-do run }
+
+      integer, pointer, save :: ptr
+      integer, target :: targ
+      integer :: e
+!$omp threadprivate(ptr)
+      e = 0
+      targ = 42
+!$omp parallel shared(targ)
+!$omp single
+      ptr => targ
+!$omp end single copyprivate(ptr)
+      if (ptr.ne.42) then
+!$omp atomic
+	e = e + 1
+      end if
+!$omp end parallel
+      if (e.ne.0) call abort
+      end


Index: gcc41.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gcc41.spec	26 Jun 2007 13:04:20 -0000	1.162
+++ gcc41.spec	4 Jul 2007 19:53:02 -0000	1.163
@@ -1,6 +1,6 @@
-%define DATE 20070626
+%define DATE 20070704
 %define gcc_version 4.1.2
-%define gcc_release 14
+%define gcc_release 15
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -130,11 +130,8 @@
 Patch19: gcc41-pr32139.patch
 Patch20: gcc41-rh236895.patch
 Patch21: gcc41-rh235008.patch
-Patch22: gcc41-pr31748.patch
+Patch22: gcc41-pr32550.patch
 Patch23: gcc41-pr28690.patch
-Patch24: gcc41-pr32468.patch
-Patch25: gcc41-pr32468-2.patch
-Patch26: gcc41-rh245424.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -435,11 +432,8 @@
 %patch19 -p0 -b .pr32139~
 %patch20 -p0 -b .rh236895~
 %patch21 -p0 -b .rh235008~
-%patch22 -p0 -b .pr31748~
+%patch22 -p0 -b .pr32550~
 %patch23 -p0 -b .pr28690~
-%patch24 -p0 -b .pr32468~
-%patch25 -p0 -b .pr32468-2~
-%patch26 -p0 -b .rh245424~
 
 sed -i -e 's/4\.1\.3/4.1.2/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1563,6 +1557,14 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Wed Jul  4 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-15
+- update from gcc-4_1-branch (-r126008:126302)
+  - PRs boehm-gc/21940, boehm-gc/21942, target/28307, target/32506,
+	tree-optimization/31966, tree-optimization/32533
+- merge in redhat/gcc-4_1-jdwp-merge-branch
+  - JDWP support (Keith Seitz)
+- fix OpenMP handling of Fortran POINTER non-array vars (PR fortran/32550)
+
 * Tue Jun 26 2007 Jakub Jelinek <jakub at redhat.com> 4.1.2-14
 - update from gcc-4_1-branch (-r125727:126008)
   - PRs inline-asm/32109, rtl-optimization/28011, target/32389


--- gcc41-pr31748.patch DELETED ---


--- gcc41-pr32468-2.patch DELETED ---


--- gcc41-pr32468.patch DELETED ---


--- gcc41-rh245424.patch DELETED ---