diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2006-01-25 19:17:57 +0000 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2006-01-25 11:17:57 -0800 |
| commit | 03b8fe495d716c004f5491eb2347537f115ab2d8 (patch) | |
| tree | 3ed40bb4cdbf2ad9a5a53d51d9e40585078f01cf /libgomp/libgomp_f.h.in | |
| parent | b8795eddf5bebda36a22098be7b7810a7f6f2185 (diff) | |
| download | gcc-03b8fe495d716c004f5491eb2347537f115ab2d8.tar.gz | |
re PR libgomp/25884 (libgomp should not require perl to compile)
PR libgomp/25884
* Makefile.am (omp.h, omp_lib.h, omp_lib.f90, libgomp_f.h): Remove.
* configure.ac (PERL): Don't set.
(gstdint.h, omp.h, omp_lib.h, omp_lib.f90, libgomp_f.h): Create here.
(OMP_LOCK_SIZE, OMP_LOCK_ALIGN, OMP_LOCK_KIND, OMP_NEST_LOCK_SIZE,
OMP_NEST_LOCK_ALIGN, OMP_NEST_LOCK_KIND): New substitutions.
* omp.h.in: Wrap the new configure substitutions with @ characters.
* omp_lib.h.in, omp_lib.f90.in, libgomp_f.h.in: Likewise.
* aclocal.m4, configure, Makefile.in: Regenerate.
* mkomp_h.pl: Delete.
From-SVN: r110220
Diffstat (limited to 'libgomp/libgomp_f.h.in')
| -rw-r--r-- | libgomp/libgomp_f.h.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libgomp/libgomp_f.h.in b/libgomp/libgomp_f.h.in index 0117525c44a..85543565a1e 100644 --- a/libgomp/libgomp_f.h.in +++ b/libgomp/libgomp_f.h.in @@ -33,8 +33,8 @@ #include "libgomp.h" -#if (OMP_LOCK_SIZE == OMP_LOCK_KIND) \ - && (OMP_LOCK_ALIGN <= OMP_LOCK_SIZE) +#if (@OMP_LOCK_SIZE@ == @OMP_LOCK_KIND@) \ + && (@OMP_LOCK_ALIGN@ <= @OMP_LOCK_SIZE@) # define OMP_LOCK_DIRECT typedef omp_lock_t *omp_lock_arg_t; # define omp_lock_arg(arg) (arg) @@ -43,8 +43,8 @@ typedef union { omp_lock_t *lock; uint64_t u; } *omp_lock_arg_t; # define omp_lock_arg(arg) ((arg)->lock) # endif -#if (OMP_NEST_LOCK_SIZE == OMP_NEST_LOCK_KIND) \ - && (OMP_NEST_LOCK_ALIGN <= OMP_NEST_LOCK_SIZE) +#if (@OMP_NEST_LOCK_SIZE@ == @OMP_NEST_LOCK_KIND@) \ + && (@OMP_NEST_LOCK_ALIGN@ <= @OMP_NEST_LOCK_SIZE@) # define OMP_NEST_LOCK_DIRECT typedef omp_nest_lock_t *omp_nest_lock_arg_t; # define omp_nest_lock_arg(arg) (arg) @@ -56,12 +56,12 @@ typedef union { omp_nest_lock_t *lock; uint64_t u; } *omp_nest_lock_arg_t; static inline void omp_check_defines (void) { - char test[(OMP_LOCK_SIZE != sizeof (omp_lock_t) - || OMP_LOCK_ALIGN != __alignof (omp_lock_t) - || OMP_NEST_LOCK_SIZE != sizeof (omp_nest_lock_t) - || OMP_NEST_LOCK_ALIGN != __alignof (omp_nest_lock_t) - || OMP_LOCK_KIND != sizeof (*(omp_lock_arg_t) 0) - || OMP_NEST_LOCK_KIND != sizeof (*(omp_nest_lock_arg_t) 0)) + char test[(@OMP_LOCK_SIZE@ != sizeof (omp_lock_t) + || @OMP_LOCK_ALIGN@ != __alignof (omp_lock_t) + || @OMP_NEST_LOCK_SIZE@ != sizeof (omp_nest_lock_t) + || @OMP_NEST_LOCK_ALIGN@ != __alignof (omp_nest_lock_t) + || @OMP_LOCK_KIND@ != sizeof (*(omp_lock_arg_t) 0) + || @OMP_NEST_LOCK_KIND@ != sizeof (*(omp_nest_lock_arg_t) 0)) ? -1 : 1] __attribute__ ((__unused__)); } |