RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:17:35 +00:00
Code Issues Activity Actions

Toolchain/Ports: Update gcc to 9.3.0

Browse source 
Ever closer to C++20! Also fix up some of those pesky "'s
This commit is contained in:
Shannon Booth 2020-03-22 17:25:17 +13:00 • committed by Andreas Kling
parent ca067e71a3
commit c47ef61ed8
4 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Makefile
View file

@ -141,8 +141,8 @@ PROGRAM = kernel
SUBPROJECT_CXXFLAGS += -pie -fPIE -ffreestanding -fbuiltin -mno-80387 -mno-mmx -mno-sse -mno-sse2 -fno-asynchronous-unwind-tables SUBPROJECT_CXXFLAGS += -pie -fPIE -ffreestanding -fbuiltin -mno-80387 -mno-mmx -mno-sse -mno-sse2 -fno-asynchronous-unwind-tables
SUBPROJECT_CXXFLAGS += -nostdlib -nostdinc -nostdinc++ SUBPROJECT_CXXFLAGS += -nostdlib -nostdinc -nostdinc++
SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.2.0/ SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/
SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.2.0/i686-pc-serenity/ SUBPROJECT_CXXFLAGS += -I../Toolchain/Local/i686-pc-serenity/include/c++/9.3.0/i686-pc-serenity/
LDFLAGS += -Wl,-T linker.ld -nostdlib -lgcc -lstdc++ LDFLAGS += -Wl,-T linker.ld -nostdlib -lgcc -lstdc++

2
Ports/gcc/package.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash ../.port_include.sh #!/bin/bash ../.port_include.sh
port=gcc port=gcc
version=9.2.0 version=9.3.0
useconfigure=true useconfigure=true
configopts="--target=i686-pc-serenity --with-sysroot=/ --with-build-sysroot=$SERENITY_ROOT/Root --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls" configopts="--target=i686-pc-serenity --with-sysroot=/ --with-build-sysroot=$SERENITY_ROOT/Root --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls"
files="https://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz gcc-${version}.tar.xz files="https://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz gcc-${version}.tar.xz

26
Toolchain/BuildIt.sh
View file

