Latest updates from FSF 4.7 branch

From-SVN: r190174

9 files changed, 21 insertions, 59 deletions

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 0edfe264c85..47f88a1c520 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,27 +1,3 @@
-2012-06-14  Jakub Jelinek  <jakub@redhat.com>
-
-	Backported from mainline
-	2012-06-07  Jakub Jelinek  <jakub@redhat.com>
-
-	PR middle-end/53580
-	* testsuite/libgomp.c/pr26943-2.c: Remove #pragma omp barrier,
-	use GOMP_barrier () call instead.
-	* testsuite/libgomp.c/pr26943-3.c: Likewise.
-	* testsuite/libgomp.c/pr26943-4.c: Likewise.
-	* testsuite/libgomp.fortran/vla4.f90: Remove !$omp barrier,
-	call GOMP_barrier instead.
-	* testsuite/libgomp.fortran/vla5.f90: Likewise.
-
-	2012-06-06  Jakub Jelinek  <jakub@redhat.com>
-
-	PR libgomp/52993
-	* config/linux/lock.c (gomp_init_nest_lock_25): Fix up last
-	argument to memset call.
-
-2012-06-14  Release Manager
-
-	* GCC 4.7.1 released.
-
 2012-03-22  Jakub Jelinek  <jakub@redhat.com>
 
 	PR middle-end/52547
diff --git a/libgomp/config.h.in b/libgomp/config.h.in
index 14c7e2a9a1b..427f57f769f 100644
--- a/libgomp/config.h.in
+++ b/libgomp/config.h.in
@@ -79,9 +79,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if GNU symbol versioning is used for libgomp. */
-#undef LIBGOMP_GNU_SYMBOL_VERSIONING
-
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR
@@ -107,19 +104,19 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* The size of `char', as computed by sizeof. */
+/* The size of a `char', as computed by sizeof. */
 #undef SIZEOF_CHAR
 
-/* The size of `int', as computed by sizeof. */
+/* The size of a `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
-/* The size of `long', as computed by sizeof. */
+/* The size of a `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
-/* The size of `short', as computed by sizeof. */
+/* The size of a `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
-/* The size of `void *', as computed by sizeof. */
+/* The size of a `void *', as computed by sizeof. */
 #undef SIZEOF_VOID_P
 
 /* Define to 1 if you have the ANSI C header files. */
diff --git a/libgomp/config/linux/lock.c b/libgomp/config/linux/lock.c
index 047d8cdf782..60693439422 100644
--- a/libgomp/config/linux/lock.c
+++ b/libgomp/config/linux/lock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2008, 2009, 2011 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@redhat.com>.
 
    This file is part of the GNU OpenMP Library (libgomp).
@@ -175,7 +175,7 @@ static inline int gomp_tid (void)
 void
 gomp_init_nest_lock_25 (omp_nest_lock_25_t *lock)
 {
-  memset (lock, 0, sizeof (*lock));
+  memset (lock, 0, sizeof (lock));
 }
 
 void
diff --git a/libgomp/configure b/libgomp/configure
index 8ed841a06e0..ef39d665d12 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -9315,7 +9315,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
+    freebsd2*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10228,7 +10228,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[23].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10246,7 +10246,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -13162,7 +13162,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
+    freebsd2*)
       archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct_FC=yes
       hardcode_minus_L_FC=yes
@@ -13867,7 +13867,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[23].*) objformat=aout ;;
+    freebsd[123]*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -13885,7 +13885,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2.*)
+  freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
diff --git a/libgomp/testsuite/libgomp.c/pr26943-2.c b/libgomp/testsuite/libgomp.c/pr26943-2.c
index 2ed21ae963e..c052e811288 100644
--- a/libgomp/testsuite/libgomp.c/pr26943-2.c
+++ b/libgomp/testsuite/libgomp.c/pr26943-2.c
@@ -3,7 +3,6 @@
 
 extern int omp_set_dynamic (int);
 extern void abort (void);
-extern void GOMP_barrier (void);
 
 int a = 8, b = 12, c = 16, d = 20, j = 0;
 char e[10] = "a", f[10] = "b", g[10] = "c", h[10] = "d";
