Merge 4.16
Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
This commit is contained in:
@@ -27,9 +27,6 @@ ifeq ($(SKIP_CLANG),)
|
||||
bash ./buildgcc -P clang $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS) -d $(DEST)
|
||||
endif
|
||||
|
||||
build_make:
|
||||
bash ./buildgcc -P make $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS) -d $(DEST)
|
||||
|
||||
build_nasm:
|
||||
bash ./buildgcc -P nasm $(if $(CPUS),-j $(CPUS)) $(if $(KEEP_SOURCES),-t) $(BUILDGCC_OPTIONS) -d $(DEST)
|
||||
|
||||
@@ -68,8 +65,9 @@ clean: clean_tempfiles
|
||||
distclean: clean
|
||||
rm -rf tarballs
|
||||
|
||||
.PHONY: build_gcc build_iasl build_clang all \
|
||||
build-i386 build-x64 build-arm \
|
||||
build-aarch64 build-riscv build-ppc64 build-nds32le build-nasm \
|
||||
clean distclean clean_tempfiles
|
||||
.PHONY: all build_gcc build_iasl build_clang build_nasm \
|
||||
clean distclean clean_tempfiles \
|
||||
build-i386 build-x64 build-arm build-aarch64 \
|
||||
build-riscv build-ppc64 build-nds32le
|
||||
|
||||
.NOTPARALLEL:
|
||||
|
@@ -36,12 +36,11 @@ GMP_VERSION=6.2.1
|
||||
MPFR_VERSION=4.1.0
|
||||
MPC_VERSION=1.2.1
|
||||
GCC_VERSION=11.2.0
|
||||
GCC_AUTOCONF_VERSION=2.69
|
||||
BINUTILS_VERSION=2.37
|
||||
IASL_VERSION=20210331
|
||||
IASL_VERSION=20211217
|
||||
# CLANG version number
|
||||
CLANG_VERSION=12.0.0
|
||||
CMAKE_VERSION=3.20.3
|
||||
CLANG_VERSION=13.0.1
|
||||
CMAKE_VERSION=3.22.2
|
||||
NASM_VERSION=2.15.05
|
||||
|
||||
# GCC toolchain archive locations
|
||||
@@ -122,7 +121,7 @@ normalize_dirs()
|
||||
mkdir -p "$DESTDIR$TARGETDIR/lib"
|
||||
test -d "$DESTDIR$TARGETDIR/lib32" && mv "$DESTDIR$TARGETDIR"/lib32/* "$DESTDIR$TARGETDIR/lib"
|
||||
test -d "$DESTDIR$TARGETDIR/lib64" && mv "$DESTDIR$TARGETDIR"/lib64/* "$DESTDIR$TARGETDIR/lib"
|
||||
rmdir -p "$DESTDIR$TARGETDIR/lib32" "$DESTDIR$TARGETDIR/lib64"
|
||||
rm -rf "$DESTDIR$TARGETDIR/lib32" "$DESTDIR$TARGETDIR/lib64"
|
||||
|
||||
perl -pi -e "s,/lib32,/lib," "$DESTDIR$TARGETDIR"/lib/*.la
|
||||
perl -pi -e "s,/lib64,/lib," "$DESTDIR$TARGETDIR"/lib/*.la
|
||||
@@ -835,8 +834,6 @@ build_CMAKE() {
|
||||
# shellcheck disable=SC2086
|
||||
$MAKE $JOBS || touch .failed
|
||||
$MAKE install DESTDIR=$DESTDIR || touch .failed
|
||||
|
||||
normalize_dirs
|
||||
}
|
||||
|
||||
build_NASM() {
|
||||
@@ -852,7 +849,6 @@ build_NASM() {
|
||||
|
||||
print_supported() {
|
||||
case "$PRINTSUPPORTED" in
|
||||
AUTOCONF|autoconf) printf "%s\n" "$GCC_AUTOCONF_VERSION";;
|
||||
BINUTILS|binutils) printf "%s\n" "$BINUTILS_VERSION";;
|
||||
CLANG|clang) printf "%s\n" "$CLANG_VERSION";;
|
||||
GCC|gcc) printf "%s\n" "$GCC_VERSION";;
|
||||
|
@@ -1 +0,0 @@
|
||||
1a4006727962daf63a181c853695ca69bdf7d541 tarballs/acpica-unix2-20210331.tar.gz
|
1
util/crossgcc/sum/acpica-unix2-20211217.tar.gz.cksum
Normal file
1
util/crossgcc/sum/acpica-unix2-20211217.tar.gz.cksum
Normal file
@@ -0,0 +1 @@
|
||||
4337413d206a169a47d706fa2e5bdc9bc0855c04 tarballs/acpica-unix2-20211217.tar.gz
|
@@ -1 +0,0 @@
|
||||
51250856f368acef5ab335a16f994bf29ad3d115 tarballs/clang-12.0.0.src.tar.xz
|
1
util/crossgcc/sum/clang-13.0.1.src.tar.xz.cksum
Normal file
1
util/crossgcc/sum/clang-13.0.1.src.tar.xz.cksum
Normal file
@@ -0,0 +1 @@
|
||||
9cdc305550fbd27d52d023e8506c50c41e97b7fa tarballs/clang-13.0.1.src.tar.xz
|
@@ -1 +0,0 @@
|
||||
5fe54db45be35b8f77acc32f08e01912f8e8b915 tarballs/clang-tools-extra-12.0.0.src.tar.xz
|
@@ -0,0 +1 @@
|
||||
ee28b71609e57e677205f44076e450fe5f577a22 tarballs/clang-tools-extra-13.0.1.src.tar.xz
|
@@ -1 +0,0 @@
|
||||
96e498c4d1ac238b6852b1113102bf2301bb88d8 tarballs/cmake-3.20.3.tar.gz
|
1
util/crossgcc/sum/cmake-3.22.2.tar.gz.cksum
Normal file
1
util/crossgcc/sum/cmake-3.22.2.tar.gz.cksum
Normal file
@@ -0,0 +1 @@
|
||||
672ec927c218a3f4ece5929d7b225fce6bc38187 tarballs/cmake-3.22.2.tar.gz
|
@@ -1 +0,0 @@
|
||||
7b02a455fbc6fe395da8d5411072acc04d669d94 tarballs/compiler-rt-12.0.0.src.tar.xz
|
1
util/crossgcc/sum/compiler-rt-13.0.1.src.tar.xz.cksum
Normal file
1
util/crossgcc/sum/compiler-rt-13.0.1.src.tar.xz.cksum
Normal file
@@ -0,0 +1 @@
|
||||
68e9e2f569ccfe0af9f5df61ec74808688198946 tarballs/compiler-rt-13.0.1.src.tar.xz
|
@@ -1 +0,0 @@
|
||||
dbc1cf6aa2dbdeccd7ad26c9215b56963a5686d3 tarballs/llvm-12.0.0.src.tar.xz
|
1
util/crossgcc/sum/llvm-13.0.1.src.tar.xz.cksum
Normal file
1
util/crossgcc/sum/llvm-13.0.1.src.tar.xz.cksum
Normal file
@@ -0,0 +1 @@
|
||||
8e50e3e47b6a14a0848862c574fb0007db212482 tarballs/llvm-13.0.1.src.tar.xz
|
Reference in New Issue
Block a user