@ -14,11 +14,11 @@ TARGET="$ARCH-pc-serenity"
PREFIX="$DIR/Local" PREFIX="$DIR/Local"
SYSROOT="$DIR/../Root" SYSROOT="$DIR/../Root"
MAKE=make MAKE="make"
MD5SUM=md5sum MD5SUM="md5sum"
NPROC=nproc NPROC="nproc"
if [ `uname -s` = "OpenBSD" ]; then if [ "$(uname -s)" = "OpenBSD" ]; then
MAKE=gmake MAKE=gmake
MD5SUM="md5 -q" MD5SUM="md5 -q"
NPROC="sysctl -n hw.ncpuonline" NPROC="sysctl -n hw.ncpuonline"
@ -26,7 +26,7 @@ if [ `uname -s` = "OpenBSD" ]; then
export CXX=eg++ export CXX=eg++
export with_gmp=/usr/local export with_gmp=/usr/local
export LDFLAGS=-Wl,-z,notext export LDFLAGS=-Wl,-z,notext
elif [ `uname -s` = "FreeBSD" ]; then elif [ "$(uname -s)" = "FreeBSD" ]; then
MAKE=gmake MAKE=gmake
MD5SUM="md5 -q" MD5SUM="md5 -q"
NPROC="sysctl -n hw.ncpu" NPROC="sysctl -n hw.ncpu"
@ -43,8 +43,8 @@ BINUTILS_NAME="binutils-$BINUTILS_VERSION"
BINUTILS_PKG="${BINUTILS_NAME}.tar.gz" BINUTILS_PKG="${BINUTILS_NAME}.tar.gz"
BINUTILS_BASE_URL="http://ftp.gnu.org/gnu/binutils" BINUTILS_BASE_URL="http://ftp.gnu.org/gnu/binutils"
GCC_VERSION="9.2.0" GCC_VERSION="9.3.0"
GCC_MD5SUM="e03739b042a14376d727ddcfd05a9bc3" GCC_MD5SUM="9b7e8f6cfad96114e726c752935af58a"
GCC_NAME="gcc-$GCC_VERSION" GCC_NAME="gcc-$GCC_VERSION"
GCC_PKG="${GCC_NAME}.tar.gz" GCC_PKG="${GCC_NAME}.tar.gz"
GCC_BASE_URL="http://ftp.gnu.org/gnu/gcc" GCC_BASE_URL="http://ftp.gnu.org/gnu/gcc"
@ -64,7 +64,7 @@ pushd "$DIR"
BINUTILS_VERSION=${BINUTILS_VERSION},BINUTILS_MD5SUM=${BINUTILS_MD5SUM}, BINUTILS_VERSION=${BINUTILS_VERSION},BINUTILS_MD5SUM=${BINUTILS_MD5SUM},
GCC_VERSION=${GCC_VERSION},GCC_MD5SUM=${GCC_MD5SUM}" GCC_VERSION=${GCC_VERSION},GCC_MD5SUM=${GCC_MD5SUM}"
echo "Config is:${DEPS_CONFIG}" echo "Config is:${DEPS_CONFIG}"
if ! DEPS_HASH=$($DIR/ComputeDependenciesHash.sh $MD5SUM <<<"${DEPS_CONFIG}"); then if ! DEPS_HASH=$("$DIR/ComputeDependenciesHash.sh" "$MD5SUM" <<<"${DEPS_CONFIG}"); then
echo "Dependency hashing failed" echo "Dependency hashing failed"
echo "Will rebuild toolchain from scratch, and NOT SAVE THE RESULT." echo "Will rebuild toolchain from scratch, and NOT SAVE THE RESULT."
echo "Someone should look into this, but for now it'll work, albeit inefficient." echo "Someone should look into this, but for now it'll work, albeit inefficient."
@ -176,11 +176,11 @@ pushd "$DIR/Build/"
popd popd
pushd gcc pushd gcc
if [ `uname -s` = "OpenBSD" ]; then if [ "$(uname -s)" = "OpenBSD" ]; then
perl -pi -e 's/-no-pie/-nopie/g' "$DIR"/Tarballs/gcc-9.2.0/gcc/configure perl -pi -e 's/-no-pie/-nopie/g' "$DIR/Tarballs/gcc-$GCC_VERSION/gcc/configure"
fi fi
"$DIR"/Tarballs/gcc-9.2.0/configure --prefix="$PREFIX" \ "$DIR/Tarballs/gcc-$GCC_VERSION/configure" --prefix="$PREFIX" \
--target="$TARGET" \ --target="$TARGET" \
--with-sysroot="$SYSROOT" \ --with-sysroot="$SYSROOT" \
--disable-nls \ --disable-nls \
@ -202,8 +202,8 @@ pushd "$DIR/Build/"
echo "XXX install libstdc++" echo "XXX install libstdc++"
"$MAKE" install-target-libstdc++-v3 || exit 1 "$MAKE" install-target-libstdc++-v3 || exit 1
if [ `uname -s` = "OpenBSD" ]; then if [ "$(uname -s)" = "OpenBSD" ]; then
cd "$DIR"/Local/libexec/gcc/i686-pc-serenity/9.2.0 && ln -sf liblto_plugin.so.0.0 liblto_plugin.so cd "$DIR/Local/libexec/gcc/i686-pc-serenity/$GCC_VERSION" && ln -sf liblto_plugin.so.0.0 liblto_plugin.so
fi fi
popd popd
popd popd

24
Toolchain/BuildIt_x86_64.sh
View file

