Meta: Make x86-64 target the default

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
Notes: sideshowbarker 2024-07-17 06:24:09 +09:00
9 changed files with 12 additions and 12 deletions

View File

@ -32,7 +32,7 @@ get_filename_component(
SERENITY_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../.."
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)")
# FIXME: It is preferred to keep all the sub-build artifacts below the binary directory for the superbuild

View File

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

View File

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

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.
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"
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

View File

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

View File

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

View File

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

View File

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

View File

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