Commit b5f7a6ca by Jack Howarth Committed by Mike Stump

re PR libgomp/64635 (darwin produces libgomp-plugin-host_nonshm.1.dylib but…

re PR libgomp/64635 (darwin produces libgomp-plugin-host_nonshm.1.dylib but tries to load libgomp-plugin-host_nonshm.so.1)

2015-01-28  Jack Howarth  <howarth.at.gcc@gmail.com>

	PR libgomp/64635
	* configure.tgt (*-*-aix*): Use config_path "aix posix".
	(*-*-darwin*): Use config_path "bsd darwin posix".
	(*-*-hpux*): Use config_path "hpux posix".
	* target.c: Add include of plugin-suffix.h and use
	SONAME_SUFFIX macro.
	* config/aix/plugin-suffix.h: New file.
	* config/darwin/plugin-suffix.h: New file.
	* config/hpux/plugin-suffix.h: New file.
	* config/posix/plugin-suffix.h: New file.

From-SVN: r220218
parent c761dca1
2015-01-28 Jack Howarth <howarth.at.gcc@gmail.com>
PR libgomp/64635
* configure.tgt (*-*-aix*): Use config_path "aix posix".
(*-*-darwin*): Use config_path "bsd darwin posix".
(*-*-hpux*): Use config_path "hpux posix".
* target.c: Add include of plugin-suffix.h and use
SONAME_SUFFIX macro.
* config/aix/plugin-suffix.h: New file.
* config/darwin/plugin-suffix.h: New file.
* config/hpux/plugin-suffix.h: New file.
* config/posix/plugin-suffix.h: New file.
2015-01-23 Jakub Jelinek <jakub@redhat.com> 2015-01-23 Jakub Jelinek <jakub@redhat.com>
PR middle-end/64734 PR middle-end/64734
......
/* Copyright (C) 2015 Free Software Foundation, Inc.
Contributed by Jack Howarth <howarth.at.gcc@gmail.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/>. */
#define SONAME_SUFFIX(n) ("." #n ".dylib")
/* Copyright (C) 2015 Free Software Foundation, Inc.
Contributed by Jack Howarth <howarth.at.gcc@gmail.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/>. */
#define SONAME_SUFFIX(n) (".sl." #n)
/* Copyright (C) 2015 Free Software Foundation, Inc.
Contributed by Jack Howarth <howarth.at.gcc@gmail.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/>. */
#define SONAME_SUFFIX(n) (".so." #n)
...@@ -113,6 +113,7 @@ fi ...@@ -113,6 +113,7 @@ fi
case "${target}" in case "${target}" in
*-*-hpux*) *-*-hpux*)
config_path="hpux posix"
case "${target}" in case "${target}" in
*-*-hpux11*) *-*-hpux11*)
# HPUX v11.x requires -lrt to resolve sem_init in libgomp.la # HPUX v11.x requires -lrt to resolve sem_init in libgomp.la
...@@ -132,7 +133,7 @@ case "${target}" in ...@@ -132,7 +133,7 @@ case "${target}" in
;; ;;
*-*-darwin*) *-*-darwin*)
config_path="bsd posix" config_path="bsd darwin posix"
;; ;;
*-*-freebsd*) *-*-freebsd*)
...@@ -140,6 +141,10 @@ case "${target}" in ...@@ -140,6 +141,10 @@ case "${target}" in
XLDFLAGS="${XLDFLAGS} -lpthread" XLDFLAGS="${XLDFLAGS} -lpthread"
;; ;;
*-*-aix*)
config_path="aix posix"
;;
*) *)
;; ;;
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#ifdef PLUGIN_SUPPORT #ifdef PLUGIN_SUPPORT
#include <dlfcn.h> #include <dlfcn.h>
#include "plugin-suffix.h"
#endif #endif
static void gomp_target_init (void); static void gomp_target_init (void);
...@@ -1054,7 +1055,7 @@ static void ...@@ -1054,7 +1055,7 @@ static void
gomp_target_init (void) gomp_target_init (void)
{ {
const char *prefix ="libgomp-plugin-"; const char *prefix ="libgomp-plugin-";
const char *suffix = ".so.1"; const char *suffix = SONAME_SUFFIX (1);
const char *cur, *next; const char *cur, *next;
char *plugin_name; char *plugin_name;
int i, new_num_devices; int i, new_num_devices;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment