From 5fbe65857cd146c1bfd10c8b96e416386084afc9 Mon Sep 17 00:00:00 2001
From: fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 6 Jun 2006 17:54:02 +0000
Subject: [PATCH] * config/mingw32/time.c: New file. *
configure.tgt: Use it.
* config/i386/mingw32.h (GOMP_SELF_SPECS): Define.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114442 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 4 +++
gcc/config/i386/mingw32.h | 4 +++
libgomp/ChangeLog | 5 ++++
libgomp/config/mingw32/time.c | 49 +++++++++++++++++++++++++++++++++++
libgomp/configure.tgt | 4 +++
5 files changed, 66 insertions(+)
create mode 100644 libgomp/config/mingw32/time.c
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f69780145a9..44a010ddacf2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-06 Francois-Xavier Coudert <coudert@clipper.ens.fr>
+
+ * config/i386/mingw32.h (GOMP_SELF_SPECS): Define.
+
2006-06-06 Ulrich Weigand <uweigand@de.ibm.com>
PR target/27842
diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index 6318831118f2..bc18d64976dd 100644
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -108,3 +108,7 @@ do { \
/* Define as short unsigned for compatibility with MS runtime. */
#undef WINT_TYPE
#define WINT_TYPE "short unsigned int"
+
+/* mingw32 doesn't understand the -pthread option. */
+#undef GOMP_SELF_SPECS
+#define GOMP_SELF_SPECS ""
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index aeaa83b8bb99..8ce2c1a6a70a 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-06 Francois-Xavier Coudert <coudert@clipper.ens.fr>
+
+ * config/mingw32/time.c: New file.
+ * configure.tgt: Use it.
+
2006-05-23 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.am: Add install-html target. Add install-html to .PHONY
diff --git a/libgomp/config/mingw32/time.c b/libgomp/config/mingw32/time.c
new file mode 100644
index 000000000000..0a83113beca3
--- /dev/null
+++ b/libgomp/config/mingw32/time.c
@@ -0,0 +1,49 @@
+/* Copyright (C) 2006 Free Software Foundation, Inc.
+ Contributed by Francois-Xavier Coudert <coudert@clipper.ens.fr>
+
+ 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.
+
+ 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
+ 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. */
+
+/* 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. */
+
+/* This file contains timer routines for mingw32. */
+
+#include "libgomp.h"
+#include <unistd.h>
+#include <sys/timeb.h>
+
+double
+omp_get_wtime (void)
+{
+ struct _timeb timebuf;
+ _ftime (&timebuf);
+ return (timebuf.time + (long)(timebuf.millitm) / 1e3);
+}
+
+double
+omp_get_wtick (void)
+{
+ return 1e-3;
+}
+
+ialias (omp_get_wtime)
+ialias (omp_get_wtick)
diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
index dedafd350aad..f27f9287f24d 100644
--- a/libgomp/configure.tgt
+++ b/libgomp/configure.tgt
@@ -91,6 +91,10 @@ case "${target}" in
XLDFLAGS="${XLDFLAGS} -lrt"
;;
+ *-*-mingw32*)
+ config_path="mingw32 posix"
+ ;;
+
*)
;;
--
GitLab