From 36c19215f13c983c2ae0096ed9170fd064744622 Mon Sep 17 00:00:00 2001 From: Tobias Bosch Date: Mon, 19 Aug 2019 16:30:44 -0700 Subject: Correctly parse eabi compiler names. BUG=chromium:773875 TEST=unit tests, compile cross-armv7m-cros-eabi/newlib Change-Id: Ia98442a69b01cff87c52b6ac84dc39c47d5e998e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1760465 Tested-by: Tobias Bosch Reviewed-by: George Burgess --- .../cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json | 6 +++--- .../cros_clang_host_golden/clang_maincc_target_specific.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'compiler_wrapper/testdata/cros_clang_host_golden') diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json index 74f7658d..0741b352 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json @@ -33,7 +33,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-eabi-clang", + "path": "./x86_64-cros-eabi-clang", "args": [ "-ftrapv", "main.cc" @@ -123,7 +123,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-linux-eabi-clang", + "path": "./armv7m-cros-eabi-clang", "args": [ "-ftrapv", "main.cc" @@ -213,7 +213,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-linux-eabi-clang", + "path": "./armv8m-cros-eabi-clang", "args": [ "-ftrapv", "main.cc" diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json index 4f908037..363b610a 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json @@ -32,7 +32,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./x86_64-cros-linux-eabi-clang", + "path": "./x86_64-cros-eabi-clang", "args": [ "main.cc" ] @@ -119,7 +119,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv7m-cros-linux-eabi-clang", + "path": "./armv7m-cros-eabi-clang", "args": [ "main.cc" ] @@ -206,7 +206,7 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { - "path": "./armv8m-cros-linux-eabi-clang", + "path": "./armv8m-cros-eabi-clang", "args": [ "main.cc" ] -- cgit v1.2.3