@@ -21,7 +20,7 @@ main (void)
     {
       if (a != 8 || b != 12 || e[0] != 'a' || f[0] != 'b')
 	j++;
-      GOMP_barrier ();
+#pragma omp barrier	/* { dg-warning "may not be closely nested" } */
 #pragma omp atomic
       a += i;
       b += i;
@@ -32,7 +31,7 @@ main (void)
       f[0] += i;
       g[0] = 'g' + i;
       h[0] = 'h' + i;
-      GOMP_barrier ();
+#pragma omp barrier	/* { dg-warning "may not be closely nested" } */
       if (a != 8 + 6 || b != 12 + i || c != i || d != i)
 	j += 8;
       if (e[0] != 'a' + 6 || f[0] != 'b' + i || g[0] != 'g' + i)
diff --git a/libgomp/testsuite/libgomp.c/pr26943-3.c b/libgomp/testsuite/libgomp.c/pr26943-3.c
index 855a4b27446..dc3d5010da1 100644
--- a/libgomp/testsuite/libgomp.c/pr26943-3.c
+++ b/libgomp/testsuite/libgomp.c/pr26943-3.c
@@ -4,7 +4,6 @@
 extern int omp_set_dynamic (int);
 extern int omp_get_thread_num (void);
 extern void abort (void);
-extern void GOMP_barrier (void);
 
 int a = 8, b = 12, c = 16, d = 20, j = 0, l = 0;
 char e[10] = "a", f[10] = "b", g[10] = "c", h[10] = "d";
@@ -27,7 +26,7 @@ main (void)
 	{
 	  if (a != 8 || b != 12 || e[0] != 'a' || f[0] != 'b')
 	    j++;
-	  GOMP_barrier ();
+#pragma omp barrier	/* { dg-warning "may not be closely nested" } */
 #pragma omp atomic
 	  a += i;
 	  b += i;
@@ -38,7 +37,7 @@ main (void)
 	  f[0] += i;
 	  g[0] = 'g' + i;
 	  h[0] = 'h' + i;
-	  GOMP_barrier ();
+#pragma omp barrier	/* { dg-warning "may not be closely nested" } */
 	  if (a != 8 + 6 || b != 12 + i || c != i || d != i)
 	    j += 8;
 	  if (e[0] != 'a' + 6 || f[0] != 'b' + i || g[0] != 'g' + i)
diff --git a/libgomp/testsuite/libgomp.c/pr26943-4.c b/libgomp/testsuite/libgomp.c/pr26943-4.c
index 24f253d236d..0f1d4197a5f 100644
--- a/libgomp/testsuite/libgomp.c/pr26943-4.c
+++ b/libgomp/testsuite/libgomp.c/pr26943-4.c
@@ -4,7 +4,6 @@
 extern int omp_set_dynamic (int);
 extern int omp_get_thread_num (void);
 extern void abort (void);
-extern void GOMP_barrier (void);
 
 int a = 8, b = 12, c = 16, d = 20, j = 0, l = 0;
 char e[10] = "a", f[10] = "b", g[10] = "c", h[10] = "d";
@@ -28,7 +27,7 @@ main (void)
 	{
 	  if (a != 8 || b != 12 || e[0] != 'a' || f[0] != 'b')
 	    j++;
-	  GOMP_barrier ();
+#pragma omp barrier	/* { dg-warning "may not be closely nested" } */
 #pragma omp atomic
 	  a += i;
 	  b += i;
@@ -39,7 +38,7 @@ main (void)
 	  f[0] += i;
 	  g[0] = 'g' + i;
 	  h[0] = 'h' + i;
-	  GOMP_barrier ();
+#pragma omp barrier	/* { dg-warning "may not be closely nested" } */
 	  if (a != 8 + 6 || b != 12 + i || c != i || d != i)
 	    j += 8;
 	  if (e[0] != 'a' + 6 || f[0] != 'b' + i || g[0] != 'g' + i)
diff --git a/libgomp/testsuite/libgomp.fortran/vla4.f90 b/libgomp/testsuite/libgomp.fortran/vla4.f90
index 0bee30cf817..cdd4849b6ad 100644
--- a/libgomp/testsuite/libgomp.fortran/vla4.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla4.f90
@@ -10,10 +10,6 @@ contains
 
   subroutine foo (c, d, e, f, g, h, i, j, k, n)
     use omp_lib
-    interface
-      subroutine GOMP_barrier () bind(c, name="GOMP_barrier")
-      end subroutine
-    end interface
     integer :: n
     character (len = *) :: c
     character (len = n) :: d
@@ -98,7 +94,7 @@ contains
     forall (p = 1:2, q = 3:7, r = 1:7) u(p, q, r) = 30 - x - p + q - 2 * r
     forall (p = 1:5, q = 3:7, p + q .le. 8) v(p, q) = w(1:7)
     forall (p = 1:5, q = 3:7, p + q .gt. 8) v(p, q) = w(20:26)
-    call GOMP_barrier
+!$omp barrier		! { dg-warning "may not be closely nested" }
     y = ''
     if (x .eq. 0) y = '0'
     if (x .eq. 1) y = '1'
diff --git a/libgomp/testsuite/libgomp.fortran/vla5.f90 b/libgomp/testsuite/libgomp.fortran/vla5.f90
index cdd561d3961..9b611505219 100644
--- a/libgomp/testsuite/libgomp.fortran/vla5.f90
+++ b/libgomp/testsuite/libgomp.fortran/vla5.f90
@@ -10,10 +10,6 @@ contains
 
   subroutine foo (c, d, e, f, g, h, i, j, k, n)
     use omp_lib
-    interface
-      subroutine GOMP_barrier () bind(c, name="GOMP_barrier")
-      end subroutine
-    end interface
     integer :: n
     character (len = *) :: c
     character (len = n) :: d
@@ -70,7 +66,7 @@ contains
     forall (p = 1:2, q = 3:7, r = 1:7) u(p, q, r) = 30 - x - p + q - 2 * r
     forall (p = 1:5, q = 3:7, p + q .le. 8) v(p, q) = w(1:7)
     forall (p = 1:5, q = 3:7, p + q .gt. 8) v(p, q) = w(20:26)
-    call GOMP_barrier
+!$omp barrier		! { dg-warning "may not be closely nested" }
     y = ''
     if (x .eq. 0) y = '0'
     if (x .eq. 1) y = '1'