|
 |
0a0d66 |
From a4c37b40c8783a0c13dc77817f273f0cb42d33f8 Mon Sep 17 00:00:00 2001
|
|
|
b17819 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9fc821 |
Date: Thu, 16 Aug 2018 15:45:47 -0400
|
|
|
3c6531 |
Subject: [PATCH] Tweak the tools_def to support cross-compiling.
|
|
|
b17819 |
|
|
|
b17819 |
These files are meant for customization, so this is not upstream.
|
|
Paolo Bonzini |
7ae6f1 |
|
|
Paolo Bonzini |
7ae6f1 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9fc821 |
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
|
b17819 |
---
|
|
|
3c6531 |
BaseTools/Conf/tools_def.template | 44 +++++++++++++++----------------
|
|
|
3c6531 |
1 file changed, 22 insertions(+), 22 deletions(-)
|
|
|
b17819 |
|
|
|
b17819 |
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
|
|
|
0a0d66 |
index 2b17d3b297..8145c9e071 100755
|
|
|
b17819 |
--- a/BaseTools/Conf/tools_def.template
|
|
|
b17819 |
+++ b/BaseTools/Conf/tools_def.template
|
|
|
0a0d66 |
@@ -2331,17 +2331,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
|
|
|
3c6531 |
##################
|
|
|
3c6531 |
# GCC5 IA32 definitions
|
|
|
3c6531 |
##################
|
|
|
3c6531 |
-*_GCC5_IA32_OBJCOPY_PATH = DEF(GCC5_IA32_PREFIX)objcopy
|
|
|
3c6531 |
-*_GCC5_IA32_CC_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
-*_GCC5_IA32_SLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc-ar
|
|
|
3c6531 |
-*_GCC5_IA32_DLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
-*_GCC5_IA32_ASLDLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
-*_GCC5_IA32_ASM_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
-*_GCC5_IA32_PP_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
-*_GCC5_IA32_VFRPP_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
-*_GCC5_IA32_ASLCC_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
-*_GCC5_IA32_ASLPP_PATH = DEF(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
-*_GCC5_IA32_RC_PATH = DEF(GCC5_IA32_PREFIX)objcopy
|
|
|
3c6531 |
+*_GCC5_IA32_OBJCOPY_PATH = ENV(GCC5_IA32_PREFIX)objcopy
|
|
|
3c6531 |
+*_GCC5_IA32_CC_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
+*_GCC5_IA32_SLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc-ar
|
|
|
3c6531 |
+*_GCC5_IA32_DLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
+*_GCC5_IA32_ASLDLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
+*_GCC5_IA32_ASM_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
+*_GCC5_IA32_PP_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
+*_GCC5_IA32_VFRPP_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
+*_GCC5_IA32_ASLCC_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
+*_GCC5_IA32_ASLPP_PATH = ENV(GCC5_IA32_PREFIX)gcc
|
|
|
3c6531 |
+*_GCC5_IA32_RC_PATH = ENV(GCC5_IA32_PREFIX)objcopy
|
|
|
3c6531 |
|
|
|
b846ca |
*_GCC5_IA32_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m32
|
|
|
3c6531 |
*_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -no-pie
|
|
|
0a0d66 |
@@ -2363,17 +2363,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
|
|
|
b17819 |
##################
|
|
|
b17819 |
# GCC5 X64 definitions
|
|
|
b17819 |
##################
|
|
|
b17819 |
-*_GCC5_X64_OBJCOPY_PATH = DEF(GCC5_X64_PREFIX)objcopy
|
|
|
b17819 |
-*_GCC5_X64_CC_PATH = DEF(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
-*_GCC5_X64_SLINK_PATH = DEF(GCC5_X64_PREFIX)gcc-ar
|
|
|
b17819 |
-*_GCC5_X64_DLINK_PATH = DEF(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
-*_GCC5_X64_ASLDLINK_PATH = DEF(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
-*_GCC5_X64_ASM_PATH = DEF(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
-*_GCC5_X64_PP_PATH = DEF(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
-*_GCC5_X64_VFRPP_PATH = DEF(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
-*_GCC5_X64_ASLCC_PATH = DEF(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
-*_GCC5_X64_ASLPP_PATH = DEF(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
-*_GCC5_X64_RC_PATH = DEF(GCC5_X64_PREFIX)objcopy
|
|
|
b17819 |
+*_GCC5_X64_OBJCOPY_PATH = ENV(GCC5_X64_PREFIX)objcopy
|
|
|
b17819 |
+*_GCC5_X64_CC_PATH = ENV(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
+*_GCC5_X64_SLINK_PATH = ENV(GCC5_X64_PREFIX)gcc-ar
|
|
|
b17819 |
+*_GCC5_X64_DLINK_PATH = ENV(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
+*_GCC5_X64_ASLDLINK_PATH = ENV(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
+*_GCC5_X64_ASM_PATH = ENV(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
+*_GCC5_X64_PP_PATH = ENV(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
+*_GCC5_X64_VFRPP_PATH = ENV(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
+*_GCC5_X64_ASLCC_PATH = ENV(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
+*_GCC5_X64_ASLPP_PATH = ENV(GCC5_X64_PREFIX)gcc
|
|
|
b17819 |
+*_GCC5_X64_RC_PATH = ENV(GCC5_X64_PREFIX)objcopy
|
|
|
b17819 |
|
|
|
b846ca |
*_GCC5_X64_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m64
|
|
|
b17819 |
*_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|