0006-libgomp-test-fix.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From c2afcdde5fa51b938fb824549f65ec170b5bc96a Mon Sep 17 00:00:00 2001
  2. From: Szabolcs Nagy <nsz@port70.net>
  3. Date: Sat, 20 Aug 2016 19:11:37 +0000
  4. Subject: [PATCH 6/8] libgomp-test-fix
  5. ---
  6. libgomp/testsuite/lib/libgomp.exp | 3 +++
  7. libgomp/testsuite/libgomp-test-support.exp.in | 2 ++
  8. 2 files changed, 5 insertions(+)
  9. diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
  10. index 1cb4991..398ba1f 100644
  11. --- a/libgomp/testsuite/lib/libgomp.exp
  12. +++ b/libgomp/testsuite/lib/libgomp.exp
  13. @@ -85,6 +85,7 @@ proc libgomp_init { args } {
  14. global ALWAYS_CFLAGS
  15. global CFLAGS
  16. global TOOL_EXECUTABLE TOOL_OPTIONS
  17. + global BUILD_CC
  18. global GCC_UNDER_TEST
  19. global TESTING_IN_BUILD_TREE
  20. global target_triplet
  21. @@ -107,6 +108,8 @@ proc libgomp_init { args } {
  22. if ![info exists GCC_UNDER_TEST] then {
  23. if [info exists TOOL_EXECUTABLE] {
  24. set GCC_UNDER_TEST $TOOL_EXECUTABLE
  25. + } elseif [info exists BUILD_CC] {
  26. + set GCC_UNDER_TEST $BUILD_CC
  27. } else {
  28. set GCC_UNDER_TEST "[find_gcc]"
  29. }
  30. diff --git a/libgomp/testsuite/libgomp-test-support.exp.in b/libgomp/testsuite/libgomp-test-support.exp.in
  31. index 5a724fb..b3cb4c7 100644
  32. --- a/libgomp/testsuite/libgomp-test-support.exp.in
  33. +++ b/libgomp/testsuite/libgomp-test-support.exp.in
  34. @@ -1,3 +1,5 @@
  35. +set BUILD_CC "@CC@"
  36. +
  37. set cuda_driver_include "@CUDA_DRIVER_INCLUDE@"
  38. set cuda_driver_lib "@CUDA_DRIVER_LIB@"
  39. set hsa_runtime_lib "@HSA_RUNTIME_LIB@"
  40. --
  41. 2.8.1