From 72d3bb76c9df35601c192bf43801a0ce9d23e002 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 20 Nov 2018 11:39:53 +0100 Subject: [PATCH] re PR bootstrap/88106 (Bootstrap failure on mingw32) PR bootstrap/88106 * config/mingw32/affinity-fmt.c: New file. From-SVN: r266309 --- libgomp/ChangeLog | 5 +++ libgomp/config/mingw32/affinity-fmt.c | 68 +++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 libgomp/config/mingw32/affinity-fmt.c 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 + + PR bootstrap/88106 + * config/mingw32/affinity-fmt.c: New file. + 2018-11-09 Jakub Jelinek * 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 . + + 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 + . */ + +#include "libgomp.h" +#include +#include +#include +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_INTTYPES_H +# include /* For PRIx64. */ +#endif +#define WIN32_LEAN_AND_MEAN +#include +#include + +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" -- 2.7.4