aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de>2016-11-28 13:42:50 +0000
committerAlexander Monakov <amonakov@gcc.gnu.org>2016-11-28 16:42:50 +0300
commitc7ac071fd08ea033fc8b55b7827cacc5fb0793de (patch)
tree966a94bc7dbc51a1f7a75dde7e848bad6d12f1d6
parent51a07549a93a00d5226635749a5eecf55f451984 (diff)
downloadgcc-c7ac071fd08ea033fc8b55b7827cacc5fb0793de.zip
gcc-c7ac071fd08ea033fc8b55b7827cacc5fb0793de.tar.gz
gcc-c7ac071fd08ea033fc8b55b7827cacc5fb0793de.tar.bz2
libgomp: fix OpenMP offloading to NVPTX and correct location of generic affinity.c
2016-11-28 Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> * config/linux/affinity.c [!HAVE_PTHREAD_AFFINITY_NP]: Include ../../affinity.c as fallback. * config/nvptx/affinity.c: Delete to use fallback implementation. From-SVN: r242918
-rw-r--r--libgomp/ChangeLog6
-rw-r--r--libgomp/config/linux/affinity.c2
-rw-r--r--libgomp/config/nvptx/affinity.c0
3 files changed, 7 insertions, 1 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 2e15500..84300b7 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-28 Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de>
+
+ * config/linux/affinity.c [!HAVE_PTHREAD_AFFINITY_NP]: Include
+ ../../affinity.c as fallback.
+ * config/nvptx/affinity.c: Delete to use fallback implementation.
+
2016-11-23 Alexander Monakov <amonakov@ispras.ru>
Jakub Jelinek <jakub@redhat.com>
Dmitry Melnik <dm@ispras.ru>
diff --git a/libgomp/config/linux/affinity.c b/libgomp/config/linux/affinity.c
index ca6eec04..d8dede6 100644
--- a/libgomp/config/linux/affinity.c
+++ b/libgomp/config/linux/affinity.c
@@ -394,6 +394,6 @@ ialias(omp_get_place_proc_ids)
#else
-#include "../posix/affinity.c"
+#include "../../affinity.c"
#endif
diff --git a/libgomp/config/nvptx/affinity.c b/libgomp/config/nvptx/affinity.c
deleted file mode 100644
index e69de29..0000000
--- a/libgomp/config/nvptx/affinity.c
+++ /dev/null