Skip to content

Commit 5c3d2ae

Browse files
SergeySliceSergeySlice
committed
merge
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2 parents f051a59 + 1e26faa commit 5c3d2ae

7 files changed

Lines changed: 94 additions & 12 deletions

File tree

‎BaseTools/Conf/tools_def.template‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2910,7 +2910,7 @@ RELEASEMACOS_XCODE14_X64_DLINK_FLAGS = -arch x86_64 -nostdlib -Wl,-u,_$(IMA
29102910
*_XCODE14_*_APP_FLAGS = DEF(GCC_PP_FLAGS)
29112911

29122912
#
2913-
# XCODE15 support
2913+
# xcode15 support
29142914
#
29152915

29162916
*_XCODE15_*_*_FAMILY = GCC
@@ -2986,6 +2986,82 @@ RELEASEMACOS_XCODE15_X64_DLINK_FLAGS = -arch x86_64 -nostdlib -Wl,-u,_$(IMA
29862986
*_XCODE15_*_DTCPP_FLAGS = DEF(GCC_DTCPP_FLAGS)
29872987
*_XCODE15_*_APP_FLAGS = DEF(GCC_PP_FLAGS)
29882988

2989+
# XCODE16
2990+
2991+
2992+
*_XCODE16_*_*_FAMILY = GCC
2993+
*_XCODE16_*_*_BUILDRULEFAMILY = XCODE
2994+
*_XCODE16_*_*_BUILDRULEORDER = nasm S s
2995+
2996+
*_XCODE16_*_MTOC_PATH = ENV(MTOC_PREFIX)mtoc.NEW_jief
2997+
2998+
*_XCODE16_*_MAKE_PATH = make
2999+
*_XCODE16_*_DSYMUTIL_PATH = /usr/bin/dsymutil
3000+
3001+
DEBUG_XCODE16_*_MTOC_FLAGS = -align 0x20 -d $(DEBUG_DIR)/$(MODULE_NAME).dll
3002+
NOOPT_XCODE16_*_MTOC_FLAGS = -align 0x20 -d $(DEBUG_DIR)/$(MODULE_NAME).dll
3003+
RELEASE_XCODE16_*_MTOC_FLAGS = -align 0x20
3004+
3005+
#
3006+
# use xcode-select to change Xcode version of command line tools
3007+
#
3008+
*_XCODE16_*_CC_PATH = clang
3009+
*_XCODE16_*_SLINK_PATH = libtool
3010+
*_XCODE16_*_DLINK_PATH = clang
3011+
*_XCODE16_*_ASM_PATH = clang
3012+
*_XCODE16_*_PP_PATH = clang
3013+
*_XCODE16_*_VFRPP_PATH = clang
3014+
*_XCODE16_*_ASL_PATH = DEF(UNIX_IASL_BIN)
3015+
*_XCODE16_*_ASLCC_PATH = clang
3016+
*_XCODE16_*_ASLPP_PATH = clang
3017+
*_XCODE16_*_ASLDLINK_PATH = clang
3018+
*_XCODE16_*_NASM_PATH = ENV(NASM_PREFIX)nasm
3019+
3020+
##################
3021+
# X64 definitions
3022+
##################
3023+
DEBUG_XCODE16_X64_DLINK_FLAGS = -arch x86_64 -nostdlib -Wl,-u,_$(IMAGE_ENTRY_POINT),-e,_$(IMAGE_ENTRY_POINT),-preload,-segalign,0x20,-pie,-all_load,-dead_strip,-seg1addr,0x260,-object_path_lto,$(DEST_DIR_DEBUG)/$(BASE_NAME).o,-map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map
3024+
DEBUGMACOS_XCODE16_X64_DLINK_FLAGS = -arch x86_64 -nostdlib -Wl,-u,_$(IMAGE_ENTRY_POINT),-e,_$(IMAGE_ENTRY_POINT),-preload,-segalign,0x20,-pie,-all_load,-dead_strip,-seg1addr,0x800,-map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map
3025+
RELEASE_XCODE16_X64_DLINK_FLAGS = -arch x86_64 -nostdlib -Wl,-u,_$(IMAGE_ENTRY_POINT),-e,_$(IMAGE_ENTRY_POINT),-preload,-segalign,0x20,-pie,-all_load,-dead_strip,-seg1addr,0x260,-map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map
3026+
RELEASEMACOS_XCODE16_X64_DLINK_FLAGS = -arch x86_64 -nostdlib -Wl,-u,_$(IMAGE_ENTRY_POINT),-e,_$(IMAGE_ENTRY_POINT),-preload,-segalign,0x20,-pie,-all_load,-dead_strip,-seg1addr,0x800,-map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map
3027+
3028+
*_XCODE16_X64_SLINK_FLAGS = -static -no_warning_for_no_symbols -o
3029+
3030+
DEBUG_XCODE16_X64_ASM_FLAGS = -c -x assembler -arch x86_64 -g
3031+
DEBUGMACOS_XCODE16_X64_ASM_FLAGS = -c -x assembler -arch x86_64 -g
3032+
RELEASE_XCODE16_X64_ASM_FLAGS = -c -x assembler -arch x86_64
3033+
RELEASEMACOS_XCODE16_X64_ASM_FLAGS = -c -x assembler -arch x86_64
3034+
3035+
*_XCODE16_X64_NASM_FLAGS = -f macho64
3036+
*_XCODE16_*_PP_FLAGS = DEF(GCC_PP_FLAGS)
3037+
*_XCODE16_*_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
3038+
3039+
3040+
# -mno-implicit-float
3041+
# -Wno-varargs
3042+
# -Wno-unused-const-variable
3043+
3044+
DEFINE XCODE16_COMMON_FLAGS = -c -Wall -Wextra -include AutoGen.h -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mms-bitfields -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -mno-red-zone -fno-common -fdata-sections -ffreestanding -ffunction-sections -fno-asynchronous-unwind-tables -m64 -mcmodel=small -DNO_MSABI_VA_FUNCS -fno-strict-aliasing -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-deprecated-non-prototype -Wno-unused-command-line-argument -Wno-cast-function-type-mismatch -Wno-missing-field-initializers
3045+
3046+
3047+
3048+
DEBUG_XCODE16_X64_CC_FLAGS = -g3 -gdwarf -O0 DEF(XCODE16_COMMON_FLAGS) -target x86_64-pc-win32-macho "-DEFIAPI=__attribute__((ms_abi))"
3049+
DEBUGMACOS_XCODE16_X64_CC_FLAGS = -g3 -gdwarf -O0 DEF(XCODE16_COMMON_FLAGS)
3050+
RELEASE_XCODE16_X64_CC_FLAGS = -Os DEF(XCODE16_COMMON_FLAGS) -target x86_64-pc-win32-macho "-DEFIAPI=__attribute__((ms_abi))" -Werror
3051+
RELEASEMACOS_XCODE16_X64_CC_FLAGS = -Os DEF(XCODE16_COMMON_FLAGS)
3052+
DEBUG_XCODE16_X64_CXX_FLAGS = -g3 -gdwarf -O0 DEF(XCODE16_COMMON_FLAGS) -target x86_64-pc-win32-macho "-DEFIAPI=__attribute__((ms_abi))"
3053+
DEBUGMACOS_XCODE16_X64_CXX_FLAGS = -g3 -gdwarf -O0 DEF(XCODE16_COMMON_FLAGS)
3054+
RELEASE_XCODE16_X64_CXX_FLAGS = -Os DEF(XCODE16_COMMON_FLAGS) -target x86_64-pc-win32-macho "-DEFIAPI=__attribute__((ms_abi))" -Werror
3055+
RELEASEMACOS_XCODE16_X64_CXX_FLAGS = -Os DEF(XCODE16_COMMON_FLAGS)
3056+
3057+
*_XCODE16_*_ASLCC_FLAGS = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include AutoGen.h
3058+
*_XCODE16_*_ASLDLINK_FLAGS = -nostdlib -Wl,-e,_ReferenceAcpiTable,-preload,-segalign,0x20,-pie,-seg1addr,0x260,-read_only_relocs,suppress,-map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map
3059+
*_XCODE16_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS)
3060+
*_XCODE16_*_ASL_FLAGS =
3061+
*_XCODE16_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
3062+
*_XCODE16_*_DTCPP_FLAGS = DEF(GCC_DTCPP_FLAGS)
3063+
*_XCODE16_*_APP_FLAGS = DEF(GCC_PP_FLAGS)
3064+
29893065
####################################################################################
29903066
#
29913067
# RVCT Common

‎Build_Clover_in_Sequoia.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cd -
1616
4. Install tools
1717
pip3 install setuptools
1818

19-
5. make -C BaseTools
19+
5. make -C BaseTools "BUILD_CC=clang"
2020

2121
6. ./buildme
2222

‎Clover.dsc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,11 +719,11 @@
719719
FileSystems/GrubFS/src/ISO9660.inf
720720
FileSystems/GrubFS/src/NTFS.inf
721721
FileSystems/GrubFS/src/UDF.inf
722-
FileSystems/GrubFS/src/ZFS.inf
722+
# FileSystems/GrubFS/src/ZFS.inf
723723
FileSystems/GrubFS/src/EXT2.inf
724724
FileSystems/GrubFS/src/UFS.inf
725725
FileSystems/GrubFS/src/UFS2.inf
726-
#FileSystems/GrubFS/src/XFS.inf
726+
# FileSystems/GrubFS/src/XFS.inf
727727
!endif
728728
Ext4Pkg/Ext4Dxe/Ext4Dxe.inf
729729

‎FileSystems/GrubFS/src/ZFS.inf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
../grub/grub-core/kern/disk.c
3232
../grub/grub-core/kern/err.c
3333
../grub/grub-core/kern/env.c
34-
../grub/grub-core/kern/file.c
3534
../grub/grub-core/kern/misc.c
3635
../grub/grub-core/kern/list.c
3736
../grub/grub-core/kern/time.c

‎buildme‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fi
4343
cd "$(dirname $([ -L $0 ] && readlink $0 || echo $0))"
4444
declare -r CLOVERROOT="$PWD"
4545
declare -r SYSNAME="$(uname)"
46-
MYTOOLCHAIN=${1:-GCC131}
46+
MYTOOLCHAIN=${1:-GCC151}
4747
revision=$(git describe --tags $(git rev-list --tags --max-count=1))
4848
lsha1="not a git repo"
4949
pyversion=$(echo $COL_CYAN"Current Python version: "$COL_WHITE$($(which python3) --version))
@@ -122,13 +122,13 @@ checkTools() {
122122
if [[ "$SYSNAME" == Darwin ]]; then
123123
checkXCODE
124124
exportPaths
125-
local GCC131_BIN="$PREFIX/cross/bin/x86_64-clover-linux-gnu-gcc"
126-
if [[ $MYTOOLCHAIN == GCC* ]] && [[ ! -x "${GCC131_BIN}" ]]; then
127-
if [[ $MYTOOLCHAIN == GCC131 ]]; then
125+
local GCC151_BIN="$PREFIX/cross/bin/x86_64-clover-linux-gnu-gcc"
126+
if [[ $MYTOOLCHAIN == GCC* ]] && [[ ! -x "${GCC151_BIN}" ]]; then
127+
if [[ $MYTOOLCHAIN == GCC151 ]]; then
128128
cd "${CLOVERROOT}"
129-
./build_gcc14.sh
129+
./build_gcc15.sh
130130
else
131-
MYTOOLCHAIN=XCODE8
131+
MYTOOLCHAIN=XCODE16
132132
fi
133133
fi
134134
else
@@ -245,6 +245,9 @@ makeReleaseXC() {
245245
elif [[ "$xrel" == "15.*" ]]; then
246246
./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE15
247247
./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE15
248+
elif [[ "$xrel" == "16.*" ]]; then
249+
./ebuild.sh -fr -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE16
250+
./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D -t XCODE16
248251
fi
249252
# Run a post build script if exist (${DIR_TOOLS}/CloverScripts/postbuild.sh)
250253
if [[ -x "${DIR_TOOLS}"/CloverScripts/postbuild.sh ]]; then
@@ -345,7 +348,9 @@ buildCloverXC() {
345348
./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t XCODE14
346349
elif [[ "$xrel" == "15.*" ]]; then
347350
./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t XCODE15
348-
fi
351+
elif [[ "$xrel" == "16.*" ]]; then
352+
./ebuild.sh -fr -D NO_GRUB_DRIVERS_EMBEDDED -D USE_APPLE_HFSPLUS_DRIVER -t XCODE16
353+
fi
349354
fi
350355
# Run a post build script if exist (${DIR_TOOLS}/CloverScripts/postbuild.sh)
351356
if [[ -x "${DIR_TOOLS}"/CloverScripts/postbuild.sh ]]; then

‎ebuild.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ checkCmdlineArguments() {
308308
-xcode8 | --xcode8 ) TOOLCHAIN=XCODE8 ; CLANG=1 ;;
309309
-xcode14 | --xcode14 ) TOOLCHAIN=XCODE14 ; CLANG=1 ;;
310310
-xcode15 | --xcode15 ) TOOLCHAIN=XCODE15 ; CLANG=1 ;;
311+
-xcode16 | --xcode16 ) TOOLCHAIN=XCODE16 ; CLANG=1 ;;
311312
-GCC49 | --GCC49) TOOLCHAIN=GCC49 ;;
312313
-gcc49 | --gcc49) TOOLCHAIN=GCC49 ;;
313314
-GCC53 | --GCC53) TOOLCHAIN=GCC53 ;;

‎hebuild.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ checkCmdlineArguments() {
312312
-xcode8 | --xcode8 ) TOOLCHAIN=XCODE8 ; CLANG=1 ;;
313313
-xcode14 | --xcode14 ) TOOLCHAIN=XCODE14 ; CLANG=1 ;;
314314
-xcode15 | --xcode15 ) TOOLCHAIN=XCODE15 ; CLANG=1 ;;
315+
-xcode16 | --xcode16 ) TOOLCHAIN=XCODE16 ; CLANG=1 ;;
315316
-GCC49 | --GCC49) TOOLCHAIN=GCC49 ;;
316317
-gcc49 | --gcc49) TOOLCHAIN=GCC49 ;;
317318
-GCC53 | --GCC53) TOOLCHAIN=GCC53 ;;

0 commit comments

Comments
 (0)