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

        PR libgomp/64635
        * configure.tgt (*-*-aix*): Use standard posix plugin-suffix.h.
        Link with -lpthread.
        * config/aix/plugin-suffix.h: Delete.

From-SVN: r220341

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 7e7c36ba55b632bd89a9d0a3b055baf9dd40f27e..104d42cd3b956c3ecb624b9998b7988d299cfbef 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-01  David Edelsohn  <dje.gcc@gmail.com>
+
+       PR libgomp/64635
+       * configure.tgt (*-*-aix*): Use standard posix plugin-suffix.h.
+       Link with -lpthread.
+       * config/aix/plugin-suffix.h: Delete.
+
 2015-01-28  Jack Howarth  <howarth.at.gcc@gmail.com>
 
        PR libgomp/64635

diff --git a/libgomp/config/aix/plugin-suffix.h b/libgomp/config/aix/plugin-suffix.h
deleted file mode 100644 (file)
index 37c192b..0000000
--- a/libgomp/config/aix/plugin-suffix.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 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) (".a")

diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
index 7c06450e0dbed179a66560480998cfe7188c9d9b..ad98de13228133b0aef9b5b05ce1ef5cbdaa8276 100644 (file)
--- a/libgomp/configure.tgt
+++ b/libgomp/configure.tgt
@@ -142,7 +142,9 @@ case "${target}" in
        ;;
 
   *-*-aix*)
-       config_path="aix posix"
+       config_path="posix"
+       # Need to link with -lpthread so libgomp.so is self-contained.
+       XLDFLAGS="${XLDFLAGS} -lpthread"
        ;;
 
   *)