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

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 2e15500df4326e8a03c3a98612f84d1db4e8ceb5..84300b78a1047ebc790480e4e0477f74aaec95fd 100644 (file)
--- 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 ca6eec046c6a79c532faf8085b41c6afad222983..d8dede607a1b6f3b69c207883f9f8af6b95ec7be 100644 (file)
--- 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 (file)
index e69de29..0000000