From e938cabb71d8dad3ad2e1644489fe8a6656b9077 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Date: Tue, 9 Aug 2016 17:45:04 +0200
Subject: [PATCH] patmos-*: use explicit patmos paths. BREAK OTHER ARCHES
Change-Id: If1e1978e5aa0cbce7efc09a0c1fb4c76b7d94b13
---
toolchain/llvm-link.py | 8 ++++----
toolchain/patmos.cmake | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/toolchain/llvm-link.py b/toolchain/llvm-link.py
index d4d6086..08bbacc 100755
--- a/toolchain/llvm-link.py
+++ b/toolchain/llvm-link.py
@@ -59,23 +59,23 @@ def check_output(*args, **kwargs):
return subprocess.check_output(*args, **kwargs)
def llvm_link(files, output):
- check_output([os.path.join(args.llvm_dir, "bin", "llvm-link"),
+ check_output([os.path.join(args.llvm_dir, "bin", "patmos-llvm-link"),
"-o", output] + files)
return output
def llvm_opt(input, output):
- check_output([os.path.join(args.llvm_dir, "bin", "opt"),
+ check_output([os.path.join(args.llvm_dir, "bin", "patmos-opt"),
"-std-compile-opts", "-always-inline", "-o", output, input])
return output
def llvm_opt_careful(input, output):
- check_output([os.path.join(args.llvm_dir, "bin", "opt"),
+ check_output([os.path.join(args.llvm_dir, "bin", "patmos-opt"),
"-inline", "-constprop", "-dse",
"-o", output, input])
return output
def llvm_llc(file, output, flags):
- check_output([os.path.join(args.llvm_dir, "bin", "llc")] + flags + ["-o", output, file])
+ check_output([os.path.join(args.llvm_dir, "bin", "patmos-llc")] + flags + ["-o", output, file])
return output
def start_ld(flags, objects, output):
diff --git a/toolchain/patmos.cmake b/toolchain/patmos.cmake
index 05e8950..28f22a3 100644
--- a/toolchain/patmos.cmake
+++ b/toolchain/patmos.cmake
@@ -30,7 +30,7 @@ execute_process(COMMAND ${LLVM_CONFIG} --prefix
message(STATUS "LLVM root: ${LLVM_ROOT}")
find_program(LLVM_C_COMPILER "patmos-clang-${LLVM_RECOMMENDED_VERSION}"
- NAMES clang
+ NAMES patmos-clang
HINTS ${LLVM_ROOT}/bin )
find_program(LLVM_CXX_COMPILER "patmos-clang++-${LLVM_RECOMMENDED_VERSION}"
NAMES patmos-clang++ clang++
--
GitLab