@ -12,11 +12,11 @@ TARGET="$ARCH-pc-serenity"
PREFIX="$DIR/Local/x86_64" PREFIX="$DIR/Local/x86_64"
SYSROOT="$DIR/../Root" SYSROOT="$DIR/../Root"
MAKE=make MAKE="make"
MD5SUM=md5sum MD5SUM="md5sum"
NPROC=nproc NPROC="nproc"
if [ `uname -s` = "OpenBSD" ]; then if [ "$(uname -s)" = "OpenBSD" ]; then
MAKE=gmake MAKE=gmake
MD5SUM="md5 -q" MD5SUM="md5 -q"
NPROC="sysctl -n hw.ncpuonline" NPROC="sysctl -n hw.ncpuonline"
@ -24,7 +24,7 @@ if [ `uname -s` = "OpenBSD" ]; then
export CXX=eg++ export CXX=eg++
export with_gmp=/usr/local export with_gmp=/usr/local
export LDFLAGS=-Wl,-z,notext export LDFLAGS=-Wl,-z,notext
elif [ `uname -s` = "FreeBSD" ]; then elif [ "$(uname -s)" = "FreeBSD" ]; then
MAKE=gmake MAKE=gmake
MD5SUM="md5 -q" MD5SUM="md5 -q"
NPROC="sysctl -n hw.ncpu" NPROC="sysctl -n hw.ncpu"
@ -41,8 +41,8 @@ BINUTILS_NAME="binutils-$BINUTILS_VERSION"
BINUTILS_PKG="${BINUTILS_NAME}.tar.gz" BINUTILS_PKG="${BINUTILS_NAME}.tar.gz"
BINUTILS_BASE_URL="http://ftp.gnu.org/gnu/binutils" BINUTILS_BASE_URL="http://ftp.gnu.org/gnu/binutils"
GCC_VERSION="9.2.0" GCC_VERSION="9.3.0"
GCC_MD5SUM="e03739b042a14376d727ddcfd05a9bc3" GCC_MD5SUM="9b7e8f6cfad96114e726c752935af58a"
GCC_NAME="gcc-$GCC_VERSION" GCC_NAME="gcc-$GCC_VERSION"
GCC_PKG="${GCC_NAME}.tar.gz" GCC_PKG="${GCC_NAME}.tar.gz"
GCC_BASE_URL="http://ftp.gnu.org/gnu/gcc" GCC_BASE_URL="http://ftp.gnu.org/gnu/gcc"
@ -135,11 +135,11 @@ pushd "$DIR/Build/x86_64"
popd popd
pushd gcc pushd gcc
if [ `uname -s` = "OpenBSD" ]; then if [ "$(uname -s)" = "OpenBSD" ]; then
perl -pi -e 's/-no-pie/-nopie/g' "$DIR"/Tarballs/gcc-9.2.0/gcc/configure perl -pi -e 's/-no-pie/-nopie/g' "$DIR/Tarballs/gcc-$GCC_VERSION/gcc/configure"
fi fi
"$DIR"/Tarballs/gcc-9.2.0/configure --prefix="$PREFIX" \ "$DIR/Tarballs/gcc-$GCC_VERSION/configure" --prefix="$PREFIX" \
--target="$TARGET" \ --target="$TARGET" \
--with-sysroot="$SYSROOT" \ --with-sysroot="$SYSROOT" \
--disable-nls \ --disable-nls \
@ -161,8 +161,8 @@ pushd "$DIR/Build/x86_64"
echo "XXX install libstdc++" echo "XXX install libstdc++"
"$MAKE" install-target-libstdc++-v3 || exit 1 "$MAKE" install-target-libstdc++-v3 || exit 1
if [ `uname -s` = "OpenBSD" ]; then if [ "$(uname -s)" = "OpenBSD" ]; then
cd "$DIR"/Local/libexec/gcc/x86_64-pc-serenity/9.2.0 && ln -sf liblto_plugin.so.0.0 liblto_plugin.so cd "$DIR/Local/libexec/gcc/x86_64-pc-serenity/$GCC_VERSION" && ln -sf liblto_plugin.so.0.0 liblto_plugin.so
fi fi
popd popd
popd popd