Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aarch64: move to using gcc14 #3769

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/binutils/build-arch-aarch64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ ARCH=aarch64
[ "$CLIBUILDARCH" = $ARCH ] || logerr "Incorrect arch selected, use -a $ARCH"

set_arch 64
# Needed for X/Open curses/termcap
set_standard -xcurses XPG6 CFLAGS
set_patchdir patches.$ARCH
CTF_FLAGS+=" -s"

Expand Down
3 changes: 3 additions & 0 deletions build/gcc-runtime/build-runtime++.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ if is_cross; then
NO_SONAME_EXPECTED=1
pushd $DESTDIR.$BUILDARCH >/dev/null
mkdir -p usr/lib
for v in 10; do
install_lib $v "$libs" "" "${SYSROOT[$BUILDARCH]}/usr/gcc/$v/lib"
done
install_lib $CROSS_GCC_VER "$libs" "" $CROSSLIB
install_unversioned $CROSS_GCC_VER "$libs" "" $CROSSLIB
popd >/dev/null
Expand Down
3 changes: 3 additions & 0 deletions build/gcc-runtime/build-runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ if is_cross; then
NO_SONAME_EXPECTED=1
pushd $DESTDIR.$BUILDARCH >/dev/null
logcmd mkdir -p usr/lib
for v in 10; do
install_lib $v "$libs" "" "${SYSROOT[$BUILDARCH]}/usr/gcc/$v/lib"
done
install_lib $CROSS_GCC_VER "$libs" "" $CROSSLIB
install_unversioned $CROSS_GCC_VER "$libs" "" $CROSSLIB
popd >/dev/null
Expand Down
2 changes: 1 addition & 1 deletion build/gcc-runtime/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pth=
max=0

CROSSLIB=$CROSSTOOLS/$BUILDARCH/${TRIPLETS[$BUILDARCH]}/lib
CROSS_GCC_VER=10
CROSS_GCC_VER=14

# Find the library file in the specified gcc version
function find_lib {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
# }}}
#
# Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2023 Richard Lowe <[email protected]>

. ../../lib/build.sh

PKG=developer/gcc10
PKG=developer/gcc14
PROG=gcc
VER=10.4.0
VER=14.2.0
ILVER=il-1
SUMMARY="gcc $VER-$ILVER"
DESC="The GNU Compiler Collection"
Expand All @@ -32,7 +32,7 @@ ARCH=aarch64
GCCMAJOR=${VER%%.*}
OPT=/opt/gcc-$GCCMAJOR

XFORM_ARGS="-D MAJOR=$GCCMAJOR -D OPT=${OPT#/} -D GCCVER=$VER"
XFORM_ARGS="-D MAJOR=$GCCMAJOR -D OPT=${OPT#/} -D GCCVER=$VER -D TRIPLET=$ARCH"
BMI_EXPECTED=1
NO_SONAME_EXPECTED=1

Expand Down
1 change: 1 addition & 0 deletions build/gcc14/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# Copyright 2014 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/arch.sh
. ../../lib/build.sh

PKG=developer/gcc14
Expand Down
4 changes: 2 additions & 2 deletions build/illumos/files/aarch64.env
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export aarch64_CROSS_ROOT=/opt/cross/aarch64
pfx=aarch64-unknown-solaris2.11

export aarch64_GNUC_ROOT=$aarch64_CROSS_ROOT
export aarch64_PRIMARY_CC=gcc10,$aarch64_GNUC_ROOT/bin/$pfx-gcc,gnu
export aarch64_PRIMARY_CCC=gcc10,$aarch64_GNUC_ROOT/bin/$pfx-g++,gnu
export aarch64_PRIMARY_CC=gcc14,$aarch64_GNUC_ROOT/bin/$pfx-gcc,gnu
export aarch64_PRIMARY_CCC=gcc14,$aarch64_GNUC_ROOT/bin/$pfx-g++,gnu

export GLD=$aarch64_CROSS_ROOT/bin/$pfx-ld
export OBJCOPY=$aarch64_CROSS_ROOT/bin/$pfx-objcopy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/INSTALL a/INSTALL
diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile.in a/Makefile.in
--- a~/Makefile.in 1970-01-01 00:00:00
+++ a/Makefile.in 1970-01-01 00:00:00
@@ -128,7 +128,7 @@ SSHDOBJS=sshd.o \
@@ -127,7 +127,7 @@ SSHDOBJS=sshd.o \
$(SKOBJS)

SSHD_SESSION_OBJS=sshd-session.o auth-rhosts.o auth-passwd.o \
Expand Down
19 changes: 19 additions & 0 deletions build/openssh/patches/gcc14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/audit-solaris.c a/audit-solaris.c
--- a~/audit-solaris.c 1970-01-01 00:00:00
+++ a/audit-solaris.c 1970-01-01 00:00:00
@@ -37,6 +37,7 @@
#include <errno.h>
#include <pwd.h>
#include <string.h>
+#include <unistd.h>

#include <bsm/adt.h>
#include <bsm/adt_event.h>
@@ -49,7 +50,6 @@
#include <errno.h>
#include <pwd.h>
#include <stdio.h>
-#include <unistd.h>
#include <stdarg.h>
#include <string.h>
#include <ucred.h>
2 changes: 2 additions & 0 deletions build/openssh/patches/series.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ sshd_config.patch
0029-Accept-LANG-and-LC_-environment-variables-from-clien.patch
0031-Restore-tcpwrappers-libwrap-support.patch
test.patch
pam-illumos.patch
gcc14.patch
2 changes: 1 addition & 1 deletion doc/baseline.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ omnios developer/debug/mdb/module/module-fibre-channel
omnios developer/driver/ftsafe
omnios developer/dtrace
omnios developer/exuberant-ctags
omnios developer/gcc10
omnios developer/gcc14
omnios developer/gnu-binutils
omnios developer/lexer/flex
omnios developer/library/lint o
Expand Down
2 changes: 1 addition & 1 deletion doc/pkglist.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ web/wget
web/wget2
###############################################################################
.SYSROOT
developer/gcc10
developer/gcc14
developer/gnu-binutils
developer/versioning/git
system/library/libdbus -f libsandheaders
Expand Down
Loading