fix broken checkin, test should be link not assemble

[pf3gnuchains/gcc-fork.git] / libgomp / omp_lib.h.in

diff --git a/libgomp/omp_lib.h.in b/libgomp/omp_lib.h.in
index 734f2f7..2ff7a42 100644 (file)
--- a/libgomp/omp_lib.h.in
+++ b/libgomp/omp_lib.h.in
@@ -1,34 +1,38 @@
-!  Copyright (C) 2005 Free Software Foundation, Inc.
+!  Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.

 !  Contributed by Jakub Jelinek <jakub@redhat.com>.
 
 !  This file is part of the GNU OpenMP Library (libgomp).
 
 !  Libgomp is free software; you can redistribute it and/or modify it
 !  Contributed by Jakub Jelinek <jakub@redhat.com>.
 
 !  This file is part of the GNU OpenMP Library (libgomp).
 
 !  Libgomp is free software; you can redistribute it and/or modify it

-!  under the terms of the GNU Lesser General Public License as published by
-!  the Free Software Foundation; either version 2.1 of the License, or
-!  (at your option) any later version.
+!  under the terms of the GNU General Public License as published by
+!  the Free Software Foundation; either version 3, or (at your option)
+!  any later version.

 
 !  Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
 !  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 
 !  Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
 !  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS

-!  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+!  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 !  more details.
 
 !  more details.
 

-!  You should have received a copy of the GNU Lesser General Public License
-!  along with libgomp; see the file COPYING.LIB.  If not, write to the
-!  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-!  MA 02110-1301, USA.  */
+!  Under Section 7 of GPL version 3, you are granted additional
+!  permissions described in the GCC Runtime Library Exception, version
+!  3.1, as published by the Free Software Foundation.

 
 

-!  As a special exception, if you link this library with other files, some
-!  of which are compiled with GCC, to produce an executable, this library
-!  does not by itself cause the resulting executable to be covered by the
-!  GNU General Public License.  This exception does not however invalidate
-!  any other reasons why the executable file might be covered by the GNU
-!  General Public License.
+!  You should have received a copy of the GNU General Public License and
+!  a copy of the GCC Runtime Library Exception along with this program;
+!  see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+!  <http://www.gnu.org/licenses/>.

 
       integer omp_lock_kind, omp_nest_lock_kind, openmp_version
 
       integer omp_lock_kind, omp_nest_lock_kind, openmp_version

+      integer omp_sched_kind, omp_sched_static, omp_sched_dynamic
+      integer omp_sched_guided, omp_sched_auto

       parameter (omp_lock_kind = @OMP_LOCK_KIND@)
       parameter (omp_nest_lock_kind = @OMP_NEST_LOCK_KIND@)
       parameter (omp_lock_kind = @OMP_LOCK_KIND@)
       parameter (omp_nest_lock_kind = @OMP_NEST_LOCK_KIND@)

-      parameter (openmp_version = 200505)
+      parameter (omp_sched_kind = 4)
+      parameter (omp_sched_static = 1)
+      parameter (omp_sched_dynamic = 2)
+      parameter (omp_sched_guided = 3)
+      parameter (omp_sched_auto = 4)
+      parameter (openmp_version = 200805)

 
       external omp_init_lock, omp_init_nest_lock
       external omp_destroy_lock, omp_destroy_nest_lock
 
       external omp_init_lock, omp_init_nest_lock
       external omp_destroy_lock, omp_destroy_nest_lock


@@ -38,16 +42,25 @@
       external omp_set_num_threads
 
       external omp_get_dynamic, omp_get_nested
       external omp_set_num_threads
 
       external omp_get_dynamic, omp_get_nested

-      logical*4 omp_get_dynamic, omp_get_nested
+      logical(4) omp_get_dynamic, omp_get_nested

       external omp_test_lock, omp_in_parallel
       external omp_test_lock, omp_in_parallel

-      logical*4 omp_test_lock, omp_in_parallel
+      logical(4) omp_test_lock, omp_in_parallel

 
       external omp_get_max_threads, omp_get_num_procs
 
       external omp_get_max_threads, omp_get_num_procs

-      integer*4 omp_get_max_threads, omp_get_num_procs
+      integer(4) omp_get_max_threads, omp_get_num_procs

       external omp_get_num_threads, omp_get_thread_num
       external omp_get_num_threads, omp_get_thread_num

-      integer*4 omp_get_num_threads, omp_get_thread_num
+      integer(4) omp_get_num_threads, omp_get_thread_num

       external omp_test_nest_lock
       external omp_test_nest_lock

-      integer*4 omp_test_nest_lock
+      integer(4) omp_test_nest_lock

 
       external omp_get_wtick, omp_get_wtime
       double precision omp_get_wtick, omp_get_wtime
 
       external omp_get_wtick, omp_get_wtime
       double precision omp_get_wtick, omp_get_wtime

+
+      external omp_set_schedule, omp_get_schedule
+      external omp_get_thread_limit, omp_set_max_active_levels
+      external omp_get_max_active_levels, omp_get_level
+      external omp_get_ancestor_thread_num, omp_get_team_size
+      external omp_get_active_level
+      integer(4) omp_get_thread_limit, omp_get_max_active_levels
+      integer(4) omp_get_level, omp_get_ancestor_thread_num
+      integer(4) omp_get_team_size, omp_get_active_level