diff --git a/Meta/CMake/Superbuild/CMakeLists.txt b/Meta/CMake/Superbuild/CMakeLists.txt index cf774748fb5..b9b866ef9ff 100644 --- a/Meta/CMake/Superbuild/CMakeLists.txt +++ b/Meta/CMake/Superbuild/CMakeLists.txt @@ -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 diff --git a/Meta/analyze-qemu-coverage.sh b/Meta/analyze-qemu-coverage.sh index 10ee9f1d915..e537fa251a2 100755 --- a/Meta/analyze-qemu-coverage.sh +++ b/Meta/analyze-qemu-coverage.sh @@ -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= diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh index 851d7ae72e8..71f2193d0f0 100755 --- a/Meta/build-root-filesystem.sh +++ b/Meta/build-root-filesystem.sh @@ -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 diff --git a/Meta/check-symbols.sh b/Meta/check-symbols.sh index 8d524c5ed7b..ae36789c58c 100755 --- a/Meta/check-symbols.sh +++ b/Meta/check-symbols.sh @@ -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 diff --git a/Meta/debug-kernel.sh b/Meta/debug-kernel.sh index 897a6feec0e..5ba4ae0d4e2 100755 --- a/Meta/debug-kernel.sh +++ b/Meta/debug-kernel.sh @@ -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" \ diff --git a/Meta/export-argsparser-manpages.sh b/Meta/export-argsparser-manpages.sh index 791ce5ba752..8e56804fded 100755 --- a/Meta/export-argsparser-manpages.sh +++ b/Meta/export-argsparser-manpages.sh @@ -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" diff --git a/Meta/serenity.sh b/Meta/serenity.sh index 6260d4df978..1d0e5f356ad 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -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=() diff --git a/Ports/.hosted_defs.sh b/Ports/.hosted_defs.sh index 4a7a5e878c1..ac346fef55b 100644 --- a/Ports/.hosted_defs.sh +++ b/Ports/.hosted_defs.sh @@ -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 diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh index 91e1a3cbfcb..4c9be2884f8 100755 --- a/Toolchain/BuildIt.sh +++ b/Toolchain/BuildIt.sh @@ -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"