RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:38:10 +00:00
Code Issues Activity Actions

Meta: Make x86-64 target the default

Browse source 
This is a preparation to check if our users find noticeable bugs in the
x86-64 target, before we can decide if we want to remove the i686 target
for good.
This commit is contained in:
Liav A 2022-10-02 20:55:22 +03:00 • committed by Andreas Kling
parent 4e0f85432a
commit 74018be739
9 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meta/CMake/Superbuild/CMakeLists.txt
View file

@ -32,7 +32,7 @@ get_filename_component(
SERENITY_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../.." SERENITY_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../.."
ABSOLUTE CACHE ABSOLUTE CACHE
) )
set(SERENITY_ARCH "i686" CACHE STRING "Target architecture for SerenityOS.") set(SERENITY_ARCH "x86_64" CACHE STRING "Target architecture for SerenityOS.")
set(SERENITY_TOOLCHAIN "GNU" CACHE STRING "Compiler toolchain to use for Serenity (GNU or Clang)") set(SERENITY_TOOLCHAIN "GNU" CACHE STRING "Compiler toolchain to use for Serenity (GNU or Clang)")
# FIXME: It is preferred to keep all the sub-build artifacts below the binary directory for the superbuild # FIXME: It is preferred to keep all the sub-build artifacts below the binary directory for the superbuild

2
Meta/analyze-qemu-coverage.sh
View file

@ -5,7 +5,7 @@ set -eo pipefail
SCRIPT_DIR="$(dirname "${0}")" SCRIPT_DIR="$(dirname "${0}")"
if [ -z "$SERENITY_ARCH" ]; then if [ -z "$SERENITY_ARCH" ]; then
SERENITY_ARCH="i686" SERENITY_ARCH="x86_64"
fi fi
toolchain_suffix= toolchain_suffix=

2
Meta/build-root-filesystem.sh
View file

@ -41,7 +41,7 @@ else
chown -R 0:0 mnt/ chown -R 0:0 mnt/
fi fi
SERENITY_ARCH="${SERENITY_ARCH:-i686}" SERENITY_ARCH="${SERENITY_ARCH:-x86_64}"
LLVM_VERSION="${LLVM_VERSION:-14.0.1}" LLVM_VERSION="${LLVM_VERSION:-14.0.1}"
if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then

2
Meta/check-symbols.sh
View file

@ -9,7 +9,7 @@ cd "$script_path/.." || exit 1
# To eliminate the need for these symbols, avoid doing non-trivial construction of local statics in LibC. # To eliminate the need for these symbols, avoid doing non-trivial construction of local statics in LibC.
FORBIDDEN_SYMBOLS="__cxa_guard_acquire __cxa_guard_release" FORBIDDEN_SYMBOLS="__cxa_guard_acquire __cxa_guard_release"
TARGET="${SERENITY_ARCH:-"i686"}" TARGET="${SERENITY_ARCH:-"x86_64"}"
LIBC_PATH="Build/${TARGET}/Userland/Libraries/LibC/libc.a" LIBC_PATH="Build/${TARGET}/Userland/Libraries/LibC/libc.a"
for forbidden_symbol in $FORBIDDEN_SYMBOLS; do for forbidden_symbol in $FORBIDDEN_SYMBOLS; do
# check if there's an undefined reference to the symbol & it is not defined anywhere else in the library # check if there's an undefined reference to the symbol & it is not defined anywhere else in the library

8
Meta/debug-kernel.sh
View file

@ -3,7 +3,7 @@
SCRIPT_DIR="$(dirname "${0}")" SCRIPT_DIR="$(dirname "${0}")"
if [ -z "$SERENITY_ARCH" ]; then if [ -z "$SERENITY_ARCH" ]; then
SERENITY_ARCH="i686" SERENITY_ARCH="x86_64"
fi fi
# Set this environment variable to override the default debugger. # Set this environment variable to override the default debugger.
@ -50,10 +50,10 @@ fi
exec $SERENITY_KERNEL_DEBUGGER \ exec $SERENITY_KERNEL_DEBUGGER \
-ex "file $SCRIPT_DIR/../Build/${SERENITY_ARCH:-i686}$toolchain_suffix/Kernel/Prekernel/$prekernel_image" \ -ex "file $SCRIPT_DIR/../Build/${SERENITY_ARCH:-x86_64}$toolchain_suffix/Kernel/Prekernel/$prekernel_image" \
-ex "set confirm off" \ -ex "set confirm off" \
-ex "directory $SCRIPT_DIR/../Build/${SERENITY_ARCH:-i686}$toolchain_suffix/" \ -ex "directory $SCRIPT_DIR/../Build/${SERENITY_ARCH:-x86_64}$toolchain_suffix/" \
-ex "add-symbol-file $SCRIPT_DIR/../Build/${SERENITY_ARCH:-i686}$toolchain_suffix/Kernel/Kernel -o $kernel_base" \ -ex "add-symbol-file $SCRIPT_DIR/../Build/${SERENITY_ARCH:-x86_64}$toolchain_suffix/Kernel/Kernel -o $kernel_base" \
-ex "set confirm on" \ -ex "set confirm on" \
-ex "set arch $gdb_arch" \ -ex "set arch $gdb_arch" \
-ex "set print frame-arguments none" \ -ex "set print frame-arguments none" \

2
Meta/export-argsparser-manpages.sh
View file

@ -29,7 +29,7 @@ sudo true
if [ -z "$BUILD_DIR" ]; then if [ -z "$BUILD_DIR" ]; then
if [ -z "$SERENITY_ARCH" ]; then if [ -z "$SERENITY_ARCH" ]; then
export SERENITY_ARCH="i686" export SERENITY_ARCH="x86_64"
echo "SERENITY_ARCH not given. Assuming ${SERENITY_ARCH}." echo "SERENITY_ARCH not given. Assuming ${SERENITY_ARCH}."
fi fi
BUILD_DIR=Build/"$SERENITY_ARCH" BUILD_DIR=Build/"$SERENITY_ARCH"

2
Meta/serenity.sh
View file

@ -91,7 +91,7 @@ fi
if [ -n "$1" ]; then if [ -n "$1" ]; then
TARGET="$1"; shift TARGET="$1"; shift
else else
TARGET="${SERENITY_ARCH:-"i686"}" TARGET="${SERENITY_ARCH:-"x86_64"}"
fi fi
CMAKE_ARGS=() CMAKE_ARGS=()

2
Ports/.hosted_defs.sh
View file

@ -2,7 +2,7 @@
SCRIPT="$(dirname "${0}")" SCRIPT="$(dirname "${0}")"
export SERENITY_ARCH="${SERENITY_ARCH:-i686}" export SERENITY_ARCH="${SERENITY_ARCH:-x86_64}"
export SERENITY_TOOLCHAIN="${SERENITY_TOOLCHAIN:-GNU}" export SERENITY_TOOLCHAIN="${SERENITY_TOOLCHAIN:-GNU}"
if [ -z "${HOST_CC:=}" ]; then if [ -z "${HOST_CC:=}" ]; then

2
Toolchain/BuildIt.sh
View file

@ -9,7 +9,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo "$DIR" echo "$DIR"
ARCH=${ARCH:-"i686"} ARCH=${ARCH:-"x86_64"}
TARGET="$ARCH-pc-serenity" TARGET="$ARCH-pc-serenity"
PREFIX="$DIR/Local/$ARCH" PREFIX="$DIR/Local/$ARCH"
BUILD="$DIR/../Build/$ARCH" BUILD="$DIR/../Build/$ARCH"