aboutsummaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2018-11-20 11:39:53 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2018-11-20 11:39:53 +0100
commit72d3bb76c9df35601c192bf43801a0ce9d23e002 (patch)
treecf432c24170afb18a442b246d294a0ff555334e9 /libgomp
parentb34ac019f88b47629673274dd69009f292e03b79 (diff)
downloadgcc-72d3bb76c9df35601c192bf43801a0ce9d23e002.zip
gcc-72d3bb76c9df35601c192bf43801a0ce9d23e002.tar.gz
gcc-72d3bb76c9df35601c192bf43801a0ce9d23e002.tar.bz2
re PR bootstrap/88106 (Bootstrap failure on mingw32)
PR bootstrap/88106 * config/mingw32/affinity-fmt.c: New file. From-SVN: r266309
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog5
-rw-r--r--libgomp/config/mingw32/affinity-fmt.c68
2 files changed, 73 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 0b5d2e3..4037356 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-20 Jakub Jelinek <jakub@redhat.com>
+
+ PR bootstrap/88106
+ * config/mingw32/affinity-fmt.c: New file.
+
2018-11-09 Jakub Jelinek <jakub@redhat.com>
* affinity-fmt.c: Include inttypes.h if HAVE_INTTYPES_H.
diff --git a/libgomp/config/mingw32/affinity-fmt.c b/libgomp/config/mingw32/affinity-fmt.c
new file mode 100644
index 0000000..a43a7d7
--- /dev/null
+++ b/libgomp/config/mingw32/affinity-fmt.c
@@ -0,0 +1,68 @@
+/* Copyright (C) 2018 Free Software Foundation, Inc.
+ Contributed by Jakub Jelinek <jakub@redhat.com>.
+
+ This file is part of the GNU Offloading and Multi Processing Library
+ (libgomp).
+
+ Libgomp is free software; you can redistribute it and/or modify it
+ 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
+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+
+ 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.
+
+ 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/>. */
+
+#include "libgomp.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h> /* For PRIx64. */
+#endif
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <errno.h>
+
+static int
+gomp_gethostname (char *name, size_t len)
+{
+ /* On Win9x GetComputerName fails if the input size is less
+ than MAX_COMPUTERNAME_LENGTH + 1. */
+ char buffer[MAX_COMPUTERNAME_LENGTH + 1];
+ DWORD size = sizeof (buffer);
+ int ret = 0;
+
+ if (!GetComputerName (buffer, &size))
+ return -1;
+
+ if ((size = strlen (buffer) + 1) > len)
+ {
+ errno = EINVAL;
+ /* Truncate as per POSIX spec. We do not NUL-terminate. */
+ size = len;
+ ret = -1;
+ }
+ memcpy (name, buffer, (size_t) size);
+
+ return ret;
+}
+
+#undef gethostname
+#define gethostname gomp_gethostname
+#define HAVE_GETHOSTNAME 1
+
+#include "../../affinity-fmt.c"