- linux-morello-distros - op-lists.linaro.org

[PATCH 0/2] Mount boot and root at runtime

by carsten.haitzler＠foss.arm.com

From: Carsten Haitzler <carsten.haitzler(a)arm.com> Have boot (and root) properly mounted by fstab post-boot in debian at least to have a more normal system experience. Carsten Haitzler (2): morello: Filesystem: Make fs labels with prefix MRLO- mounting morello: fstab: mount root and boot by label context/build_debian_image.sh | 3 +++ context/make_image.sh | 4 ++-- scripts/build-morello-image.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) -- 2.25.1

2 years

3
5
0 0

[PATCH] morello: Network: Move to network manager to solve DNS

by carsten.haitzler＠foss.arm.com

From: Carsten Haitzler <carsten.haitzler(a)arm.com> Hardcoding 8.8.8.8 or any other DNS is a hacky workaround systemd networkd not properly setting up resolv.conf based on DHCP info. An easy solution - move to network manager. It actually gets this right. It will also handle multple network interfaces (if you plug in some USB ones) as well as Wifi (via USB) if you attach it etc. so use a better solution. Network Manager. Signed-off-by: Carsten Haitzler <carsten.haitzler(a)arm.com> --- context/build_debian_image.sh | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/context/build_debian_image.sh b/context/build_debian_image.sh index d2d23e3..6ea00b2 100755 --- a/context/build_debian_image.sh +++ b/context/build_debian_image.sh @@ -52,6 +52,7 @@ PACKAGES=( libncursesw5 libncurses5-dev libncursesw5-dev + network-manager ) # Install dependencies @@ -63,12 +64,9 @@ echo 'root:morello' | chpasswd echo -e "none /dev/shm tmpfs rw,nosuid,nodev,noexec 0 0" >> /etc/fstab mount /dev/shm -# Enable network -systemctl enable systemd-networkd -echo -e "[Match]\nName=e*\n[Network]\nDHCP=yes" | tee /etc/systemd/network/dhcp.network >/dev/null +# Hostname basics echo morello > /etc/hostname -echo 127.0.0.1 localhost > /etc/hosts -echo 127.0.1.1 morello >> /etc/hosts +echo 127.0.0.1 localhost morello > /etc/hosts # Allow root access to ssh sed -i 's|#PermitRootLogin prohibit-password|PermitRootLogin yes|g' /etc/ssh/sshd_config @@ -106,21 +104,6 @@ source $MORELLO_HOME/env/morello-pcuabi-env-restore # Install Entropy generators apt-get install rng-tools haveged jitterentropy-rngd -y -# Create /etc/resolv.conf -cat > /etc/resolv.conf << EOF -nameserver 8.8.8.8 -nameserver 8.8.4.4 -EOF - -# Create morello.network -cat > /etc/systemd/network/morello.network << EOF -[Match] -Name=enp7s0 - -[Network] -DHCP=ipv4 -EOF - # Create local service for the final system configuration cat > /etc/systemd/system/morello-config.service << EOF [Unit] -- 2.25.1

2 years

3
3
0 0

[morello-pcuabi-env RFC 0/4] Enable libraries build support

by Tudor Cretu

Hi all, As the tag suggests, this series targets the morello-pcuabi-env project [1]. It aims to enable support to build Morello ports of various libraries. The submodules paths are local to my workspace at the moment, but will point to the public Gitlab libraries sub-group [2], once it's populated. This series also exemplifies how two such Morello library ports are making use of the new build support: libaio and liburing. Review branch: https://git.morello-project.org/tudcre01/morello-pcuabi-env/-/commits/morel… [1] https://git.morello-project.org/morello/morello-pcuabi-env [2] https://git.morello-project.org/morello/libraries/ Tudor Cretu (4): Rename build-lib to toolchain-lib Add support to build software libraries Integrate Morello libaio Integrate Morello liburing .gitignore | 4 ++ .gitmodules | 6 +++ morello/projects/libs/libaio | 1 + morello/projects/libs/liburing | 1 + morello/scripts/build-all.sh | 29 ++++++++++---- morello/scripts/build-busybox-docker.sh | 7 ++++ morello/scripts/build-libaio.sh | 39 +++++++++++++++++++ morello/scripts/build-liburing.sh | 33 ++++++++++++++++ ...raries.sh => build-toolchain-libraries.sh} | 0 morello/scripts/configure-libs.sh | 31 +++++++++++++++ 10 files changed, 144 insertions(+), 7 deletions(-) create mode 160000 morello/projects/libs/libaio create mode 160000 morello/projects/libs/liburing create mode 100755 morello/scripts/build-libaio.sh create mode 100755 morello/scripts/build-liburing.sh rename morello/scripts/{build-libraries.sh => build-toolchain-libraries.sh} (100%) create mode 100755 morello/scripts/configure-libs.sh -- 2.34.1

2 years

1
4
0 0

[PATCH 0/9] tidy up images

by Pawel Zalewski

This series of patches is getting rid of recipes that manually assembled the images: - the linux image consisting of the ESP and rootfs partitions - the initramfs These are now managed via the usual Yocto ways, which should make them easier to maintain moving forward. FVP test image is decoupled from the machine config. Implementation can be seen here: https://git.morello-project.org/pzalewski/meta-morello/-/tree/use-wic Pawel Zalewski (9): grub: remove redundant code linux-image: replace with wic config: support the wic image kas: match new image linux: moved to config initramfs: use core-image instead of doing it manually gen-init-cpio: remove the recipe ci: move testimage README.md: update ci/jobs-to-kas | 4 + ci/testimage.yml | 11 ++ kas/morello-fvp.yml | 17 +- kas/morello-soc.yml | 2 +- meta-morello/README.md | 6 +- .../conf/machine/include/morello-common.inc | 21 ++- meta-morello/conf/machine/morello-fvp.conf | 7 +- meta-morello/conf/machine/morello-soc.conf | 5 +- .../recipes-bsp/grub/grub-efi_2.%.bbappend | 21 +-- .../recipes-core/busybox/busybox-morello.inc | 8 +- .../gen-init-cpio/gen-init-cpio-native.bb | 37 ----- .../recipes-kernel/linux/linux-morello.inc | 1 - .../images/{morello-soc => }/files/init.sh | 24 ++- .../files/initramfs.list.template | 0 .../images/morello-fvp/files/init.sh | 47 ------ .../images/morello-initramfs-image.bb | 24 +++ .../images/morello-initramfs-scripts.bb | 19 +++ .../images/morello-initramfs.bb | 52 ------ .../images/morello-linux-image-fvp.inc | 1 - .../images/morello-linux-image-soc.inc | 1 - .../images/morello-linux-image.bb | 153 ------------------ .../morello-soc/files/initramfs.list.template | 16 -- meta-morello/wic/morello-efidisk.wks | 9 ++ .../morello-fvp-grub.cfg} | 14 +- .../morello-soc-grub.cfg} | 14 +- 25 files changed, 135 insertions(+), 379 deletions(-) create mode 100644 ci/testimage.yml delete mode 100644 meta-morello/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb rename meta-morello/recipes-morello/images/{morello-soc => }/files/init.sh (51%) rename meta-morello/recipes-morello/images/{morello-fvp => }/files/initramfs.list.template (100%) delete mode 100644 meta-morello/recipes-morello/images/morello-fvp/files/init.sh create mode 100644 meta-morello/recipes-morello/images/morello-initramfs-image.bb create mode 100644 meta-morello/recipes-morello/images/morello-initramfs-scripts.bb delete mode 100644 meta-morello/recipes-morello/images/morello-initramfs.bb delete mode 100644 meta-morello/recipes-morello/images/morello-linux-image-fvp.inc delete mode 100644 meta-morello/recipes-morello/images/morello-linux-image-soc.inc delete mode 100644 meta-morello/recipes-morello/images/morello-linux-image.bb delete mode 100644 meta-morello/recipes-morello/images/morello-soc/files/initramfs.list.template create mode 100644 meta-morello/wic/morello-efidisk.wks rename meta-morello/{recipes-bsp/grub/morello-fvp/files/grub-config.cfg => wic/morello-fvp-grub.cfg} (58%) rename meta-morello/{recipes-bsp/grub/morello-soc/files/grub-config.cfg => wic/morello-soc-grub.cfg} (61%) -- 2.34.1

2 years

1
10
0 0

[PATCH 00/13] Maintenance: towards layer-check

by Pawel Zalewski

This series of patches sets meta-morello on the path of being Yocto compatible. Bbappends are replaced with .bb recipes that pull the .inc files from meta-arm and poky. To save typing the "morello" prefix is moved into the package version, it can still appear in the recipe name itself when we want that recipe to be distinct (ie. busybox morello is used next to a64 busybox, the Linux kernel recipe etc.). The patches also contain bug fixes relating to hashes and licenses. The implementation is available here: https://git.morello-project.org/pzalewski/meta-morello/-/tree/check-layer Pawel Zalewski (13): gdb: do not append the gdb recipe tf-a: do not append the tf-a recipe uefi: do not append the uefi recipe busybox: change the versioning linux: change the versioning board-firmware: change the versioning grub: make check-layer compliant config: changes to match new versioning musl: do not append the musl recipe rom-binaries: fix bugs gen-init-cpio: fix bugs fvp: fix bugs README.md: update README.md | 7 +- .../recipes-core/musl/musl-morello-common.inc | 1 - .../recipes-core/musl/musl_%.bbappend | 17 ----- .../recipes-core/musl/musl_morello-1.5.bb | 15 +++++ .../recipes-core/musl/override-glibc.inc | 5 +- .../recipes-core/musl/override-musl.inc | 5 +- .../conf/machine/include/morello-common.inc | 12 +++- meta-morello/conf/machine/morello-fvp.conf | 4 -- meta-morello/conf/machine/morello-soc.conf | 4 -- .../board-firmware/board-firmware-image.bb | 4 +- ...e_1.4.bb => board-firmware_morello-1.4.bb} | 2 +- .../recipes-bsp/grub/grub-efi_2.%.bbappend | 24 ++++--- .../recipes-bsp/grub/grub_2.%.bbappend | 11 +++- .../rom-binaries/rom-binaries_1.5.bb | 6 +- ....bbappend => scp-firmware_morello-2.10.bb} | 65 ++++++++++++++++--- ...pend => trusted-firmware-a_morello-2.7.bb} | 3 +- ....bbappend => edk2-firmware_morello-2.4.bb} | 5 +- ..._1.5.bb => busybox-morello_morello-1.5.bb} | 0 .../recipes-devtools/fvp/fvp-morello.bb | 2 +- .../gdb/gdb-cross-canadian_morello-11.0.bb | 3 + .../gdb/gdb-cross_morello-11.0.bb | 2 + meta-morello/recipes-devtools/gdb/gdb.inc | 20 ++++++ ...make-man-install-relative-to-DESTDIR.patch | 28 ++++++++ ...ux-nat-Define-_ABIO32-if-not-defined.patch | 35 ++++++++++ ...e-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 53 +++++++++++++++ ...readline.a-when-using-disable-static.patch | 50 ++++++++++++++ .../gdb/gdb/0006-use-asm-sgidefs.h.patch | 36 ++++++++++ .../gdb/gdb/0007-Change-order-of-CFLAGS.patch | 30 +++++++++ ...08-resolve-restrict-keyword-conflict.patch | 48 ++++++++++++++ .../0009-Fix-invalid-sigprocmask-call.patch | 49 ++++++++++++++ .../gdb/0010-gdbserver-ctrl-c-handling.patch | 40 ++++++++++++ .../recipes-devtools/gdb/gdb_%.bbappend | 7 -- .../recipes-devtools/gdb/gdb_morello-11.0.bb | 34 ++++++++++ .../gen-init-cpio/gen-init-cpio-native.bb | 5 +- ...lo_1.5.bb => linux-morello_morello-1.5.bb} | 0 .../applications/pure-cap-app.bb | 4 +- 36 files changed, 556 insertions(+), 80 deletions(-) delete mode 100644 meta-morello-toolchain/recipes-core/musl/musl_%.bbappend create mode 100644 meta-morello-toolchain/recipes-core/musl/musl_morello-1.5.bb rename meta-morello/recipes-bsp/board-firmware/{board-firmware_1.4.bb => board-firmware_morello-1.4.bb} (93%) rename meta-morello/recipes-bsp/scp-firmware/{scp-firmware_2.10.%.bbappend => scp-firmware_morello-2.10.bb} (51%) rename meta-morello/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.%.bbappend => trusted-firmware-a_morello-2.7.bb} (96%) rename meta-morello/recipes-bsp/uefi/{edk2-firmware_%.bbappend => edk2-firmware_morello-2.4.bb} (96%) rename meta-morello/recipes-core/busybox/{busybox-morello_1.5.bb => busybox-morello_morello-1.5.bb} (100%) create mode 100644 meta-morello/recipes-devtools/gdb/gdb-cross-canadian_morello-11.0.bb create mode 100644 meta-morello/recipes-devtools/gdb/gdb-cross_morello-11.0.bb create mode 100644 meta-morello/recipes-devtools/gdb/gdb.inc create mode 100644 meta-morello/recipes-devtools/gdb/gdb/0001-make-man-install-relative-to-DESTDIR.patch create mode 100644 meta-morello/recipes-devtools/gdb/gdb/0002-mips-linux-nat-Define-_ABIO32-if-not-defined.patch create mode 100644 meta-morello/recipes-devtools/gdb/gdb/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch create mode 100644 meta-morello/recipes-devtools/gdb/gdb/0005-Dont-disable-libreadline.a-when-using-disable-static.patch create mode 100644 meta-morello/recipes-devtools/gdb/gdb/0006-use-asm-sgidefs.h.patch create mode 100644 meta-morello/recipes-devtools/gdb/gdb/0007-Change-order-of-CFLAGS.patch create mode 100644 meta-morello/recipes-devtools/gdb/gdb/0008-resolve-restrict-keyword-conflict.patch create mode 100644 meta-morello/recipes-devtools/gdb/gdb/0009-Fix-invalid-sigprocmask-call.patch create mode 100644 meta-morello/recipes-devtools/gdb/gdb/0010-gdbserver-ctrl-c-handling.patch delete mode 100644 meta-morello/recipes-devtools/gdb/gdb_%.bbappend create mode 100644 meta-morello/recipes-devtools/gdb/gdb_morello-11.0.bb rename meta-morello/recipes-kernel/linux/{linux-morello_1.5.bb => linux-morello_morello-1.5.bb} (100%) -- 2.34.1

2 years

1
14
0 0

[PATCH 00/13] Decouple LLVM toolchain.

by Pawel Zalewski

This series of patches decouples the LLVM compiler from the meta-morello layer. The meta-morello layer is split into: - meta-morello - meta-morello-toolchain The toolchain can be set the usual way by overriding the TOOLCHAIN variable in a recipe or in a config. The implementation is available on this branch: https://git.morello-project.org/pzalewski/meta-morello/-/tree/meta-toolchain Pawel Zalewski (13): meta-morello: move compilers to meta-morello-toolchain kas: modify the base.yml morello-toolchain: refactor class and configs musl: refactor recipe pure-cap-app: add support for the new toolchain machine conf: add supoort for the new toolchain tfa: add support for the new toolchain uefi: add support for the new toolchain busybox: add support for the new toolchain gen-init-cpio: add support for the new toolchain linux: add support for the new toolchain README.md: update ci: reflect the changes in the layer structure .gitlab-ci.yml | 6 +- README.md | 108 +++-------- classes/llvm-morello-native.bbclass | 47 ----- conf/bblayers.conf.sample | 15 -- conf/local.conf.sample | 176 ------------------ kas/base.yml | 3 + meta-morello-toolchain/README.md | 16 ++ .../classes/gcc-morello.bbclass | 1 + .../classes/llvm-morello.bbclass | 43 +++++ .../conf/compiler/gcc-morello.conf | 1 + .../conf/compiler/llvm-morello.conf | 1 + meta-morello-toolchain/conf/layer.conf | 22 +++ .../musl/files/compiler_rt.cmake | 0 .../musl/musl-morello-a64-so.inc | 0 .../recipes-core}/musl/musl-morello-a64.inc | 0 .../musl/musl-morello-c64-so.inc | 0 .../recipes-core}/musl/musl-morello-c64.inc | 0 .../musl/musl-morello-common.inc | 4 +- .../recipes-core}/musl/musl-morello-native.bb | 6 +- .../musl/musl-morello-target.inc | 3 +- .../recipes-core}/musl/musl_%.bbappend | 0 .../recipes-core}/musl/override-glibc.inc | 0 .../recipes-core}/musl/override-musl.inc | 0 .../gcc/gcc-cross-canadian_morello-10.1.bb | 0 .../gcc/gcc-cross_morello-10.1.bb | 0 .../gcc/gcc-crosssdk_morello-10.1.bb | 0 .../gcc/gcc-morello-10.1.inc | 0 .../0001-Fix-install-path-of-linux64.h.patch | 0 ...0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 0 .../0002-gcc-poison-system-directories.patch | 0 .../patches/0004-64-bit-multilib-hack.patch | 0 ...ains-something-unsupported-by-the-bu.patch | 0 ...ts.h-in-B-instead-of-S-and-t-oe-in-B.patch | 0 .../patches/0009-cpp-honor-sysroot.patch | 0 ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 0 ...gcc-Fix-argument-list-too-long-error.patch | 0 .../patches/0014-libtool.patch | 0 ...s-fix-v4bx-to-linker-to-support-EABI.patch | 0 ...-config-files-from-B-instead-of-usin.patch | 0 ...ir-from-.la-which-usually-points-to-.patch | 0 .../patches/0018-export-CPP.patch | 0 ...e-target-gcc-headers-can-be-included.patch | 0 ...t-directory-during-relink-if-inst_pr.patch | 0 ...-fix-libcc1-s-install-path-and-rpath.patch | 0 ...le-sysroot-support-for-nativesdk-gcc.patch | 0 ...sroot-gcc-version-specific-dirs-with.patch | 0 ...027-nios2-Define-MUSL_DYNAMIC_LINKER.patch | 0 ...d-to-link-commandline-for-musl-targe.patch | 0 ...using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch | 0 .../0030-sync-gcc-stddef.h-with-musl.patch | 0 ...Re-introduce-spe-commandline-options.patch | 0 ...as-for-__cpu_indicator_init-instead-.patch | 0 ...s-Do-not-use-__LINE__-for-maintainin.patch | 0 ...omic-Do-not-enforce-march-on-aarch64.patch | 0 ...prefix-maps-before-checksumming-DIEs.patch | 0 .../gcc/gcc-runtime_morello-10.1.bb | 0 .../gcc/gcc-sanitizers_morello-10.1.bb | 0 .../gcc/gcc-source_morello-10.1.bb | 0 .../recipes-devtools}/gcc/gcc_morello-10.1.bb | 0 .../gcc/libgcc-initial_morello-10.1.bb | 0 .../gcc/libgcc_morello-10.1.bb | 0 .../gcc/libgfortan_morello-10.1.bb | 0 .../llvm/llvm-13.0.1-native.bb | 0 .../llvm/llvm-morello-native_13.0.bb | 0 .../llvm/llvm-morello-runtime-native.bb | 11 +- .../recipes-devtools}/llvm/llvm-morello.inc | 0 .../llvm/llvm-morello_13.0.bb | 0 meta-morello/README.md | 88 +++++++++ .../classes}/pure-cap-application.bbclass | 2 - {conf => meta-morello/conf}/layer.conf | 6 +- .../conf}/machine/include/morello-common.inc | 4 +- .../conf}/machine/morello-fvp.conf | 3 +- .../conf}/machine/morello-soc.conf | 1 + .../board-firmware/board-firmware-image.bb | 0 .../board-firmware/board-firmware_1.4.bb | 0 .../board-firmware/board-morello-fvp.inc | 0 .../board-firmware/board-morello-soc.inc | 0 .../recipes-bsp}/grub/grub-efi_2.%.bbappend | 0 .../recipes-bsp}/grub/grub_2.%.bbappend | 0 .../grub/morello-fvp/files/grub-config.cfg | 0 .../grub/morello-soc/files/grub-config.cfg | 0 .../rom-binaries/rom-binaries_1.5.bb | 0 .../scp-firmware/scp-firmware-morello-fvp.inc | 0 .../scp-firmware/scp-firmware-morello-soc.inc | 0 .../scp-firmware/scp-firmware_2.10.%.bbappend | 0 .../tfa-firmware-morello-fvp.inc | 0 .../tfa-firmware-morello-soc.inc | 0 .../trusted-firmware-a_2.%.bbappend | 6 +- .../uefi/edk2-firmware-morello-fvp.inc | 0 .../uefi/edk2-firmware-morello-soc.inc | 0 .../uefi/edk2-firmware_%.bbappend | 4 +- ...Basetools-remove-brotli-build-errors.patch | 0 .../recipes-core}/busybox/busybox-morello.inc | 4 +- .../busybox/busybox-morello_1.5.bb | 0 ...-append-toolchain-with-relative-path.patch | 0 .../fiptool/fiptool-native_2.7.bb | 0 .../recipes-devtools}/fvp/fvp-morello.bb | 0 .../recipes-devtools}/gdb/gdb_%.bbappend | 0 .../gen-init-cpio/gen-init-cpio-native.bb | 5 +- .../recipes-kernel}/linux/linux-morello.inc | 6 +- .../linux/linux-morello_1.5.bb | 0 .../applications/files/Makefile | 0 .../applications/files/pure-cap-app.c | 0 .../applications/pure-cap-app.bb | 4 +- .../images/morello-fvp/files/init.sh | 0 .../morello-fvp/files/initramfs.list.template | 0 .../images/morello-initramfs.bb | 0 .../images/morello-linux-image-fvp.inc | 0 .../images/morello-linux-image-soc.inc | 0 .../images/morello-linux-image.bb | 4 +- .../images/morello-soc/files/init.sh | 0 .../morello-soc/files/initramfs.list.template | 0 112 files changed, 254 insertions(+), 346 deletions(-) delete mode 100644 classes/llvm-morello-native.bbclass delete mode 100644 conf/bblayers.conf.sample delete mode 100644 conf/local.conf.sample create mode 100644 meta-morello-toolchain/README.md create mode 100644 meta-morello-toolchain/classes/gcc-morello.bbclass create mode 100644 meta-morello-toolchain/classes/llvm-morello.bbclass create mode 100644 meta-morello-toolchain/conf/compiler/gcc-morello.conf create mode 100644 meta-morello-toolchain/conf/compiler/llvm-morello.conf create mode 100644 meta-morello-toolchain/conf/layer.conf rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/files/compiler_rt.cmake (100%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/musl-morello-a64-so.inc (100%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/musl-morello-a64.inc (100%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/musl-morello-c64-so.inc (100%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/musl-morello-c64.inc (100%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/musl-morello-common.inc (93%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/musl-morello-native.bb (92%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/musl-morello-target.inc (96%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/musl_%.bbappend (100%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/override-glibc.inc (100%) rename {recipes-core => meta-morello-toolchain/recipes-core}/musl/override-musl.inc (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-cross-canadian_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-cross_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-crosssdk_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1.inc (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0014-libtool.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-runtime_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-sanitizers_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc-source_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/gcc_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/libgcc-initial_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/libgcc_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/gcc/libgfortan_morello-10.1.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/llvm/llvm-13.0.1-native.bb (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/llvm/llvm-morello-native_13.0.bb (100%) rename recipes-core/musl/musl-morello-libs-native.bb => meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-runtime-native.bb (93%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/llvm/llvm-morello.inc (100%) rename {recipes-devtools => meta-morello-toolchain/recipes-devtools}/llvm/llvm-morello_13.0.bb (100%) create mode 100644 meta-morello/README.md rename {classes => meta-morello/classes}/pure-cap-application.bbclass (96%) rename {conf => meta-morello/conf}/layer.conf (73%) rename {conf => meta-morello/conf}/machine/include/morello-common.inc (82%) rename {conf => meta-morello/conf}/machine/morello-fvp.conf (97%) rename {conf => meta-morello/conf}/machine/morello-soc.conf (91%) rename {recipes-bsp => meta-morello/recipes-bsp}/board-firmware/board-firmware-image.bb (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/board-firmware/board-firmware_1.4.bb (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/board-firmware/board-morello-fvp.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/board-firmware/board-morello-soc.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/grub/grub-efi_2.%.bbappend (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/grub/grub_2.%.bbappend (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/grub/morello-fvp/files/grub-config.cfg (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/grub/morello-soc/files/grub-config.cfg (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/rom-binaries/rom-binaries_1.5.bb (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/scp-firmware/scp-firmware-morello-fvp.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/scp-firmware/scp-firmware-morello-soc.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/scp-firmware/scp-firmware_2.10.%.bbappend (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/trusted-firmware-a/tfa-firmware-morello-fvp.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/trusted-firmware-a/tfa-firmware-morello-soc.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/trusted-firmware-a/trusted-firmware-a_2.%.bbappend (95%) rename {recipes-bsp => meta-morello/recipes-bsp}/uefi/edk2-firmware-morello-fvp.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/uefi/edk2-firmware-morello-soc.inc (100%) rename {recipes-bsp => meta-morello/recipes-bsp}/uefi/edk2-firmware_%.bbappend (96%) rename {recipes-bsp => meta-morello/recipes-bsp}/uefi/files/0001-Basetools-remove-brotli-build-errors.patch (100%) rename {recipes-core => meta-morello/recipes-core}/busybox/busybox-morello.inc (96%) rename {recipes-core => meta-morello/recipes-core}/busybox/busybox-morello_1.5.bb (100%) rename {recipes-core => meta-morello/recipes-core}/busybox/files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch (100%) rename {recipes-devtools => meta-morello/recipes-devtools}/fiptool/fiptool-native_2.7.bb (100%) rename {recipes-devtools => meta-morello/recipes-devtools}/fvp/fvp-morello.bb (100%) rename {recipes-devtools => meta-morello/recipes-devtools}/gdb/gdb_%.bbappend (100%) rename {recipes-devtools => meta-morello/recipes-devtools}/gen-init-cpio/gen-init-cpio-native.bb (93%) rename {recipes-kernel => meta-morello/recipes-kernel}/linux/linux-morello.inc (91%) rename {recipes-kernel => meta-morello/recipes-kernel}/linux/linux-morello_1.5.bb (100%) rename {recipes-morello-apps => meta-morello/recipes-morello-apps}/applications/files/Makefile (100%) rename {recipes-morello-apps => meta-morello/recipes-morello-apps}/applications/files/pure-cap-app.c (100%) rename {recipes-morello-apps => meta-morello/recipes-morello-apps}/applications/pure-cap-app.bb (90%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-fvp/files/init.sh (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-fvp/files/initramfs.list.template (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-initramfs.bb (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-linux-image-fvp.inc (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-linux-image-soc.inc (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-linux-image.bb (95%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-soc/files/init.sh (100%) rename {recipes-morello => meta-morello/recipes-morello}/images/morello-soc/files/initramfs.list.template (100%) -- 2.34.1

2 years

2
16
0 0

[PATCH] morello-gcc: add boilerplate code

by Pawel Zalewski

The boilerplate code for morello gcc. Rebase patches: 64-bit-multilib-hack.patch 0009-cpp-honor-sysroot.patch Few of the patches will issue offset warnings but it will build, so I am parking it here for now. NB: this is the alpha and in general is not fully usable yet. Signed-off-by: Pawel Zalewski <pzalewski(a)thegoodpenguin.co.uk> --- .../gcc/gcc-cross-canadian_morello-10.1.bb | 2 + .../gcc/gcc-cross_morello-10.1.bb | 2 + .../gcc/gcc-crosssdk_morello-10.1.bb | 2 + recipes-devtools/gcc/gcc-morello-10.1.inc | 108 ++++ .../0001-Fix-install-path-of-linux64.h.patch | 33 ++ ...0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 39 ++ .../0002-gcc-poison-system-directories.patch | 226 ++++++++ .../patches/0004-64-bit-multilib-hack.patch | 140 +++++ ...ains-something-unsupported-by-the-bu.patch | 63 +++ ...ts.h-in-B-instead-of-S-and-t-oe-in-B.patch | 92 ++++ .../patches/0009-cpp-honor-sysroot.patch | 54 ++ ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 62 +++ ...gcc-Fix-argument-list-too-long-error.patch | 38 ++ .../patches/0014-libtool.patch | 39 ++ ...s-fix-v4bx-to-linker-to-support-EABI.patch | 40 ++ ...-config-files-from-B-instead-of-usin.patch | 99 ++++ ...ir-from-.la-which-usually-points-to-.patch | 28 + .../patches/0018-export-CPP.patch | 199 +++++++ ...e-target-gcc-headers-can-be-included.patch | 113 ++++ ...t-directory-during-relink-if-inst_pr.patch | 35 ++ ...-fix-libcc1-s-install-path-and-rpath.patch | 51 ++ ...le-sysroot-support-for-nativesdk-gcc.patch | 510 ++++++++++++++++++ ...sroot-gcc-version-specific-dirs-with.patch | 99 ++++ ...027-nios2-Define-MUSL_DYNAMIC_LINKER.patch | 31 ++ ...d-to-link-commandline-for-musl-targe.patch | 78 +++ ...using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch | 26 + .../0030-sync-gcc-stddef.h-with-musl.patch | 88 +++ ...Re-introduce-spe-commandline-options.patch | 39 ++ ...as-for-__cpu_indicator_init-instead-.patch | 83 +++ ...s-Do-not-use-__LINE__-for-maintainin.patch | 182 +++++++ ...omic-Do-not-enforce-march-on-aarch64.patch | 42 ++ ...prefix-maps-before-checksumming-DIEs.patch | 95 ++++ .../gcc/gcc-runtime_morello-10.1.bb | 2 + .../gcc/gcc-sanitizers_morello-10.1.bb | 7 + .../gcc/gcc-source_morello-10.1.bb | 4 + recipes-devtools/gcc/gcc_morello-10.1.bb | 11 + .../gcc/libgcc-initial_morello-10.1.bb | 5 + recipes-devtools/gcc/libgcc_morello-10.1.bb | 5 + .../gcc/libgfortan_morello-10.1.bb | 2 + 39 files changed, 2774 insertions(+) create mode 100644 recipes-devtools/gcc/gcc-cross-canadian_morello-10.1.bb create mode 100644 recipes-devtools/gcc/gcc-cross_morello-10.1.bb create mode 100644 recipes-devtools/gcc/gcc-crosssdk_morello-10.1.bb create mode 100644 recipes-devtools/gcc/gcc-morello-10.1.inc create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0014-libtool.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch create mode 100644 recipes-devtools/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch create mode 100644 recipes-devtools/gcc/gcc-runtime_morello-10.1.bb create mode 100644 recipes-devtools/gcc/gcc-sanitizers_morello-10.1.bb create mode 100644 recipes-devtools/gcc/gcc-source_morello-10.1.bb create mode 100644 recipes-devtools/gcc/gcc_morello-10.1.bb create mode 100644 recipes-devtools/gcc/libgcc-initial_morello-10.1.bb create mode 100644 recipes-devtools/gcc/libgcc_morello-10.1.bb create mode 100644 recipes-devtools/gcc/libgfortan_morello-10.1.bb diff --git a/recipes-devtools/gcc/gcc-cross-canadian_morello-10.1.bb b/recipes-devtools/gcc/gcc-cross-canadian_morello-10.1.bb new file mode 100644 index 0000000..d4bf7bf --- /dev/null +++ b/recipes-devtools/gcc/gcc-cross-canadian_morello-10.1.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-cross-canadian.inc diff --git a/recipes-devtools/gcc/gcc-cross_morello-10.1.bb b/recipes-devtools/gcc/gcc-cross_morello-10.1.bb new file mode 100644 index 0000000..0a149ba --- /dev/null +++ b/recipes-devtools/gcc/gcc-cross_morello-10.1.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-cross.inc \ No newline at end of file diff --git a/recipes-devtools/gcc/gcc-crosssdk_morello-10.1.bb b/recipes-devtools/gcc/gcc-crosssdk_morello-10.1.bb new file mode 100644 index 0000000..0a9f98a --- /dev/null +++ b/recipes-devtools/gcc/gcc-crosssdk_morello-10.1.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-cross_${PV}.bb +require recipes-devtools/gcc/gcc-crosssdk.inc diff --git a/recipes-devtools/gcc/gcc-morello-10.1.inc b/recipes-devtools/gcc/gcc-morello-10.1.inc new file mode 100644 index 0000000..2ba3a7b --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1.inc @@ -0,0 +1,108 @@ +require recipes-devtools/gcc/gcc-common.inc + +ARM_GCC_VERSION = "10.1" +PV = "morello-${ARM_GCC_VERSION}" +CVE_VERSION = "10.1" + +# BINV should be incremented to a revision after a minor gcc release +BINV = "10.1.0" + +RELEASE = "morello-alp2" +PR = "r${RELEASE}" + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-morello-${ARM_GCC_VERSION}:${FILE_DIRNAME}/gcc-morello-${ARM_GCC_VERSION}/backport:" + +DEPENDS =+ "mpfr gmp libmpc zlib flex-native" +NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native" + +LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" + +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \ +" + +BASEURI ?= "https://developer.arm.com/-/media/Files/downloads/gnu-morello/${ARM_GCC_VER…" + +SRC_URI = "\ + ${BASEURI} \ + file://patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ + file://patches/0002-gcc-poison-system-directories.patch \ + file://patches/0004-64-bit-multilib-hack.patch \ + file://patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \ + file://patches/0009-cpp-honor-sysroot.patch \ + file://patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \ + file://patches/0012-gcc-Fix-argument-list-too-long-error.patch \ + file://patches/0014-libtool.patch \ + file://patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ + file://patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ + file://patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \ + file://patches/0018-export-CPP.patch \ + file://patches/0019-Ensure-target-gcc-headers-can-be-included.patch \ + file://patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch \ + file://patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch \ + file://patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch \ + file://patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch \ + file://patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch \ + file://patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \ + file://patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ + file://patches/0030-sync-gcc-stddef.h-with-musl.patch \ + file://patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ + file://patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ + file://patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch \ + file://patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch \ + file://patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch \ + file://patches/0001-Fix-install-path-of-linux64.h.patch \ +" +SRC_URI[sha256sum] = "d01995fd413d6062dbea0c6f0f3143c6e02219c58cd823f3fad8307f1627f653" + +S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/arm-gnu-toolchain-src-snapshot-${ARM_GCC_VERSION}.${RELEASE}" + +# Language Overrides +FORTRAN = "" +JAVA = "" + +SSP ?= "--disable-libssp" +SSP:mingw32 = "--enable-libssp" + +EXTRA_OECONF_BASE = "\ + ${SSP} \ + --enable-libitm \ + --enable-lto \ + --disable-bootstrap \ + --with-system-zlib \ + ${@'--with-linker-hash-style=${LINKER_HASH_STYLE}' if '${LINKER_HASH_STYLE}' else ''} \ + --enable-linker-build-id \ + --with-ppl=no \ + --with-cloog=no \ + --enable-checking=release \ + --enable-cheaders=c_global \ + --without-isl \ +" + +EXTRA_OECONF_INITIAL = "\ + --disable-libgomp \ + --disable-libitm \ + --disable-libquadmath \ + --with-system-zlib \ + --disable-lto \ + --disable-plugin \ + --enable-linker-build-id \ + --enable-decimal-float=no \ + --without-isl \ + --disable-libssp \ +" + +EXTRA_OECONF:append_aarchilp32 = " --with-abi=ilp32" + +EXTRA_OECONF_PATHS = "\ + --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ + --with-sysroot=/not/exist \ + --with-build-sysroot=${STAGING_DIR_TARGET} \ +" + +# Is a binutils 2.26 issue, not gcc +CVE_CHECK_IGNORE += "CVE-2021-37322" diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch new file mode 100644 index 0000000..5bf895d --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-Fix-install-path-of-linux64.h.patch @@ -0,0 +1,33 @@ +From 58211c7ceb0510b2a11a7f1da3c7fa968c658749 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei.gherzan(a)huawei.com> +Date: Wed, 22 Dec 2021 12:49:25 +0100 +Subject: [PATCH] Fix install path of linux64.h + +We add linux64.h to tm includes[1] as a relative path to B. This patch +adapts the install path of linux64.h to match the include in tm.h. + +[1] 0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch + +Signed-off-by: Andrei Gherzan <andrei.gherzan(a)huawei.com> + +Upstream-Status: Inappropriate [configuration] +--- + gcc/Makefile.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 9b17d120a..d175ec4e3 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -3693,6 +3693,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype + "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \ + | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \ + base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \ ++ */linux64.h ) \ ++ base=`dirname $$path`;;\ + *) base=`basename $$path` ;; \ + esac; \ + dest=$(plugin_includedir)/$$base; \ +-- +2.25.1 + diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch new file mode 100644 index 0000000..0a108ee --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch @@ -0,0 +1,39 @@ +From 368eaf1846733a9920c7cf5bc547a377e7167785 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 29 Mar 2013 08:37:11 +0400 +Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> + +Upstream-Status: Inappropriate [embedded specific] +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 504f6410274..bcebad264ec 100755 +--- a/configure ++++ b/configure +@@ -9728,7 +9728,7 @@ fi + # for target_alias and gcc doesn't manage it consistently. + target_configargs="--cache-file=./config.cache ${target_configargs}" + +-FLAGS_FOR_TARGET= ++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET" + case " $target_configdirs " in + *" newlib "*) + case " $target_configargs " in +diff --git a/configure.ac b/configure.ac +index 088e735c5db..1289fe08760 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3240,7 +3240,7 @@ fi + # for target_alias and gcc doesn't manage it consistently. + target_configargs="--cache-file=./config.cache ${target_configargs}" + +-FLAGS_FOR_TARGET= ++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET" + case " $target_configdirs " in + *" newlib "*) + case " $target_configargs " in diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch new file mode 100644 index 0000000..18a9fb8 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0002-gcc-poison-system-directories.patch @@ -0,0 +1,226 @@ +From 118c6f054711d437167ff125a88c9236bfc8099c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Mon, 8 Mar 2021 16:04:20 -0800 +Subject: [PATCH] gcc: poison-system-directories + +Add /sw/include and /opt/include based on the original +zecke-no-host-includes.patch patch. The original patch checked for +/usr/include, /sw/include and /opt/include and then triggered a failure and +aborted. + +Instead, we add the two missing items to the current scan. If the user +wants this to be a failure, they can add "-Werror=poison-system-directories". + +Upstream-Status: Pending +Signed-off-by: Mark Hatle <mark.hatle(a)windriver.com> +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + gcc/common.opt | 4 ++++ + gcc/config.in | 10 ++++++++++ + gcc/configure | 19 +++++++++++++++++++ + gcc/configure.ac | 16 ++++++++++++++++ + gcc/doc/invoke.texi | 9 +++++++++ + gcc/gcc.c | 9 +++++++-- + gcc/incpath.c | 21 +++++++++++++++++++++ + 7 files changed, 86 insertions(+), 2 deletions(-) + +diff --git a/gcc/common.opt b/gcc/common.opt +index c75dd36843e..49acbd6ed44 100644 +--- a/gcc/common.opt ++++ b/gcc/common.opt +@@ -683,6 +683,10 @@ Wreturn-local-addr + Common Var(warn_return_local_addr) Init(1) Warning + Warn about returning a pointer/reference to a local or temporary variable. + ++Wpoison-system-directories ++Common Var(flag_poison_system_directories) Init(1) Warning ++Warn for -I and -L options using system directories if cross compiling ++ + Wshadow + Common Var(warn_shadow) Warning + Warn when one variable shadows another. Same as -Wshadow=global. +diff --git a/gcc/config.in b/gcc/config.in +index 10a13cde586..8848284da41 100644 +--- a/gcc/config.in ++++ b/gcc/config.in +@@ -218,6 +218,16 @@ + #endif + + ++/* Define to warn for use of native system header directories */ ++#ifndef USED_FOR_TARGET ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++#endif ++/* Define to warn for use of native system header directories */ ++#ifndef USED_FOR_TARGET ++#undef POISON_BY_DEFAULT ++#endif ++ ++ + /* Define if you want all operations on RTL (the basic data structure of the + optimizer and back end) to be checked for dynamic type safety at runtime. + This is quite expensive. */ +diff --git a/gcc/configure b/gcc/configure +index 9bb436ce7bd..3f0734bff11 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -1020,6 +1020,7 @@ enable_maintainer_mode + enable_link_mutex + enable_link_serialization + enable_version_specific_runtime_libs ++enable_poison_system_directories + enable_plugin + enable_host_shared + enable_libquadmath_support +@@ -1782,6 +1783,8 @@ Optional Features: + --enable-version-specific-runtime-libs + specify that runtime libraries should be installed + in a compiler-specific directory ++ --enable-poison-system-directories ++ warn for use of native system header directories + --enable-plugin enable plugin support + --enable-host-shared build host code as shared libraries + --disable-libquadmath-support +@@ -31325,6 +31328,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" != "xno"; then ++ ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++if test "$enable_poison_system_directories" = "error"; then ++$as_echo "#define POISON_BY_DEFAULT 1" >>confdefs.h ++fi ++ ++fi ++ + # Substitute configuration variables + + +diff --git a/gcc/configure.ac b/gcc/configure.ac +index caa611933df..54e21764b3e 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -7123,6 +7123,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, + [specify that runtime libraries should be + installed in a compiler-specific directory])]) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system header directories (no/yes/error)]),, ++ [enable_poison_system_directories=no]) ++AC_MSG_NOTICE([poisoned directories $enable_poison_system_directories]) ++if test "x${enable_poison_system_directories}" != "xno"; then ++ AC_MSG_NOTICE([poisoned directories enabled]) ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system header directories]) ++ if test $enable_poison_system_directories = "error"; then ++ AC_MSG_NOTICE([poisoned directories are fatal]) ++ AC_DEFINE([POISON_BY_DEFAULT], [1], [Define to make poison warnings errors]) ++ fi ++fi ++ + # Substitute configuration variables + AC_SUBST(subdirs) + AC_SUBST(srcdir) +diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi +index 7a368959e5e..6659a903bf0 100644 +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}. + -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded @gol + -Wparentheses -Wno-pedantic-ms-format @gol + -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast @gol ++-Wno-poison-system-directories @gol + -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol + -Wrestrict -Wno-return-local-addr -Wreturn-type @gol + -Wno-scalar-storage-order -Wsequence-point @gol +@@ -7735,6 +7736,14 @@ made up of data only and thus requires no special treatment. But, for + most targets, it is made up of code and thus requires the stack to be + made executable in order for the program to work properly. + ++@item -Wno-poison-system-directories ++@opindex Wno-poison-system-directories ++Do not warn for @option{-I} or @option{-L} options using system ++directories such as @file{/usr/include} when cross compiling. This ++option is intended for use in chroot environments when such ++directories contain the correct headers and libraries for the target ++system rather than the host. ++ + @item -Wfloat-equal + @opindex Wfloat-equal + @opindex Wno-float-equal +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 7837553958b..19c75b6e20d 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -1152,6 +1152,8 @@ proper position among the other output files. */ + "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ + "%X %{o*} %{e*} %{N} %{n} %{r}\ + %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \ ++ %{Wno-poison-system-directories:--no-poison-system-directories} \ ++ %{Werror=poison-system-directories:--error-poison-system-directories} \ + %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \ + VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \ + %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ +@@ -1247,8 +1249,11 @@ static const char *cpp_unique_options = + static const char *cpp_options = + "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\ + %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\ +- %{!fno-working-directory:-fworking-directory}}} %{O*}\ +- %{undef} %{save-temps*:-fpch-preprocess}"; ++ %{!fno-working-directory:-fworking-directory}}} %{O*}" ++#ifdef POISON_BY_DEFAULT ++ " -Werror=poison-system-directories" ++#endif ++ " %{undef} %{save-temps*:-fpch-preprocess}"; + + /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al. + +diff --git a/gcc/incpath.c b/gcc/incpath.c +index 446d280321d..fbfc0ce03b8 100644 +--- a/gcc/incpath.c ++++ b/gcc/incpath.c +@@ -26,6 +26,7 @@ + #include "intl.h" + #include "incpath.h" + #include "cppdefault.h" ++#include "diagnostic-core.h" + + /* Microsoft Windows does not natively support inodes. + VMS has non-numeric inodes. */ +@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose) + } + fprintf (stderr, _("End of search list.\n")); + } ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (flag_poison_system_directories) ++ { ++ struct cpp_dir *p; ++ ++ for (p = heads[INC_QUOTE]; p; p = p->next) ++ { ++ if ((!strncmp (p->name, "/usr/include", 12)) ++ || (!strncmp (p->name, "/usr/local/include", 18)) ++ || (!strncmp (p->name, "/usr/X11R6/include", 18)) ++ || (!strncmp (p->name, "/sw/include", 11)) ++ || (!strncmp (p->name, "/opt/include", 12))) ++ warning (OPT_Wpoison_system_directories, ++ "include location \"%s\" is unsafe for " ++ "cross-compilation", ++ p->name); ++ } ++ } ++#endif + } + + /* Use given -I paths for #include "..." but not #include <...>, and diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch new file mode 100644 index 0000000..3566022 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0004-64-bit-multilib-hack.patch @@ -0,0 +1,140 @@ +From b87a3ac51df372128be2fda992238c5aab4a719a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 29 Mar 2013 09:10:06 +0400 +Subject: [PATCH] 64-bit multilib hack. + +GCC has internal multilib handling code but it assumes a very specific rigid directory +layout. The build system implementation of multilib layout is very generic and allows +complete customisation of the library directories. + +This patch is a partial solution to allow any custom directories to be passed into gcc +and handled correctly. It forces gcc to use the base_libdir (which is the current +directory, "."). We need to do this for each multilib that is configured as we don't +know which compiler options may be being passed into the compiler. Since we have a compiler +per mulitlib at this point that isn't an issue. + +The one problem is the target compiler is only going to work for the default multlilib at +this point. Ideally we'd figure out which multilibs were being enabled with which paths +and be able to patch these entries with a complete set of correct paths but this we +don't have such code at this point. This is something the target gcc recipe should do +and override these platform defaults in its build config. + +Do same for riscv64, aarch64 & arc + +RP 15/8/11 + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +Signed-off-by: Elvis Dowson <elvis.dowson(a)gmail.com> +Signed-off-by: Mark Hatle <mark.hatle(a)windriver.com> +--- + gcc/config/aarch64/t-aarch64-linux | 10 +++++----- + gcc/config/arc/t-multilib-linux | 4 ++-- + gcc/config/i386/t-linux64 | 6 ++---- + gcc/config/mips/t-linux64 | 9 ++------- + gcc/config/riscv/t-linux | 6 ++++-- + gcc/config/rs6000/t-linux64 | 5 ++--- + 6 files changed, 17 insertions(+), 23 deletions(-) + +diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux +index 5a074db5d..50b885691 100644 +--- a/gcc/config/aarch64/t-aarch64-linux ++++ b/gcc/config/aarch64/t-aarch64-linux +@@ -21,10 +21,10 @@ + LIB1ASMSRC = aarch64/lib1funcs.asm + LIB1ASMFUNCS = _aarch64_sync_cache_range + +-AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) +-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) +-MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) ++#AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) ++#MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) ++#MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) + +-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) ++#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) + +-MULTILIB_OSDIRNAMES += mabi.purecap/march.morello+c64=../lib64c$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_purecap) ++#MULTILIB_OSDIRNAMES += mabi.purecap/march.morello+c64=../lib64c$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_purecap) +diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux +index 344297deb..73984a962 100644 +--- a/gcc/config/arc/t-multilib-linux ++++ b/gcc/config/arc/t-multilib-linux +@@ -16,9 +16,9 @@ + # along with GCC; see the file COPYING3. If not see + # <http://www.gnu.org/licenses/>. + +-MULTILIB_OPTIONS = mcpu=hs/mcpu=archs/mcpu=hs38/mcpu=hs38_linux/mcpu=arc700/mcpu=nps400 ++#MULTILIB_OPTIONS = mcpu=hs/mcpu=archs/mcpu=hs38/mcpu=hs38_linux/mcpu=arc700/mcpu=nps400 + +-MULTILIB_DIRNAMES = hs archs hs38 hs38_linux arc700 nps400 ++#MULTILIB_DIRNAMES = hs archs hs38 hs38_linux arc700 nps400 + + # Aliases: + MULTILIB_MATCHES += mcpu?arc700=mA7 +diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 +index 1171e2185..fe0e7a7a0 100644 +--- a/gcc/config/i386/t-linux64 ++++ b/gcc/config/i386/t-linux64 +@@ -32,7 +32,5 @@ + # + comma=, + MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) +-MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) +-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) +-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) +-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) ++MULTILIB_DIRNAMES = . . ++MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) +\ No newline at end of file +diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 +index ceb58d3b5..c5ecc4173 100644 +--- a/gcc/config/mips/t-linux64 ++++ b/gcc/config/mips/t-linux64 +@@ -17,10 +17,5 @@ + # <http://www.gnu.org/licenses/>. + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 +-MULTILIB_DIRNAMES = n32 32 64 +-MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) +-MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) +-MULTILIB_OSDIRNAMES = \ +- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ +- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ +- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) ++MULTILIB_DIRNAMES = . . . ++MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) +diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux +index 216d2776a..388c0733f 100644 +--- a/gcc/config/riscv/t-linux ++++ b/gcc/config/riscv/t-linux +@@ -1,3 +1,5 @@ + # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/ +-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) +-MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) ++#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) ++MULTILIB_DIRNAMES := ++#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) ++MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) +\ No newline at end of file +diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 +index 264a7e275..054367af5 100644 +--- a/gcc/config/rs6000/t-linux64 ++++ b/gcc/config/rs6000/t-linux64 +@@ -26,10 +26,9 @@ + # MULTILIB_OSDIRNAMES according to what is found on the target. + + MULTILIB_OPTIONS := m64/m32 +-MULTILIB_DIRNAMES := 64 32 ++MULTILIB_DIRNAMES := + MULTILIB_EXTRA_OPTS := +-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) +-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) ++MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) + + rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c + $(COMPILE) $< +-- +2.34.1 + diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch new file mode 100644 index 0000000..98a1bb2 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0006-If-CXXFLAGS-contains-something-unsupported-by-the-bu.patch @@ -0,0 +1,63 @@ +From e700190743fa29ddaebd6ee075298a24b1688773 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie(a)linuxfoundation.org> +Date: Thu, 28 Oct 2021 11:33:40 +0100 +Subject: [PATCH 6/6] If CXXFLAGS contains something unsupported by the build + CXX, we see build failures (e.g. using -fmacro-prefix-map for the target). + +Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these errors. + +2021-10-28 Richard Purdie <richard.purdie(a)linuxfoundation.org> + +ChangeLog: + + * Makefile.in: Regenerate. + * Makefile.tpl: Add missing CXXFLAGS_FOR_BUILD overrides + +Signed-off-by: Richard Purdie <richard.purdie(a)linuxfoundation.org> +--- + Makefile.in | 2 ++ + Makefile.tpl | 2 ++ + 2 files changed, 4 insertions(+) + +Upstream-Status: Pending [should be submittable] + +Index: gcc-11.2.0/Makefile.in +=================================================================== +--- gcc-11.2.0.orig/Makefile.in ++++ gcc-11.2.0/Makefile.in +@@ -172,6 +172,7 @@ BUILD_EXPORTS = \ + # built for the build system to override those in BASE_FLAGS_TO_PASS. + EXTRA_BUILD_FLAGS = \ + CFLAGS="$(CFLAGS_FOR_BUILD)" \ ++ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)" + + # This is the list of directories to built for the host system. +@@ -203,6 +204,7 @@ HOST_EXPORTS = \ + CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ + CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ + CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ ++ CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \ + DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ + LD="$(LD)"; export LD; \ + LDFLAGS="$(STAGE1_LDFLAGS) $(LDFLAGS)"; export LDFLAGS; \ +Index: gcc-11.2.0/Makefile.tpl +=================================================================== +--- gcc-11.2.0.orig/Makefile.tpl ++++ gcc-11.2.0/Makefile.tpl +@@ -175,6 +175,7 @@ BUILD_EXPORTS = \ + # built for the build system to override those in BASE_FLAGS_TO_PASS. + EXTRA_BUILD_FLAGS = \ + CFLAGS="$(CFLAGS_FOR_BUILD)" \ ++ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)" + + # This is the list of directories to built for the host system. +@@ -206,6 +207,7 @@ HOST_EXPORTS = \ + CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ + CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ + CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ ++ CXXFLAGS_FOR_BUILD="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS_FOR_BUILD; \ + DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ + LD="$(LD)"; export LD; \ + LDFLAGS="$(STAGE1_LDFLAGS) $(LDFLAGS)"; export LDFLAGS; \ diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch new file mode 100644 index 0000000..9844c2a --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch @@ -0,0 +1,92 @@ +From e64342df647829d3e1c52fd480a5be7c1281ced0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 29 Mar 2013 09:17:25 +0400 +Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} + +Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that +the source can be shared between gcc-cross-initial, +gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build. + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> + +Upstream-Status: Pending + +While compiling gcc-crosssdk-initial-x86_64 on some host, there is +occasionally failure that test the existance of default.h doesn't +work, the reason is tm_include_list='** defaults.h' rather than +tm_include_list='** ./defaults.h' + +So we add the test condition for this situation. +Signed-off-by: Hongxu Jia <hongxu.jia(a)windriver.com> +--- + gcc/Makefile.in | 2 +- + gcc/configure | 4 ++-- + gcc/configure.ac | 4 ++-- + gcc/mkconfig.sh | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 8a5fb3fd99c..7da6f439fff 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -552,7 +552,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ + TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ + + xmake_file=@xmake_file@ +-tmake_file=@tmake_file@ ++tmake_file=@tmake_file@ ./t-oe + TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@ + TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ + TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ +diff --git a/gcc/configure b/gcc/configure +index 3f0734bff11..c5d3bc4ee2d 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -13090,8 +13090,8 @@ for f in $tm_file; do + tm_include_list="${tm_include_list} $f" + ;; + defaults.h ) +- tm_file_list="${tm_file_list} \$(srcdir)/$f" +- tm_include_list="${tm_include_list} $f" ++ tm_file_list="${tm_file_list} ./$f" ++ tm_include_list="${tm_include_list} ./$f" + ;; + * ) + tm_file_list="${tm_file_list} \$(srcdir)/config/$f" +diff --git a/gcc/configure.ac b/gcc/configure.ac +index 54e21764b3e..f83420326d6 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -2263,8 +2263,8 @@ for f in $tm_file; do + tm_include_list="${tm_include_list} $f" + ;; + defaults.h ) +- tm_file_list="${tm_file_list} \$(srcdir)/$f" +- tm_include_list="${tm_include_list} $f" ++ tm_file_list="${tm_file_list} ./$f" ++ tm_include_list="${tm_include_list} ./$f" + ;; + * ) + tm_file_list="${tm_file_list} \$(srcdir)/config/$f" +diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh +index c49acd8f7e4..a0a657bdbb9 100644 +--- a/gcc/mkconfig.sh ++++ b/gcc/mkconfig.sh +@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then + if [ $# -ge 1 ]; then + echo '#ifdef IN_GCC' >> ${output}T + for file in "$@"; do +- if test x"$file" = x"defaults.h"; then ++ if test x"$file" = x"./defaults.h" -o x"$file" = x"defaults.h"; then + postpone_defaults_h="yes" + else + echo "# include \"$file\"" >> ${output}T +@@ -106,7 +106,7 @@ esac + + # If we postponed including defaults.h, add the #include now. + if test x"$postpone_defaults_h" = x"yes"; then +- echo "# include \"defaults.h\"" >> ${output}T ++ echo "# include \"./defaults.h\"" >> ${output}T + fi + + # Add multiple inclusion protection guard, part two. diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch new file mode 100644 index 0000000..2f24149 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0009-cpp-honor-sysroot.patch @@ -0,0 +1,54 @@ +From e6a820a19c4cd115d8af7c235c5f9700c7a24730 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 29 Mar 2013 09:22:00 +0400 +Subject: [PATCH] cpp: honor sysroot. + +Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile +preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location +rather than the --sysroot option specified on the commandline. If access to that directory is +permission denied (unreadable), gcc will error. + +This happens when ccache is in use due to the fact it uses preprocessed source files. + +The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix, +-isystem, -isysroot happen and the correct sysroot is used. + +[YOCTO #2074] + +RP 2012/04/13 + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> + +Upstream-Status: Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582725.html] +--- + gcc/cp/lang-specs.h | 2 +- + gcc/gcc.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h +index 0ad4a33b9..16c744f4f 100644 +--- a/gcc/cp/lang-specs.h ++++ b/gcc/cp/lang-specs.h +@@ -66,5 +66,5 @@ along with GCC; see the file COPYING3. If not see + {".ii", "@c++-cpp-output", 0, 0, 0}, + {"@c++-cpp-output", + "%{!E:%{!M:%{!MM:" +- " cc1plus -fpreprocessed %i %(cc1_options) %2" ++ " cc1plus -fpreprocessed %i %I %(cc1_options) %2" + " %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, +diff --git a/gcc/gcc.c b/gcc/gcc.c +index a38d684f3..d281eaeb4 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -1389,7 +1389,7 @@ static const struct compiler default_compilers[] = + %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0}, + {".i", "@cpp-output", 0, 0, 0}, + {"@cpp-output", +- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ++ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + {".s", "@assembler", 0, 0, 0}, + {"@assembler", + "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0}, +-- +2.34.1 + diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch new file mode 100644 index 0000000..e28e5a7 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch @@ -0,0 +1,62 @@ +From 84dd8ea4c982fc2c82af642293d29e9c1880de5b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 29 Mar 2013 09:24:50 +0400 +Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER + relative to SYSTEMLIBS_DIR + +This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER +relative to SYSTEMLIBS_DIR which can be set in generated headers +This breaks the assumption of hardcoded multilib in gcc +Change is only for the supported architectures in OE including +SH, sparc, alpha for possible future support (if any) + +Removes the do_headerfix task in metadata + +Upstream-Status: Inappropriate [OE configuration] +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + gcc/config/aarch64/aarch64-linux.h | 8 ++++---- + gcc/config/i386/linux64.h | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h +index 5e84fdb0e..7ddc8b1fc 100644 +--- a/gcc/config/aarch64/aarch64-linux.h ++++ b/gcc/config/aarch64/aarch64-linux.h +@@ -21,12 +21,12 @@ + #ifndef GCC_AARCH64_LINUX_H + #define GCC_AARCH64_LINUX_H + +-#define GLIBC_DYNAMIC_LINKER \ +- "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}%{mabi=purecap:_purecap}.so.1" ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR \ ++ "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}%{mabi=purecap:_purecap}.so.1" + + #undef MUSL_DYNAMIC_LINKER +-#define MUSL_DYNAMIC_LINKER \ +- "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}%{mabi=purecap:_purecap}.so.1" ++#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR \ ++ "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}%{mabi=purecap:_purecap}.so.1" + + #undef ASAN_CC1_SPEC + #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" +diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h +index 6cb68d1cc..7de09ec85 100644 +--- a/gcc/config/i386/linux64.h ++++ b/gcc/config/i386/linux64.h +@@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #define GNU_USER_LINK_EMULATION64 "elf_x86_64" + #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" +-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" ++#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" + + #undef MUSL_DYNAMIC_LINKER32 + #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" +-- +2.34.1 + diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch new file mode 100644 index 0000000..ebee30b --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0012-gcc-Fix-argument-list-too-long-error.patch @@ -0,0 +1,38 @@ +From: Richard Purdie <richard.purdie(a)linuxfoundation.org> +Subject: [PATCH 2/5] gcc: Fix "argument list too long" from install-plugins + +When building in longer build paths (200+ characters), the +"echo $(PLUGIN_HEADERS)" from the install-plugins target would cause an +"argument list too long error" on some systems. + +Avoid this by calling make's sort function on the list which removes +duplicates and stops the overflow from reaching the echo command. +The original sort is left to handle the the .h and .def files. + +2021-10-26 Richard Purdie <richard.purdie(a)linuxfoundation.org> + +gcc/ChangeLog: + + * Makefile.in: Fix "argument list too long" from install-plugins + +Signed-off-by: Richard Purdie <richard.purdie(a)linuxfoundation.org> + +Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582722.html] +Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=66e157188bd2f789809e17e85f917…] +--- + gcc/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gcc-11.2.0/gcc/Makefile.in +=================================================================== +--- gcc-11.2.0.orig/gcc/Makefile.in ++++ gcc-11.2.0/gcc/Makefile.in +@@ -3678,7 +3678,7 @@ install-plugin: installdirs lang.install + # We keep the directory structure for files in config, common/config or + # c-family and .def files. All other files are flattened to a single directory. + $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) +- headers=`echo $(PLUGIN_HEADERS) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \ ++ headers=`echo $(sort $(PLUGIN_HEADERS)) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \ + for file in $$headers; do \ + if [ -f $$file ] ; then \ diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0014-libtool.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0014-libtool.patch new file mode 100644 index 0000000..f2b8924 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0014-libtool.patch @@ -0,0 +1,39 @@ +From a5b984db9669cf38a7bd76c3fcdb41c086f740db Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 29 Mar 2013 09:29:11 +0400 +Subject: [PATCH] libtool + +libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64 +when running on am x86_64 build host. + +This patch stops this speading to libdir in the libstdc++.la file within libtool. +Arguably, it shouldn't be passing this into libtool in the first place but +for now this resolves the nastiest problems this causes. + +func_normal_abspath would resolve an empty path to `pwd` so we need +to filter the zero case. + +RP 2012/8/24 + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> + +Upstream-Status: Pending +--- + ltmain.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ltmain.sh b/ltmain.sh +index 70990740b6c..ee938056bef 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -6359,6 +6359,10 @@ func_mode_link () + func_warning "ignoring multiple \`-rpath's for a libtool library" + + install_libdir="$1" ++ if test -n "$install_libdir"; then ++ func_normal_abspath "$install_libdir" ++ install_libdir=$func_normal_abspath_result ++ fi + + oldlibs= + if test -z "$rpath"; then diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch new file mode 100644 index 0000000..1ccf39c --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch @@ -0,0 +1,40 @@ +From 0ae7090dec149cb2ff0c87eef87c043d4000ece1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 29 Mar 2013 09:30:32 +0400 +Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI. + +The LINK_SPEC for linux gets overwritten by linux-eabi.h which +means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result +the option is not passed to linker when chosing march=armv4 +This patch redefines this in linux-eabi.h and reinserts it +for eabi defaulting toolchains. + +We might want to send it upstream. + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> + +Upstream-Status: Pending +--- + gcc/config/arm/linux-eabi.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h +index 6bd95855827..77befab5da8 100644 +--- a/gcc/config/arm/linux-eabi.h ++++ b/gcc/config/arm/linux-eabi.h +@@ -91,10 +91,14 @@ + #define MUSL_DYNAMIC_LINKER \ + "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1" + ++/* For armv4 we pass --fix-v4bx to linker to support EABI */ ++#undef TARGET_FIX_V4BX_SPEC ++#define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}" ++ + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ + #undef LINK_SPEC +-#define LINK_SPEC EABI_LINK_SPEC \ ++#define LINK_SPEC TARGET_FIX_V4BX_SPEC EABI_LINK_SPEC \ + LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC, \ + LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) + diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch new file mode 100644 index 0000000..bde7ec6 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch @@ -0,0 +1,99 @@ +From 5ce8aa4615a3816d12c43752323154744517ae9f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 29 Mar 2013 09:33:04 +0400 +Subject: [PATCH] Use the multilib config files from ${B} instead of using the + ones from ${S} + +Use the multilib config files from ${B} instead of using the ones from ${S} +so that the source can be shared between gcc-cross-initial, +gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build. + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +Signed-off-by: Constantin Musca <constantinx.musca(a)intel.com> + +Upstream-Status: Inappropriate [configuration] +--- + gcc/configure | 22 ++++++++++++++++++---- + gcc/configure.ac | 22 ++++++++++++++++++---- + 2 files changed, 36 insertions(+), 8 deletions(-) + +diff --git a/gcc/configure b/gcc/configure +index 5160917d73e..e663052cad2 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -13070,10 +13070,20 @@ done + tmake_file_= + for f in ${tmake_file} + do +- if test -f ${srcdir}/config/$f +- then +- tmake_file_="${tmake_file_} \$(srcdir)/config/$f" +- fi ++ case $f in ++ */t-linux64 ) ++ if test -f ./config/$f ++ then ++ tmake_file_="${tmake_file_} ./config/$f" ++ fi ++ ;; ++ * ) ++ if test -f ${srcdir}/config/$f ++ then ++ tmake_file_="${tmake_file_} \$(srcdir)/config/$f" ++ fi ++ ;; ++ esac + done + tmake_file="${tmake_file_}${omp_device_property_tmake_file}" + +@@ -13084,6 +13094,10 @@ tm_file_list="options.h" + tm_include_list="options.h insn-constants.h" + for f in $tm_file; do + case $f in ++ */linux64.h ) ++ tm_file_list="${tm_file_list} ./config/$f" ++ tm_include_list="${tm_include_list} ./config/$f" ++ ;; + ./* ) + f=`echo $f | sed 's/^..//'` + tm_file_list="${tm_file_list} $f" +diff --git a/gcc/configure.ac b/gcc/configure.ac +index 50f78308e8a..2b84875b028 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -2243,10 +2243,20 @@ done + tmake_file_= + for f in ${tmake_file} + do +- if test -f ${srcdir}/config/$f +- then +- tmake_file_="${tmake_file_} \$(srcdir)/config/$f" +- fi ++ case $f in ++ */t-linux64 ) ++ if test -f ./config/$f ++ then ++ tmake_file_="${tmake_file_} ./config/$f" ++ fi ++ ;; ++ * ) ++ if test -f ${srcdir}/config/$f ++ then ++ tmake_file_="${tmake_file_} \$(srcdir)/config/$f" ++ fi ++ ;; ++ esac + done + tmake_file="${tmake_file_}${omp_device_property_tmake_file}" + +@@ -2257,6 +2267,10 @@ tm_file_list="options.h" + tm_include_list="options.h insn-constants.h" + for f in $tm_file; do + case $f in ++ */linux64.h ) ++ tm_file_list="${tm_file_list} ./config/$f" ++ tm_include_list="${tm_include_list} ./config/$f" ++ ;; + ./* ) + f=`echo $f | sed 's/^..//'` + tm_file_list="${tm_file_list} $f" diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch new file mode 100644 index 0000000..3e0a1b4 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch @@ -0,0 +1,28 @@ +From 75a1ce0265ca123f74f17a40ad8bd8f26d9c2ab3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 20 Feb 2015 09:39:38 +0000 +Subject: [PATCH] Avoid using libdir from .la which usually points to a host + path + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Jonathan Liu <net147(a)gmail.com> +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + ltmain.sh | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/ltmain.sh b/ltmain.sh +index ee938056bef..9ebc7e3d1e0 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5628,6 +5628,9 @@ func_mode_link () + absdir="$abs_ladir" + libdir="$abs_ladir" + else ++ # Instead of using libdir from .la which usually points to a host path, ++ # use the path the .la is contained in. ++ libdir="$abs_ladir" + dir="$libdir" + absdir="$libdir" + fi diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch new file mode 100644 index 0000000..86ab657 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0018-export-CPP.patch @@ -0,0 +1,199 @@ +From: Richard Purdie <richard.purdie(a)linuxfoundation.org> +Subject: [PATCH 1/5] Makefile.in: Ensure build CPP/CPPFLAGS is used for build targets + +During cross compiling, CPP is being set to the target compiler even for +build targets. As an example, when building a cross compiler targetting +mingw, the config.log for libiberty in +build.x86_64-pokysdk-mingw32.i586-poky-linux/build-x86_64-linux/libiberty/config.log +shows: + +configure:3786: checking how to run the C preprocessor +configure:3856: result: x86_64-pokysdk-mingw32-gcc -E --sysroot=[sysroot]/x86_64-nativesdk-mingw32-pokysdk-mingw32 +configure:3876: x86_64-pokysdk-mingw32-gcc -E --sysroot=[sysroot]/x86_64-nativesdk-mingw32-pokysdk-mingw32 conftest.c +configure:3876: $? = 0 + +This is libiberty being built for the build environment, not the target one +(i.e. in build-x86_64-linux). As such it should be using the build environment's +gcc and not the target one. In the mingw case the system headers are quite +different leading to build failures related to not being able to include a +process.h file for pem-unix.c. + +Further analysis shows the same issue occuring for CPPFLAGS too. + +Fix this by adding support for CPP_FOR_BUILD and CPPFLAGS_FOR_BUILD which +for example, avoids mixing the mingw headers for host binaries on linux +systems. + +2021-10-27 Richard Purdie <richard.purdie(a)linuxfoundation.org> + +ChangeLog: + + * Makefile.tpl: Add CPP_FOR_BUILD and CPPFLAGS_FOR_BUILD support + * Makefile.in: Regenerate. + * configure: Regenerate. + * configure.ac: Add CPP_FOR_BUILD and CPPFLAGS_FOR_BUILD support + +gcc/ChangeLog: + + * configure: Regenerate. + * configure.ac: Use CPPFLAGS_FOR_BUILD for GMPINC + +Signed-off-by: Richard Purdie <richard.purdie(a)linuxfoundation.org> + +Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582727.html] +Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=84401ce5fb4ecab55decb472b…] +--- + Makefile.in | 6 ++++++ + Makefile.tpl | 6 ++++++ + configure | 4 ++++ + configure.ac | 4 ++++ + gcc/configure | 2 +- + gcc/configure.ac | 2 +- + 6 files changed, 22 insertions(+), 2 deletions(-) + +Index: gcc-11.2.0/Makefile.in +=================================================================== +--- gcc-11.2.0.orig/Makefile.in ++++ gcc-11.2.0/Makefile.in +@@ -151,6 +151,8 @@ BUILD_EXPORTS = \ + CC="$(CC_FOR_BUILD)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ ++ CPP="$(CPP_FOR_BUILD)"; export CPP; \ ++ CPPFLAGS="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \ + CXX="$(CXX_FOR_BUILD)"; export CXX; \ + CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ + GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \ +@@ -198,6 +200,8 @@ HOST_EXPORTS = \ + AR="$(AR)"; export AR; \ + AS="$(AS)"; export AS; \ + CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ ++ CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ ++ CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ + CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ + DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ + LD="$(LD)"; export LD; \ +@@ -353,6 +357,8 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ + AS_FOR_BUILD = @AS_FOR_BUILD@ + CC_FOR_BUILD = @CC_FOR_BUILD@ + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ ++CPP_FOR_BUILD = @CPP_FOR_BUILD@ ++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ + CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ + CXX_FOR_BUILD = @CXX_FOR_BUILD@ + DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ +Index: gcc-11.2.0/Makefile.tpl +=================================================================== +--- gcc-11.2.0.orig/Makefile.tpl ++++ gcc-11.2.0/Makefile.tpl +@@ -154,6 +154,8 @@ BUILD_EXPORTS = \ + CC="$(CC_FOR_BUILD)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ ++ CPP="$(CPP_FOR_BUILD)"; export CPP; \ ++ CPPFLAGS="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \ + CXX="$(CXX_FOR_BUILD)"; export CXX; \ + CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ + GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \ +@@ -201,6 +203,8 @@ HOST_EXPORTS = \ + AR="$(AR)"; export AR; \ + AS="$(AS)"; export AS; \ + CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ ++ CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ ++ CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ + CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ + DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ + LD="$(LD)"; export LD; \ +@@ -356,6 +360,8 @@ AR_FOR_BUILD = @AR_FOR_BUILD@ + AS_FOR_BUILD = @AS_FOR_BUILD@ + CC_FOR_BUILD = @CC_FOR_BUILD@ + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ ++CPP_FOR_BUILD = @CPP_FOR_BUILD@ ++CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ + CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ + CXX_FOR_BUILD = @CXX_FOR_BUILD@ + DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ +Index: gcc-11.2.0/configure +=================================================================== +--- gcc-11.2.0.orig/configure ++++ gcc-11.2.0/configure +@@ -652,6 +652,8 @@ GFORTRAN_FOR_BUILD + DLLTOOL_FOR_BUILD + CXX_FOR_BUILD + CXXFLAGS_FOR_BUILD ++CPPFLAGS_FOR_BUILD ++CPP_FOR_BUILD + CFLAGS_FOR_BUILD + CC_FOR_BUILD + AS_FOR_BUILD +@@ -4092,6 +4094,7 @@ if test "${build}" != "${host}" ; then + AR_FOR_BUILD=${AR_FOR_BUILD-ar} + AS_FOR_BUILD=${AS_FOR_BUILD-as} + CC_FOR_BUILD=${CC_FOR_BUILD-gcc} ++ CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CPP)}" + CXX_FOR_BUILD=${CXX_FOR_BUILD-g++} + GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran} + GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo} +@@ -9809,6 +9812,7 @@ esac + # our build compiler if desired. + if test x"${build}" = x"${host}" ; then + CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} ++ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}} + CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} + LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} + fi +Index: gcc-11.2.0/configure.ac +=================================================================== +--- gcc-11.2.0.orig/configure.ac ++++ gcc-11.2.0/configure.ac +@@ -1347,6 +1347,7 @@ if test "${build}" != "${host}" ; then + AR_FOR_BUILD=${AR_FOR_BUILD-ar} + AS_FOR_BUILD=${AS_FOR_BUILD-as} + CC_FOR_BUILD=${CC_FOR_BUILD-gcc} ++ CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CPP)}" + CXX_FOR_BUILD=${CXX_FOR_BUILD-g++} + GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran} + GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo} +@@ -3321,6 +3322,7 @@ esac + # our build compiler if desired. + if test x"${build}" = x"${host}" ; then + CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} ++ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}} + CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} + LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} + fi +@@ -3387,6 +3389,8 @@ AC_SUBST(AR_FOR_BUILD) + AC_SUBST(AS_FOR_BUILD) + AC_SUBST(CC_FOR_BUILD) + AC_SUBST(CFLAGS_FOR_BUILD) ++AC_SUBST(CPP_FOR_BUILD) ++AC_SUBST(CPPFLAGS_FOR_BUILD) + AC_SUBST(CXXFLAGS_FOR_BUILD) + AC_SUBST(CXX_FOR_BUILD) + AC_SUBST(DLLTOOL_FOR_BUILD) +Index: gcc-11.2.0/gcc/configure +=================================================================== +--- gcc-11.2.0.orig/gcc/configure ++++ gcc-11.2.0/gcc/configure +@@ -12699,7 +12699,7 @@ else + CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ + CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ + LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ +- GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \ ++ GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \ + ${realsrcdir}/configure \ + --enable-languages=${enable_languages-all} \ + ${enable_obsolete+--enable-obsolete="$enable_obsolete"} \ +Index: gcc-11.2.0/gcc/configure.ac +=================================================================== +--- gcc-11.2.0.orig/gcc/configure.ac ++++ gcc-11.2.0/gcc/configure.ac +@@ -2023,7 +2023,7 @@ else + CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ + CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ + LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ +- GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \ ++ GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \ + ${realsrcdir}/configure \ + --enable-languages=${enable_languages-all} \ + ${enable_obsolete+--enable-obsolete="$enable_obsolete"} \ diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch new file mode 100644 index 0000000..120d5a2 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0019-Ensure-target-gcc-headers-can-be-included.patch @@ -0,0 +1,113 @@ +From 6f410ed8fb7eee11ba7a25634c2257666b98ef52 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 20 Feb 2015 10:25:11 +0000 +Subject: [PATCH] Ensure target gcc headers can be included + +There are a few headers installed as part of the OpenEmbedded +gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe +built for the target architecture, these are within the target +sysroot and not cross/nativesdk; thus they weren't able to be +found by gcc with the existing search paths. Add support for +picking up these headers under the sysroot supplied on the gcc +command line in order to resolve this. + +Extend target gcc headers search to musl too + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton(a)linux.intel.com> +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + gcc/Makefile.in | 2 ++ + gcc/config/linux.h | 8 ++++++++ + gcc/config/rs6000/sysv4.h | 8 ++++++++ + gcc/cppdefault.c | 4 ++++ + 4 files changed, 22 insertions(+) + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 59c45c81393..9b17d120aa1 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -630,6 +630,7 @@ libexecdir = @libexecdir@ + + # Directory in which the compiler finds libraries etc. + libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) ++libsubdir_target = $(target_noncanonical)/$(version) + # Directory in which the compiler finds executables + libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) + # Directory in which all plugin resources are installed +@@ -3016,6 +3017,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" + + PREPROCESSOR_DEFINES = \ + -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ ++ -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ + -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ +diff --git a/gcc/config/linux.h b/gcc/config/linux.h +index 87efc5f69fe..b525bcd56b3 100644 +--- a/gcc/config/linux.h ++++ b/gcc/config/linux.h +@@ -165,6 +165,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #define INCLUDE_DEFAULTS_MUSL_TOOL + #endif + ++#ifdef GCC_INCLUDE_SUBDIR_TARGET ++#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ ++ { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET ++#endif ++ + #ifdef NATIVE_SYSTEM_HEADER_DIR + #define INCLUDE_DEFAULTS_MUSL_NATIVE \ + { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ +@@ -191,6 +198,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + INCLUDE_DEFAULTS_MUSL_PREFIX \ + INCLUDE_DEFAULTS_MUSL_CROSS \ + INCLUDE_DEFAULTS_MUSL_TOOL \ ++ INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ + INCLUDE_DEFAULTS_MUSL_NATIVE \ + { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ + { 0, 0, 0, 0, 0, 0 } \ +diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h +index 510abe169c5..0c2bba5ea32 100644 +--- a/gcc/config/rs6000/sysv4.h ++++ b/gcc/config/rs6000/sysv4.h +@@ -995,6 +995,13 @@ ncrtn.o%s" + #define INCLUDE_DEFAULTS_MUSL_TOOL + #endif + ++#ifdef GCC_INCLUDE_SUBDIR_TARGET ++#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ ++ { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET ++#endif ++ + #ifdef NATIVE_SYSTEM_HEADER_DIR + #define INCLUDE_DEFAULTS_MUSL_NATIVE \ + { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ +@@ -1021,6 +1028,7 @@ ncrtn.o%s" + INCLUDE_DEFAULTS_MUSL_PREFIX \ + INCLUDE_DEFAULTS_MUSL_CROSS \ + INCLUDE_DEFAULTS_MUSL_TOOL \ ++ INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ + INCLUDE_DEFAULTS_MUSL_NATIVE \ + { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ + { 0, 0, 0, 0, 0, 0 } \ +diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c +index c503d14fc3f..d54d6ce0076 100644 +--- a/gcc/cppdefault.c ++++ b/gcc/cppdefault.c +@@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[] + /* This is the dir for gcc's private headers. */ + { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, + #endif ++#ifdef GCC_INCLUDE_SUBDIR_TARGET ++ /* This is the dir for gcc's private headers under the specified sysroot. */ ++ { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, ++#endif + #ifdef LOCAL_INCLUDE_DIR + /* /usr/local/include comes before the fixincluded header files. */ + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch new file mode 100644 index 0000000..bb2a367 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch @@ -0,0 +1,35 @@ +From cd09adb1e7f2a7e81a9f595a17c36f24911b90ac Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Tue, 3 Mar 2015 08:21:19 +0000 +Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix + is provided + +http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html + +Upstream-Status: Submitted + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + ltmain.sh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 9ebc7e3d1e0..7ea79fa8be6 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -6004,12 +6004,13 @@ func_mode_link () + fi + else + # We cannot seem to hardcode it, guess we'll fake it. ++ # Default if $libdir is not relative to the prefix: + add_dir="-L$libdir" +- # Try looking first in the location we're being installed to. ++ + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ add_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch new file mode 100644 index 0000000..fb4511c --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch @@ -0,0 +1,51 @@ +From 2cfc5ee38b3f5ec1d7965aae0991bcd48b5dc2e6 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang(a)windriver.com> +Date: Sun, 5 Jul 2015 20:25:18 -0700 +Subject: [PATCH] libcc1: fix libcc1's install path and rpath + +* Install libcc1.so and libcc1plugin.so into + $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we + had done to lto-plugin. +* Fix bad RPATH iussue: + gcc-5.2.0: package gcc-plugins contains bad RPATH /patht/to/tmp/sysroots/qemux86-64/usr/lib64/../lib64 in file + /path/to/gcc/5.2.0-r0/packages-split/gcc-plugins/usr/lib64/gcc/x86_64-poky-linux/5.2.0/plugin/libcc1plugin.so.0.0.0 + [rpaths] + +Upstream-Status: Inappropriate [OE configuration] + +Signed-off-by: Robert Yang <liezhi.yang(a)windriver.com> +--- + libcc1/Makefile.am | 4 ++-- + libcc1/Makefile.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am +index f148fdd7aa2..0b6eb8f2855 100644 +--- a/libcc1/Makefile.am ++++ b/libcc1/Makefile.am +@@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ + $(Wc)$(libiberty_normal))) + libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) + +-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin +-cc1libdir = $(libdir)/$(libsuffix) ++cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) ++plugindir = $(cc1libdir) + + if ENABLE_PLUGIN + plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la +diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in +index 753d435c9cb..455627b0a3b 100644 +--- a/libcc1/Makefile.in ++++ b/libcc1/Makefile.in +@@ -398,8 +398,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ + $(Wc)$(libiberty_normal))) + + libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) +-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin +-cc1libdir = $(libdir)/$(libsuffix) ++cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) ++plugindir = $(cc1libdir) + @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la + @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la + shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch new file mode 100644 index 0000000..b1054fa --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0024-handle-sysroot-support-for-nativesdk-gcc.patch @@ -0,0 +1,510 @@ +From 354682ad8f71f62643dcd83f64b51b5979615a0c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Mon, 7 Dec 2015 23:39:54 +0000 +Subject: [PATCH] handle sysroot support for nativesdk-gcc + +Being able to build a nativesdk gcc is useful, particularly in cases +where the host compiler may be of an incompatible version (or a 32 +bit compiler is needed). + +Sadly, building nativesdk-gcc is not straight forward. We install +nativesdk-gcc into a relocatable location and this means that its +library locations can change. "Normal" sysroot support doesn't help +in this case since the values of paths like "libdir" change, not just +base root directory of the system. + +In order to handle this we do two things: + +a) Add %r into spec file markup which can be used for injected paths + such as SYSTEMLIBS_DIR (see gcc_multilib_setup()). +b) Add other paths which need relocation into a .gccrelocprefix section + which the relocation code will notice and adjust automatically. + +Upstream-Status: Inappropriate +RP 2015/7/28 + +Extend the gccrelocprefix support to musl config too, this ensures +that gcc will get right bits in SDK installations + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> + +Added PREFIXVAR and EXEC_PREFIXVAR to support runtime relocation. Without +these as part of the gccrelocprefix the system can't do runtime relocation +if the executable is moved. (These paths were missed in the original +implementation.) + +Signed-off-by: Mark Hatle <mark.hatle(a)kernel.crashing.org> +--- + gcc/c-family/c-opts.c | 4 +-- + gcc/config/linux.h | 24 +++++++-------- + gcc/config/rs6000/sysv4.h | 24 +++++++-------- + gcc/cppdefault.c | 63 ++++++++++++++++++++++++--------------- + gcc/cppdefault.h | 13 ++++---- + gcc/gcc.c | 20 +++++++++---- + gcc/incpath.c | 12 ++++---- + gcc/prefix.c | 6 ++-- + 8 files changed, 94 insertions(+), 72 deletions(-) + +diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c +index 89e05a4c551..5577383665d 100644 +--- a/gcc/c-family/c-opts.c ++++ b/gcc/c-family/c-opts.c +@@ -1436,8 +1436,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) + size_t prefix_len, suffix_len; + + suffix_len = strlen (suffix); +- prefix = iprefix ? iprefix : cpp_GCC_INCLUDE_DIR; +- prefix_len = iprefix ? strlen (iprefix) : cpp_GCC_INCLUDE_DIR_len; ++ prefix = iprefix ? iprefix : GCC_INCLUDE_DIRVAR; ++ prefix_len = iprefix ? strlen (iprefix) : strlen(GCC_INCLUDE_DIRVAR) - 7; + + path = (char *) xmalloc (prefix_len + suffix_len + 1); + memcpy (path, prefix, prefix_len); +diff --git a/gcc/config/linux.h b/gcc/config/linux.h +index b525bcd56b3..ba02c013e30 100644 +--- a/gcc/config/linux.h ++++ b/gcc/config/linux.h +@@ -129,53 +129,53 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + * Unfortunately, this is mostly duplicated from cppdefault.c */ + #if DEFAULT_LIBC == LIBC_MUSL + #define INCLUDE_DEFAULTS_MUSL_GPP \ +- { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ ++ { GPLUSPLUS_INCLUDE_DIRVAR, "G++", 1, 1, \ + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ +- { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ ++ { GPLUSPLUS_TOOL_INCLUDE_DIRVAR, "G++", 1, 1, \ + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ +- { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1, \ + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, + + #ifdef LOCAL_INCLUDE_DIR + #define INCLUDE_DEFAULTS_MUSL_LOCAL \ +- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ +- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, ++ { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 2 }, \ ++ { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 0 }, + #else + #define INCLUDE_DEFAULTS_MUSL_LOCAL + #endif + + #ifdef PREFIX_INCLUDE_DIR + #define INCLUDE_DEFAULTS_MUSL_PREFIX \ +- { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, ++ { PREFIX_INCLUDE_DIRVAR, 0, 0, 1, 0, 0}, + #else + #define INCLUDE_DEFAULTS_MUSL_PREFIX + #endif + + #ifdef CROSS_INCLUDE_DIR + #define INCLUDE_DEFAULTS_MUSL_CROSS \ +- { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, ++ { CROSS_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0}, + #else + #define INCLUDE_DEFAULTS_MUSL_CROSS + #endif + + #ifdef TOOL_INCLUDE_DIR + #define INCLUDE_DEFAULTS_MUSL_TOOL \ +- { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, ++ { TOOL_INCLUDE_DIRVAR, "BINUTILS", 0, 1, 0, 0}, + #else + #define INCLUDE_DEFAULTS_MUSL_TOOL + #endif + + #ifdef GCC_INCLUDE_SUBDIR_TARGET + #define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ +- { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0}, ++ { STANDARD_STARTFILE_PREFIX_2VAR, "GCC", 0, 0, 1, 0}, + #else + #define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET + #endif + + #ifdef NATIVE_SYSTEM_HEADER_DIR + #define INCLUDE_DEFAULTS_MUSL_NATIVE \ +- { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ +- { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, ++ { NATIVE_SYSTEM_HEADER_DIRVAR, 0, 0, 0, 1, 2 }, \ ++ { NATIVE_SYSTEM_HEADER_DIRVAR, 0, 0, 0, 1, 0 }, + #else + #define INCLUDE_DEFAULTS_MUSL_NATIVE + #endif +@@ -200,7 +200,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + INCLUDE_DEFAULTS_MUSL_TOOL \ + INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ + INCLUDE_DEFAULTS_MUSL_NATIVE \ +- { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ ++ { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 }, \ + { 0, 0, 0, 0, 0, 0 } \ + } + #endif +diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h +index 0c2bba5ea32..313a8de4417 100644 +--- a/gcc/config/rs6000/sysv4.h ++++ b/gcc/config/rs6000/sysv4.h +@@ -959,53 +959,53 @@ ncrtn.o%s" + /* Include order changes for musl, same as in generic linux.h. */ + #if DEFAULT_LIBC == LIBC_MUSL + #define INCLUDE_DEFAULTS_MUSL_GPP \ +- { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ ++ { GPLUSPLUS_INCLUDE_DIRVAR, "G++", 1, 1, \ + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ +- { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ ++ { GPLUSPLUS_TOOL_INCLUDE_DIRVAR, "G++", 1, 1, \ + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ +- { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1, \ + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, + + #ifdef LOCAL_INCLUDE_DIR + #define INCLUDE_DEFAULTS_MUSL_LOCAL \ +- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ +- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, ++ { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 2 }, \ ++ { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 0 }, + #else + #define INCLUDE_DEFAULTS_MUSL_LOCAL + #endif + + #ifdef PREFIX_INCLUDE_DIR + #define INCLUDE_DEFAULTS_MUSL_PREFIX \ +- { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, ++ { PREFIX_INCLUDE_DIRVAR, 0, 0, 1, 0, 0}, + #else + #define INCLUDE_DEFAULTS_MUSL_PREFIX + #endif + + #ifdef CROSS_INCLUDE_DIR + #define INCLUDE_DEFAULTS_MUSL_CROSS \ +- { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, ++ { CROSS_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0}, + #else + #define INCLUDE_DEFAULTS_MUSL_CROSS + #endif + + #ifdef TOOL_INCLUDE_DIR + #define INCLUDE_DEFAULTS_MUSL_TOOL \ +- { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, ++ { TOOL_INCLUDE_DIRVAR, "BINUTILS", 0, 1, 0, 0}, + #else + #define INCLUDE_DEFAULTS_MUSL_TOOL + #endif + + #ifdef GCC_INCLUDE_SUBDIR_TARGET + #define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ +- { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0}, ++ { STANDARD_STARTFILE_PREFIX_2VAR, "GCC", 0, 0, 1, 0}, + #else + #define INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET + #endif + + #ifdef NATIVE_SYSTEM_HEADER_DIR + #define INCLUDE_DEFAULTS_MUSL_NATIVE \ +- { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ +- { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, ++ { NATIVE_SYSTEM_HEADER_DIRVAR, 0, 0, 0, 1, 2 }, \ ++ { NATIVE_SYSTEM_HEADER_DIRVAR, 0, 0, 0, 1, 0 }, + #else + #define INCLUDE_DEFAULTS_MUSL_NATIVE + #endif +@@ -1030,7 +1030,7 @@ ncrtn.o%s" + INCLUDE_DEFAULTS_MUSL_TOOL \ + INCLUDE_DEFAULTS_MUSL_SUBDIR_TARGET \ + INCLUDE_DEFAULTS_MUSL_NATIVE \ +- { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ ++ { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 }, \ + { 0, 0, 0, 0, 0, 0 } \ + } + #endif +diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c +index d54d6ce0076..784a92a0c24 100644 +--- a/gcc/cppdefault.c ++++ b/gcc/cppdefault.c +@@ -35,6 +35,30 @@ + # undef CROSS_INCLUDE_DIR + #endif + ++static char GPLUSPLUS_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_INCLUDE_DIR; ++char GCC_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GCC_INCLUDE_DIR; ++static char GPLUSPLUS_TOOL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_TOOL_INCLUDE_DIR; ++static char GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_BACKWARD_INCLUDE_DIR; ++static char STANDARD_STARTFILE_PREFIX_2VAR[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET; ++#ifdef LOCAL_INCLUDE_DIR ++static char LOCAL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = LOCAL_INCLUDE_DIR; ++#endif ++#ifdef PREFIX_INCLUDE_DIR ++static char PREFIX_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX_INCLUDE_DIR; ++#endif ++#ifdef FIXED_INCLUDE_DIR ++static char FIXED_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = FIXED_INCLUDE_DIR; ++#endif ++#ifdef CROSS_INCLUDE_DIR ++static char CROSS_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = CROSS_INCLUDE_DIR; ++#endif ++#ifdef TOOL_INCLUDE_DIR ++static char TOOL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = TOOL_INCLUDE_DIR; ++#endif ++#ifdef NATIVE_SYSTEM_HEADER_DIR ++static char NATIVE_SYSTEM_HEADER_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = NATIVE_SYSTEM_HEADER_DIR; ++#endif ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +@@ -42,17 +66,17 @@ const struct default_include cpp_include_defaults[] + = { + #ifdef GPLUSPLUS_INCLUDE_DIR + /* Pick up GNU C++ generic include files. */ +- { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, ++ { GPLUSPLUS_INCLUDE_DIRVAR, "G++", 1, 1, + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, + #endif + #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR + /* Pick up GNU C++ target-dependent include files. */ +- { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, ++ { GPLUSPLUS_TOOL_INCLUDE_DIRVAR, "G++", 1, 1, + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, + #endif + #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR + /* Pick up GNU C++ backward and deprecated include files. */ +- { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1, + GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, + #endif + #ifdef GPLUSPLUS_LIBCXX_INCLUDE_DIR +@@ -62,23 +86,23 @@ const struct default_include cpp_include_defaults[] + #endif + #ifdef GCC_INCLUDE_DIR + /* This is the dir for gcc's private headers. */ +- { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, ++ { GCC_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0 }, + #endif + #ifdef GCC_INCLUDE_SUBDIR_TARGET + /* This is the dir for gcc's private headers under the specified sysroot. */ +- { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, ++ { STANDARD_STARTFILE_PREFIX_2VAR, "GCC", 0, 0, 1, 0 }, + #endif + #ifdef LOCAL_INCLUDE_DIR + /* /usr/local/include comes before the fixincluded header files. */ +- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, +- { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, ++ { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 2 }, ++ { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 0 }, + #endif + #ifdef PREFIX_INCLUDE_DIR +- { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0 }, ++ { PREFIX_INCLUDE_DIRVAR, 0, 0, 1, 0, 0 }, + #endif + #ifdef FIXED_INCLUDE_DIR + /* This is the dir for fixincludes. */ +- { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, ++ { FIXED_INCLUDE_DIRVAR, "GCC", 0, 0, 0, + /* A multilib suffix needs adding if different multilibs use + different headers. */ + #ifdef SYSROOT_HEADERS_SUFFIX_SPEC +@@ -90,33 +114,24 @@ const struct default_include cpp_include_defaults[] + #endif + #ifdef CROSS_INCLUDE_DIR + /* One place the target system's headers might be. */ +- { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, ++ { CROSS_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0 }, + #endif + #ifdef TOOL_INCLUDE_DIR + /* Another place the target system's headers might be. */ +- { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 }, ++ { TOOL_INCLUDE_DIRVAR, "BINUTILS", 0, 1, 0, 0 }, + #endif + #ifdef NATIVE_SYSTEM_HEADER_DIR + /* /usr/include comes dead last. */ +- { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 2 }, +- { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 }, ++ { NATIVE_SYSTEM_HEADER_DIRVAR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 2 }, ++ { NATIVE_SYSTEM_HEADER_DIRVAR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 }, + #endif + { 0, 0, 0, 0, 0, 0 } + }; + #endif /* no INCLUDE_DEFAULTS */ + +-#ifdef GCC_INCLUDE_DIR +-const char cpp_GCC_INCLUDE_DIR[] = GCC_INCLUDE_DIR; +-const size_t cpp_GCC_INCLUDE_DIR_len = sizeof GCC_INCLUDE_DIR - 8; +-#else +-const char cpp_GCC_INCLUDE_DIR[] = ""; +-const size_t cpp_GCC_INCLUDE_DIR_len = 0; +-#endif +- + /* The configured prefix. */ +-const char cpp_PREFIX[] = PREFIX; +-const size_t cpp_PREFIX_len = sizeof PREFIX - 1; +-const char cpp_EXEC_PREFIX[] = STANDARD_EXEC_PREFIX; ++char PREFIXVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX; ++char EXEC_PREFIXVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_EXEC_PREFIX; + + /* This value is set by cpp_relocated at runtime */ + const char *gcc_exec_prefix; +diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h +index fd3c655db1c..20669ac427d 100644 +--- a/gcc/cppdefault.h ++++ b/gcc/cppdefault.h +@@ -33,7 +33,8 @@ + + struct default_include + { +- const char *const fname; /* The name of the directory. */ ++ const char *fname; /* The name of the directory. */ ++ + const char *const component; /* The component containing the directory + (see update_path in prefix.c) */ + const char cplusplus; /* When this is non-zero, we should only +@@ -55,17 +56,13 @@ struct default_include + }; + + extern const struct default_include cpp_include_defaults[]; +-extern const char cpp_GCC_INCLUDE_DIR[]; +-extern const size_t cpp_GCC_INCLUDE_DIR_len; ++extern char GCC_INCLUDE_DIRVAR[] __attribute__ ((section (".gccrelocprefix"))); + + /* The configure-time prefix, i.e., the value supplied as the argument + to --prefix=. */ +-extern const char cpp_PREFIX[]; ++extern char PREFIXVAR[] __attribute__ ((section (".gccrelocprefix"))); + /* The length of the configure-time prefix. */ +-extern const size_t cpp_PREFIX_len; +-/* The configure-time execution prefix. This is typically the lib/gcc +- subdirectory of cpp_PREFIX. */ +-extern const char cpp_EXEC_PREFIX[]; ++extern char EXEC_PREFIXVAR[] __attribute__ ((section (".gccrelocprefix"))); + /* The run-time execution prefix. This is typically the lib/gcc + subdirectory of the actual installation. */ + extern const char *gcc_exec_prefix; +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 8737bae5353..aa6fbe43965 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL; + #endif + static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; + ++static char target_relocatable_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = SYSTEMLIBS_DIR; ++ + /* Nonzero means pass the updated target_system_root to the compiler. */ + + static int target_system_root_changed; +@@ -568,6 +570,7 @@ or with constant text in a single argument. + %G process LIBGCC_SPEC as a spec. + %R Output the concatenation of target_system_root and + target_sysroot_suffix. ++ %r Output the base path target_relocatable_prefix + %S process STARTFILE_SPEC as a spec. A capital S is actually used here. + %E process ENDFILE_SPEC as a spec. A capital E is actually used here. + %C process CPP_SPEC as a spec. +@@ -1621,10 +1624,10 @@ static const char *gcc_libexec_prefix; + gcc_exec_prefix is set because, in that case, we know where the + compiler has been installed, and use paths relative to that + location instead. */ +-static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; +-static const char *const standard_libexec_prefix = STANDARD_LIBEXEC_PREFIX; +-static const char *const standard_bindir_prefix = STANDARD_BINDIR_PREFIX; +-static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; ++static char standard_exec_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_EXEC_PREFIX; ++static char standard_libexec_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_LIBEXEC_PREFIX; ++static char standard_bindir_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_BINDIR_PREFIX; ++static char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; + + /* For native compilers, these are well-known paths containing + components that may be provided by the system. For cross +@@ -1632,9 +1635,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; + static const char *md_exec_prefix = MD_EXEC_PREFIX; + static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; + static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; +-static const char *const standard_startfile_prefix_1 ++static char standard_startfile_prefix_1[4096] __attribute__ ((section (".gccrelocprefix"))) + = STANDARD_STARTFILE_PREFIX_1; +-static const char *const standard_startfile_prefix_2 ++static char standard_startfile_prefix_2[4096] __attribute__ ((section (".gccrelocprefix"))) + = STANDARD_STARTFILE_PREFIX_2; + + /* A relative path to be used in finding the location of tools +@@ -6564,6 +6567,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) + } + break; + ++ case 'r': ++ obstack_grow (&obstack, target_relocatable_prefix, ++ strlen (target_relocatable_prefix)); ++ break; ++ + case 'S': + value = do_spec_1 (startfile_spec, 0, NULL); + if (value != 0) +diff --git a/gcc/incpath.c b/gcc/incpath.c +index fbfc0ce03b8..a82e543428b 100644 +--- a/gcc/incpath.c ++++ b/gcc/incpath.c +@@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, + int relocated = cpp_relocated (); + size_t len; + +- if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0) ++ if (iprefix && (len = strlen(GCC_INCLUDE_DIRVAR) - 7) != 0) + { + /* Look for directories that start with the standard prefix. + "Translate" them, i.e. replace /usr/local/lib/gcc... with +@@ -146,7 +146,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, + now. */ + if (sysroot && p->add_sysroot) + continue; +- if (!filename_ncmp (p->fname, cpp_GCC_INCLUDE_DIR, len)) ++ if (!filename_ncmp (p->fname, GCC_INCLUDE_DIRVAR, len)) + { + char *str = concat (iprefix, p->fname + len, NULL); + if (p->multilib == 1 && imultilib) +@@ -187,7 +187,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, + free (sysroot_no_trailing_dir_separator); + } + else if (!p->add_sysroot && relocated +- && !filename_ncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len)) ++ && !filename_ncmp (p->fname, PREFIXVAR, strlen(PREFIXVAR))) + { + static const char *relocated_prefix; + char *ostr; +@@ -204,12 +204,12 @@ add_standard_paths (const char *sysroot, const char *iprefix, + dummy = concat (gcc_exec_prefix, "dummy", NULL); + relocated_prefix + = make_relative_prefix (dummy, +- cpp_EXEC_PREFIX, +- cpp_PREFIX); ++ EXEC_PREFIXVAR, ++ PREFIXVAR); + free (dummy); + } + ostr = concat (relocated_prefix, +- p->fname + cpp_PREFIX_len, ++ p->fname + strlen(PREFIXVAR), + NULL); + str = update_path (ostr, p->component); + free (ostr); +diff --git a/gcc/prefix.c b/gcc/prefix.c +index 747c09de638..f728638dc65 100644 +--- a/gcc/prefix.c ++++ b/gcc/prefix.c +@@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3. If not see + #include "prefix.h" + #include "common/common-target.h" + +-static const char *std_prefix = PREFIX; ++char PREFIXVAR1[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX; ++ ++static const char *std_prefix = PREFIXVAR1; + + static const char *get_key_value (char *); + static char *translate_name (char *); +@@ -212,7 +214,7 @@ translate_name (char *name) + prefix = getenv (key); + + if (prefix == 0) +- prefix = PREFIX; ++ prefix = PREFIXVAR1; + + /* We used to strip trailing DIR_SEPARATORs here, but that can + sometimes yield a result with no separator when one was coded diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch new file mode 100644 index 0000000..ff622b1 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch @@ -0,0 +1,99 @@ +From c55e24459370ad96577496ecd87475e3a9de7dad Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Mon, 7 Dec 2015 23:41:45 +0000 +Subject: [PATCH] Search target sysroot gcc version specific dirs with + multilib. + +We install the gcc libraries (such as crtbegin.p) into +<sysroot><libdir>/<target-sys>/5.2.0/ +which is a default search path for GCC (aka multi_suffix in the +code below). <target-sys> is 'machine' in gcc's terminology. We use +these directories so that multiple gcc versions could in theory +co-exist on target. + +We only want to build one gcc-cross-canadian per arch and have this work +for all multilibs. <target-sys> can be handled by mapping the multilib +<target-sys> to the one used by gcc-cross-canadian, e.g. +mips64-polkmllib32-linux +is symlinked to by mips64-poky-linux. + +The default gcc search path in the target sysroot for a "lib64" mutlilib +is: + +<sysroot>/lib32/mips64-poky-linux/5.2.0/ +<sysroot>/lib32/../lib64/ +<sysroot>/usr/lib32/mips64-poky-linux/5.2.0/ +<sysroot>/usr/lib32/../lib64/ +<sysroot>/lib32/ +<sysroot>/usr/lib32/ + +which means that the lib32 crtbegin.o will be found and the lib64 ones +will not which leads to compiler failures. + +This patch injects a multilib version of that path first so the lib64 +binaries can be found first. With this change the search path becomes: + +<sysroot>/lib32/../lib64/mips64-poky-linux/5.2.0/ +<sysroot>/lib32/mips64-poky-linux/5.2.0/ +<sysroot>/lib32/../lib64/ +<sysroot>/usr/lib32/../lib64/mips64-poky-linux/5.2.0/ +<sysroot>/usr/lib32/mips64-poky-linux/5.2.0/ +<sysroot>/usr/lib32/../lib64/ +<sysroot>/lib32/ +<sysroot>/usr/lib32/ + +Upstream-Status: Pending +RP 2015/7/31 + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + gcc/gcc.c | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +diff --git a/gcc/gcc.c b/gcc/gcc.c +index aa6fbe43965..f8a71a13826 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c +@@ -2811,7 +2811,7 @@ for_each_path (const struct path_prefix *paths, + if (path == NULL) + { + len = paths->max_len + extra_space + 1; +- len += MAX (MAX (suffix_len, multi_os_dir_len), multiarch_len); ++ len += MAX ((suffix_len + multi_os_dir_len), multiarch_len); + path = XNEWVEC (char, len); + } + +@@ -2823,6 +2823,33 @@ for_each_path (const struct path_prefix *paths, + /* Look first in MACHINE/VERSION subdirectory. */ + if (!skip_multi_dir) + { ++ if (!(pl->os_multilib ? skip_multi_os_dir : skip_multi_dir)) ++ { ++ const char *this_multi; ++ size_t this_multi_len; ++ ++ if (pl->os_multilib) ++ { ++ this_multi = multi_os_dir; ++ this_multi_len = multi_os_dir_len; ++ } ++ else ++ { ++ this_multi = multi_dir; ++ this_multi_len = multi_dir_len; ++ } ++ ++ /* Look in multilib MACHINE/VERSION subdirectory first */ ++ if (this_multi_len) ++ { ++ memcpy (path + len, this_multi, this_multi_len + 1); ++ memcpy (path + len + this_multi_len, multi_suffix, suffix_len + 1); ++ ret = callback (path, callback_info); ++ if (ret) ++ break; ++ } ++ } ++ + memcpy (path + len, multi_suffix, suffix_len + 1); + ret = callback (path, callback_info); + if (ret) diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch new file mode 100644 index 0000000..97c2713 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch @@ -0,0 +1,31 @@ +From: Richard Purdie <richard.purdie(a)linuxfoundation.org> +Subject: [PATCH 4/5] gcc/nios2: Define the musl linker + +Add a definition of the musl linker used on the nios2 platform. + +2021-10-26 Richard Purdie <richard.purdie(a)linuxfoundation.org> + +gcc/ChangeLog: + + * config/nios2/linux.h (MUSL_DYNAMIC_LINKER): Add musl linker + +Signed-off-by: Richard Purdie <richard.purdie(a)linuxfoundation.org> + +Submitted [https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582723.html] +Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=e5ddbbf992b909d8e38851bd3…] +--- + gcc/config/nios2/linux.h | 1 + + 1 file changed, 1 insertion(+) + +Index: gcc-11.2.0/gcc/config/nios2/linux.h +=================================================================== +--- gcc-11.2.0.orig/gcc/config/nios2/linux.h ++++ gcc-11.2.0/gcc/config/nios2/linux.h +@@ -30,6 +30,7 @@ + #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" + + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-nios2.so.1" + + #undef LINK_SPEC + #define LINK_SPEC LINK_SPEC_ENDIAN \ diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch new file mode 100644 index 0000000..9c616d2 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch @@ -0,0 +1,78 @@ +From 745a2ac7825c73102b888226c54397d21512f86b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Tue, 27 Jun 2017 18:10:54 -0700 +Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets + +when -fstack-protector options are enabled we need to +link with ssp_shared on musl since it does not provide +the __stack_chk_fail_local() so essentially it provides +libssp but not libssp_nonshared something like +TARGET_LIBC_PROVIDES_SSP_BUT_NOT_SSP_NONSHARED + where-as for glibc the needed symbols +are already present in libc_nonshared library therefore +we do not need any library helper on glibc based systems +but musl needs the libssp_noshared from gcc + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + gcc/config/linux.h | 7 +++++++ + gcc/config/rs6000/linux.h | 10 ++++++++++ + gcc/config/rs6000/linux64.h | 10 ++++++++++ + 3 files changed, 27 insertions(+) + +--- a/gcc/config/linux.h ++++ b/gcc/config/linux.h +@@ -203,6 +203,13 @@ see the files COPYING3 and COPYING.RUNTI + { GCC_INCLUDE_DIRVAR, "GCC", 0, 1, 0, 0 }, \ + { 0, 0, 0, 0, 0, 0 } \ + } ++#ifdef TARGET_LIBC_PROVIDES_SSP ++#undef LINK_SSP_SPEC ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ ++ "|fstack-protector-strong|fstack-protector-explicit" \ ++ ":-lssp_nonshared}" ++#endif ++ + #endif + + #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ +--- a/gcc/config/rs6000/linux.h ++++ b/gcc/config/rs6000/linux.h +@@ -94,6 +94,16 @@ + " -m elf32ppclinux") + #endif + ++/* link libssp_nonshared.a with musl */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#ifdef TARGET_LIBC_PROVIDES_SSP ++#undef LINK_SSP_SPEC ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ ++ "|fstack-protector-strong|fstack-protector-explicit" \ ++ ":-lssp_nonshared}" ++#endif ++#endif ++ + #undef LINK_OS_LINUX_SPEC + #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ + %{!static-pie: \ +--- a/gcc/config/rs6000/linux64.h ++++ b/gcc/config/rs6000/linux64.h +@@ -369,6 +369,16 @@ extern int dot_symbols; + " -m elf64ppc") + #endif + ++/* link libssp_nonshared.a with musl */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#ifdef TARGET_LIBC_PROVIDES_SSP ++#undef LINK_SSP_SPEC ++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ ++ "|fstack-protector-strong|fstack-protector-explicit" \ ++ ":-lssp_nonshared}" ++#endif ++#endif ++ + #define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \ + %{!static-pie: \ + %{rdynamic:-export-dynamic} \ diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch new file mode 100644 index 0000000..b74aeb8 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch @@ -0,0 +1,26 @@ +From 695adb4dffb23c6f5cbc757e05cf4187a2bd6528 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Wed, 4 May 2016 21:11:34 -0700 +Subject: [PATCH] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS + +Upstream-Status: Pending + +Signed-off-by: Christopher Larson <chris_larson(a)mentor.com> +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + libgcc/config/t-slibgcc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgcc/config/t-slibgcc b/libgcc/config/t-slibgcc +index c59b43b7b69..ca4c141f526 100644 +--- a/libgcc/config/t-slibgcc ++++ b/libgcc/config/t-slibgcc +@@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \ + $(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) + + SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ +- $(SHLIB_LDFLAGS) \ ++ $(LDFLAGS) $(SHLIB_LDFLAGS) \ + -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \ + $(SHLIB_OBJS) $(SHLIB_LC) && \ + rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch new file mode 100644 index 0000000..fd7d604 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0030-sync-gcc-stddef.h-with-musl.patch @@ -0,0 +1,88 @@ +From a9173429ae256c4b4a3ab4d758a6adf42f8c4239 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Fri, 3 Feb 2017 12:56:00 -0800 +Subject: [PATCH] sync gcc stddef.h with musl + +musl defines ptrdiff_t size_t and wchar_t +so dont define them here if musl is definining them + +Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=85a438fc78dd12249ca854a3e5c57…] + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + gcc/ginclude/stddef.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h +index 66619fe43b1..3f843d6f365 100644 +--- a/gcc/ginclude/stddef.h ++++ b/gcc/ginclude/stddef.h +@@ -128,6 +128,7 @@ _TYPE_wchar_t; + #ifndef ___int_ptrdiff_t_h + #ifndef _GCC_PTRDIFF_T + #ifndef _PTRDIFF_T_DECLARED /* DragonFly */ ++#ifndef __DEFINED_ptrdiff_t /* musl */ + #define _PTRDIFF_T + #define _T_PTRDIFF_ + #define _T_PTRDIFF +@@ -137,10 +138,12 @@ _TYPE_wchar_t; + #define ___int_ptrdiff_t_h + #define _GCC_PTRDIFF_T + #define _PTRDIFF_T_DECLARED ++#define __DEFINED_ptrdiff_t /* musl */ + #ifndef __PTRDIFF_TYPE__ + #define __PTRDIFF_TYPE__ long int + #endif + typedef __PTRDIFF_TYPE__ ptrdiff_t; ++#endif /* __DEFINED_ptrdiff_t */ + #endif /* _PTRDIFF_T_DECLARED */ + #endif /* _GCC_PTRDIFF_T */ + #endif /* ___int_ptrdiff_t_h */ +@@ -178,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; + #ifndef _GCC_SIZE_T + #ifndef _SIZET_ + #ifndef __size_t ++#ifndef __DEFINED_size_t /* musl */ + #define __size_t__ /* BeOS */ + #define __SIZE_T__ /* Cray Unicos/Mk */ + #define _SIZE_T +@@ -194,6 +198,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; + #define ___int_size_t_h + #define _GCC_SIZE_T + #define _SIZET_ ++#define __DEFINED_size_t /* musl */ + #if defined (__FreeBSD__) \ + || defined(__DragonFly__) \ + || defined(__FreeBSD_kernel__) \ +@@ -228,6 +233,7 @@ typedef long ssize_t; + #endif /* _SIZE_T */ + #endif /* __SIZE_T__ */ + #endif /* __size_t__ */ ++#endif /* __DEFINED_size_t */ + #undef __need_size_t + #endif /* _STDDEF_H or __need_size_t. */ + +@@ -257,6 +263,7 @@ typedef long ssize_t; + #ifndef ___int_wchar_t_h + #ifndef __INT_WCHAR_T_H + #ifndef _GCC_WCHAR_T ++#ifndef __DEFINED_wchar_t /* musl */ + #define __wchar_t__ /* BeOS */ + #define __WCHAR_T__ /* Cray Unicos/Mk */ + #define _WCHAR_T +@@ -272,6 +279,7 @@ typedef long ssize_t; + #define __INT_WCHAR_T_H + #define _GCC_WCHAR_T + #define _WCHAR_T_DECLARED ++#define __DEFINED_wchar_t /* musl */ + + /* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_ + instead of _WCHAR_T_, and _BSD_RUNE_T_ (which, unlike the other +@@ -337,6 +345,7 @@ typedef __WCHAR_TYPE__ wchar_t; + #endif + #endif /* __WCHAR_T__ */ + #endif /* __wchar_t__ */ ++#endif /* __DEFINED_wchar_t musl */ + #undef __need_wchar_t + #endif /* _STDDEF_H or __need_wchar_t. */ + diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch new file mode 100644 index 0000000..129f555 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0033-Re-introduce-spe-commandline-options.patch @@ -0,0 +1,39 @@ +From 0b900d6410b7c1938e86eceb87b032fd538566a9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Wed, 6 Jun 2018 12:10:22 -0700 +Subject: [PATCH] Re-introduce spe commandline options + +This should ensure that we keep accepting +spe options + +Upstream-Status: Inappropriate [SPE port is removed from rs600 port] + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + gcc/config/rs6000/rs6000.opt | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt +index 0dbdf753673..b273eb65c35 100644 +--- a/gcc/config/rs6000/rs6000.opt ++++ b/gcc/config/rs6000/rs6000.opt +@@ -352,6 +352,19 @@ mdebug= + Target RejectNegative Joined + -mdebug= Enable debug output. + ++; PPC SPE ABI ++mspe ++Target Var(rs6000_spe) Save ++Generate SPE SIMD instructions on E500. ++ ++mabi=spe ++Target RejectNegative Var(rs6000_spe_abi) Save ++Use the SPE ABI extensions. ++ ++mabi=no-spe ++Target RejectNegative Var(rs6000_spe_abi, 0) ++Do not use the SPE ABI extensions. ++ + ; Altivec ABI + mabi=altivec + Target RejectNegative Var(rs6000_altivec_abi) Save diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch new file mode 100644 index 0000000..3f666dc --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch @@ -0,0 +1,83 @@ +From ea9154338cb3acbd75945fddde4202e73c20dd1a Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <nsz(a)port70.net> +Date: Sat, 24 Oct 2015 20:09:53 +0000 +Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of + symver + +Adapter from + +https://gcc.gnu.org/ml/gcc-patches/2015-05/msg00899.html + +This fix was debated but hasnt been applied gcc upstream since +they expect musl to support '@' in symbol versioning which is +a sun/gnu versioning extention. This patch however avoids the +need for the '@' symbols at all + +libgcc/Changelog: + +2015-05-11 Szabolcs Nagy <szabolcs.nagy(a)arm.com> + + * config/i386/cpuinfo.c (__cpu_indicator_init_local): Add. + (__cpu_indicator_init(a)GCC_4.8.0, __cpu_model(a)GCC_4.8.0): Remove. + + * config/i386/t-linux (HOST_LIBGCC2_CFLAGS): Remove -DUSE_ELF_SYMVER. + +gcc/Changelog: + +2015-05-11 Szabolcs Nagy <szabolcs.nagy(a)arm.com> + + * config/i386/i386-expand.c (ix86_expand_builtin): Make __builtin_cpu_init + call __cpu_indicator_init_local instead of __cpu_indicator_init. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + gcc/config/i386/i386-expand.c | 4 ++-- + libgcc/config/i386/cpuinfo.c | 6 +++--- + libgcc/config/i386/t-linux | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c +index ac69eed4d32..ffaa44a16fc 100644 +--- a/gcc/config/i386/i386-expand.c ++++ b/gcc/config/i386/i386-expand.c +@@ -11038,10 +11038,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, + { + case IX86_BUILTIN_CPU_INIT: + { +- /* Make it call __cpu_indicator_init in libgcc. */ ++ /* Make it call __cpu_indicator_init_local in libgcc.a. */ + tree call_expr, fndecl, type; + type = build_function_type_list (integer_type_node, NULL_TREE); +- fndecl = build_fn_decl ("__cpu_indicator_init", type); ++ fndecl = build_fn_decl ("__cpu_indicator_init_local", type); + call_expr = build_call_expr (fndecl, 0); + return expand_expr (call_expr, target, mode, EXPAND_NORMAL); + } +diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c +index ef463848f9d..1a3de052c80 100644 +--- a/libgcc/config/i386/cpuinfo.c ++++ b/libgcc/config/i386/cpuinfo.c +@@ -63,7 +63,7 @@ __cpu_indicator_init (void) + __cpu_features2); + } + +-#if defined SHARED && defined USE_ELF_SYMVER +-__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init(a)GCC_4.8.0"); +-__asm__ (".symver __cpu_model, __cpu_model(a)GCC_4.8.0"); ++#ifndef SHARED ++int __cpu_indicator_init_local (void) ++ __attribute__ ((weak, alias ("__cpu_indicator_init"))); + #endif +diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux +index 8506a635790..564296f788e 100644 +--- a/libgcc/config/i386/t-linux ++++ b/libgcc/config/i386/t-linux +@@ -3,5 +3,5 @@ + # t-slibgcc-elf-ver and t-linux + SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver + +-HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS) ++HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS) + CRTSTUFF_T_CFLAGS += $(CET_FLAGS) diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch new file mode 100644 index 0000000..874cd77 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch @@ -0,0 +1,182 @@ +From 520411cf364ee4b0b5a8f0857498aaabd790afb3 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie(a)linuxfoundation.org> +Date: Tue, 10 Mar 2020 08:26:53 -0700 +Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining + reproducibility + +Inserting line numbers into generated code means its not always reproducible wth +differing versions of host gcc. Void the issue by not adding these. + +Upstream-Status: Inappropriate [OE Reproducibility specific] + +Signed-off-by: Richard Purdie <richard.purdie(a)linuxfoundation.org> +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + gcc/gengtype.c | 6 +++--- + gcc/genmodes.c | 32 ++++++++++++++++---------------- + 2 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/gcc/gengtype.c b/gcc/gengtype.c +index 5f50242e857..cbaca9b8cd0 100644 +--- a/gcc/gengtype.c ++++ b/gcc/gengtype.c +@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, + /* Create a fake field with the given type and name. NEXT is the next + field in the chain. */ + #define create_field(next,type,name) \ +- create_field_all (next,type,name, 0, this_file, __LINE__) ++ create_field_all (next,type,name, 0, this_file, 0) + + /* Like create_field, but the field is only valid when condition COND + is true. */ +@@ -1024,7 +1024,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name, + } + + #define create_optional_field(next,type,name,cond) \ +- create_optional_field_(next,type,name,cond,__LINE__) ++ create_optional_field_(next,type,name,cond,0) + + /* Reverse a linked list of 'struct pair's in place. */ + pair_p +@@ -5189,7 +5189,7 @@ main (int argc, char **argv) + /* These types are set up with #define or else outside of where + we can see them. We should initialize them before calling + read_input_list. */ +-#define POS_HERE(Call) do { pos.file = this_file; pos.line = __LINE__; \ ++#define POS_HERE(Call) do { pos.file = this_file; pos.line = 0; \ + Call;} while (0) + POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); + POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); +diff --git a/gcc/genmodes.c b/gcc/genmodes.c +index c268ebc4c6e..4361f3f1563 100644 +--- a/gcc/genmodes.c ++++ b/gcc/genmodes.c +@@ -438,7 +438,7 @@ complete_all_modes (void) + } + + /* For each mode in class CLASS, construct a corresponding complex mode. */ +-#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, __LINE__) ++#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, 0) + static void + make_complex_modes (enum mode_class cl, + const char *file, unsigned int line) +@@ -497,7 +497,7 @@ make_complex_modes (enum mode_class cl, + having as many components as necessary. ORDER is the sorting order + of the mode, with smaller numbers indicating a higher priority. */ + #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W, ORDER) \ +- make_vector_modes (MODE_##C, #PREFIX, W, ORDER, __FILE__, __LINE__) ++ make_vector_modes (MODE_##C, #PREFIX, W, ORDER, __FILE__, 0) + #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W, 0) + static void ATTRIBUTE_UNUSED + make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, +@@ -549,7 +549,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, + /* Create a vector of booleans called NAME with COUNT elements and + BYTESIZE bytes in total. */ + #define VECTOR_BOOL_MODE(NAME, COUNT, BYTESIZE) \ +- make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, __LINE__) ++ make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_vector_bool_mode (const char *name, unsigned int count, + unsigned int bytesize, const char *file, +@@ -571,7 +571,7 @@ make_vector_bool_mode (const char *name, unsigned int count, + /* Input. */ + + #define _SPECIAL_MODE(C, N) \ +- make_special_mode (MODE_##C, #N, __FILE__, __LINE__) ++ make_special_mode (MODE_##C, #N, __FILE__, 0) + #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N) + #define CC_MODE(N) _SPECIAL_MODE (CC, N) + +@@ -584,7 +584,7 @@ make_special_mode (enum mode_class cl, const char *name, + + #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y) + #define FRACTIONAL_INT_MODE(N, B, Y) \ +- make_int_mode (#N, B, Y, __FILE__, __LINE__) ++ make_int_mode (#N, B, Y, __FILE__, 0) + + static void + make_int_mode (const char *name, +@@ -611,16 +611,16 @@ make_opaque_mode (const char *name, + } + + #define FRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, 0) + + #define UFRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, 0) + + #define ACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, 0) + + #define UACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, 0) + + /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT, + FILE, and LINE. */ +@@ -641,7 +641,7 @@ make_fixed_point_mode (enum mode_class cl, + + #define FLOAT_MODE(N, Y, F) FRACTIONAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \ +- make_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_float_mode (const char *name, +@@ -658,7 +658,7 @@ make_float_mode (const char *name, + #define DECIMAL_FLOAT_MODE(N, Y, F) \ + FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F) \ +- make_decimal_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_decimal_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_decimal_float_mode (const char *name, +@@ -673,7 +673,7 @@ make_decimal_float_mode (const char *name, + } + + #define RESET_FLOAT_FORMAT(N, F) \ +- reset_float_format (#N, #F, __FILE__, __LINE__) ++ reset_float_format (#N, #F, __FILE__, 0) + static void ATTRIBUTE_UNUSED + reset_float_format (const char *name, const char *format, + const char *file, unsigned int line) +@@ -694,7 +694,7 @@ reset_float_format (const char *name, const char *format, + + /* __intN support. */ + #define INT_N(M,PREC) \ +- make_int_n (#M, PREC, __FILE__, __LINE__) ++ make_int_n (#M, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_int_n (const char *m, int bitsize, + const char *file, unsigned int line) +@@ -723,7 +723,7 @@ make_int_n (const char *m, int bitsize, + /* Partial integer modes are specified by relation to a full integer + mode. */ + #define PARTIAL_INT_MODE(M,PREC,NAME) \ +- make_partial_integer_mode (#M, #NAME, PREC, __FILE__, __LINE__) ++ make_partial_integer_mode (#M, #NAME, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_partial_integer_mode (const char *base, const char *name, + unsigned int precision, +@@ -750,7 +750,7 @@ make_partial_integer_mode (const char *base, const char *name, + /* A single vector mode can be specified by naming its component + mode and the number of components. */ + #define VECTOR_MODE(C, M, N) \ +- make_vector_mode (MODE_##C, #M, N, __FILE__, __LINE__); ++ make_vector_mode (MODE_##C, #M, N, __FILE__, 0); + static void ATTRIBUTE_UNUSED + make_vector_mode (enum mode_class bclass, + const char *base, +@@ -793,7 +793,7 @@ make_vector_mode (enum mode_class bclass, + + /* Adjustability. */ + #define _ADD_ADJUST(A, M, X, C1, C2) \ +- new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, __LINE__) ++ new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, 0) + + #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM) + #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM) diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch new file mode 100644 index 0000000..4c9a79c --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0037-libatomic-Do-not-enforce-march-on-aarch64.patch @@ -0,0 +1,42 @@ +From 36d4fdbc99e69f9d70a29e2bada40cc3c1534557 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem(a)gmail.com> +Date: Wed, 13 May 2020 15:10:38 -0700 +Subject: [PATCH] libatomic: Do not enforce march on aarch64 + +OE passes the right options via gcc compiler cmdline via TUNE_CCARGS +this can conflict between -mcpu settings and -march setting here, since +-mcpu will translate into an appropriate -march, lets depend on that +instead of setting it explicitly + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem(a)gmail.com> +--- + libatomic/Makefile.am | 1 - + libatomic/Makefile.in | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am +index 0f3cd6f7121..c8124c1d5aa 100644 +--- a/libatomic/Makefile.am ++++ b/libatomic/Makefile.am +@@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS))) + ## On a target-specific basis, include alternates to be selected by IFUNC. + if HAVE_IFUNC + if ARCH_AARCH64_LINUX +-IFUNC_OPTIONS = -march=armv8-a+lse + libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS))) + endif + if ARCH_ARM_LINUX +diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in +index 0a51bd55f01..6d5b1581706 100644 +--- a/libatomic/Makefile.in ++++ b/libatomic/Makefile.in +@@ -432,7 +432,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files))) + libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \ + _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \ + $(am__append_3) $(am__append_4) +-@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse + @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 + @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 + @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 diff --git a/recipes-devtools/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch b/recipes-devtools/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch new file mode 100644 index 0000000..c8dcd74 --- /dev/null +++ b/recipes-devtools/gcc/gcc-morello-10.1/patches/0041-apply-debug-prefix-maps-before-checksumming-DIEs.patch @@ -0,0 +1,95 @@ +From 7cc2df084b7977653a9b59cbc34a9ad500ae619c Mon Sep 17 00:00:00 2001 +From: Richard Biener <rguenther(a)suse.de> +Date: Tue, 20 Jul 2021 11:00:33 +0200 +Subject: [PATCH] debug/101473 - apply debug prefix maps before checksumming DIEs + +The following makes sure to apply the debug prefix maps to filenames +before checksumming DIEs to create the global symbol for the CU DIE +used by LTO to link the late debug to the early debug. This avoids +binary differences (in said symbol) when compiling with toolchains +installed under a different path and that compensated with appropriate +-fdebug-prefix-map options. + +The easiest and most scalable way is to record both the unmapped +and the remapped filename in the dwarf_file_data so the remapping +process takes place at a single point and only once (otherwise it +creates GC garbage at each point doing that). + +2021-07-20 Richard Biener <rguenther(a)suse.de> + + PR debug/101473 + * dwarf2out.h (dwarf_file_data): Add key member. + * dwarf2out.c (dwarf_file_hasher::equal): Compare key. + (dwarf_file_hasher::hash): Hash key. + (lookup_filename): Remap the filename and store it in the + filename member of dwarf_file_data when creating a new + dwarf_file_data. + (file_name_acquire): Do not remap the filename again. + (maybe_emit_file): Likewise. + +[YOCTO #14481] + +Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=7cc2df084b7977653a9b59cbc34a9…] + +The upstream patch was modified to compensate for the definition of +"struct dwarf_file_data" being in dwarf2out.c rather than dwarf2out.h in +this version of gcc. + +Signed-off-by: Tony Battersby <tonyb(a)cybernetics.com> +--- +diff -urpN a/gcc/dwarf2out.c b/gcc/dwarf2out.c +--- a/gcc/dwarf2out.c 2021-04-27 06:00:13.000000000 -0400 ++++ b/gcc/dwarf2out.c 2021-07-23 16:40:06.141886167 -0400 +@@ -1283,6 +1283,7 @@ dwarf2out_switch_text_section (void) + + /* Data about a single source file. */ + struct GTY((for_user)) dwarf_file_data { ++ const char * key; + const char * filename; + int emitted_number; + }; +@@ -12334,7 +12335,7 @@ file_name_acquire (dwarf_file_data **slo + + fi = fnad->files + fnad->used_files++; + +- f = remap_debug_filename (d->filename); ++ f = d->filename; + + /* Skip all leading "./". */ + while (f[0] == '.' && IS_DIR_SEPARATOR (f[1])) +@@ -27231,13 +27232,13 @@ dwarf2out_ignore_block (const_tree block + bool + dwarf_file_hasher::equal (dwarf_file_data *p1, const char *p2) + { +- return filename_cmp (p1->filename, p2) == 0; ++ return filename_cmp (p1->key, p2) == 0; + } + + hashval_t + dwarf_file_hasher::hash (dwarf_file_data *p) + { +- return htab_hash_string (p->filename); ++ return htab_hash_string (p->key); + } + + /* Lookup FILE_NAME (in the list of filenames that we know about here in +@@ -27267,7 +27268,8 @@ lookup_filename (const char *file_name) + return *slot; + + created = ggc_alloc<dwarf_file_data> (); +- created->filename = file_name; ++ created->key = file_name; ++ created->filename = remap_debug_filename (file_name); + created->emitted_number = 0; + *slot = created; + return created; +@@ -27293,8 +27295,7 @@ maybe_emit_file (struct dwarf_file_data + if (output_asm_line_debug_info ()) + { + fprintf (asm_out_file, "\t.file %u ", fd->emitted_number); +- output_quoted_string (asm_out_file, +- remap_debug_filename (fd->filename)); ++ output_quoted_string (asm_out_file, fd->filename); + fputc ('\n', asm_out_file); + } + } diff --git a/recipes-devtools/gcc/gcc-runtime_morello-10.1.bb b/recipes-devtools/gcc/gcc-runtime_morello-10.1.bb new file mode 100644 index 0000000..b755f55 --- /dev/null +++ b/recipes-devtools/gcc/gcc-runtime_morello-10.1.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-runtime.inc diff --git a/recipes-devtools/gcc/gcc-sanitizers_morello-10.1.bb b/recipes-devtools/gcc/gcc-sanitizers_morello-10.1.bb new file mode 100644 index 0000000..e0a365c --- /dev/null +++ b/recipes-devtools/gcc/gcc-sanitizers_morello-10.1.bb @@ -0,0 +1,7 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-sanitizers.inc + +# Building with thumb enabled on armv4t armv5t fails with +# sanitizer_linux.s:5749: Error: lo register required -- `ldr ip,[sp],#8' +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" \ No newline at end of file diff --git a/recipes-devtools/gcc/gcc-source_morello-10.1.bb b/recipes-devtools/gcc/gcc-source_morello-10.1.bb new file mode 100644 index 0000000..5f25f11 --- /dev/null +++ b/recipes-devtools/gcc/gcc-source_morello-10.1.bb @@ -0,0 +1,4 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-source.inc + +EXCLUDE_FROM_WORLD = "1" \ No newline at end of file diff --git a/recipes-devtools/gcc/gcc_morello-10.1.bb b/recipes-devtools/gcc/gcc_morello-10.1.bb new file mode 100644 index 0000000..ca67145 --- /dev/null +++ b/recipes-devtools/gcc/gcc_morello-10.1.bb @@ -0,0 +1,11 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/gcc-target.inc + +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" + +ARMFPARCHEXT:armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" +ARMFPARCHEXT:armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" +ARMFPARCHEXT:armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}" + +BBCLASSEXTEND = "nativesdk" \ No newline at end of file diff --git a/recipes-devtools/gcc/libgcc-initial_morello-10.1.bb b/recipes-devtools/gcc/libgcc-initial_morello-10.1.bb new file mode 100644 index 0000000..ca1159c --- /dev/null +++ b/recipes-devtools/gcc/libgcc-initial_morello-10.1.bb @@ -0,0 +1,5 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/libgcc-initial.inc + +# Building with thumb enabled on armv6t fails +ARM_INSTRUCTION_SET:armv6 = "arm" diff --git a/recipes-devtools/gcc/libgcc_morello-10.1.bb b/recipes-devtools/gcc/libgcc_morello-10.1.bb new file mode 100644 index 0000000..35ac5df --- /dev/null +++ b/recipes-devtools/gcc/libgcc_morello-10.1.bb @@ -0,0 +1,5 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/libgcc.inc + +# Building with thumb enabled on armv6t fails +ARM_INSTRUCTION_SET:armv6 = "arm" diff --git a/recipes-devtools/gcc/libgfortan_morello-10.1.bb b/recipes-devtools/gcc/libgfortan_morello-10.1.bb new file mode 100644 index 0000000..fe63d0a --- /dev/null +++ b/recipes-devtools/gcc/libgfortan_morello-10.1.bb @@ -0,0 +1,2 @@ +require recipes-devtools/gcc/gcc-${PV}.inc +require recipes-devtools/gcc/libgfortran.inc -- 2.34.1

2 years

1
1
0 0

Change to linux-morello branch

by Alex J Lennon

Hi Pawel, Quick heads up. I am getting build errors on the linux-morello kernel now. Commit 87d06928f90fe910311210a0149d03f3420f593c can't be found in morello/master any more. It seem to be in tag morello-last-5.18 Cheers, Alex

2 years

4
7
0 0

[PATCH 0/2] Clarify the usage of the FVP model

by Pawel Zalewski

This series of patches will stop the FVP from opening terminal windows and add detailed instructions on how to run the model to the README.md Pawel Zalewski (2): README.md: update fvp: do not try to start the terminal README.md | 54 ++++++++++++++++++++++++----------- conf/machine/morello-fvp.conf | 12 +++++++- 2 files changed, 49 insertions(+), 17 deletions(-) -- 2.34.1

2 years

1
3
0 0

Thoughts on access to Morello hardware

by Alex J Lennon

Hi Pawel, I had email from Andrew Murray the other day on the impressive work you're doing at The Good Penguin to connect your embedded board farm to GitHub workflows. I mentioned we've done a little here at Dynamic Devices on CI for the Yocto layers we maintain (ref: https://www.youtube.com/watch?v=TsAcxd_acJI) We were down at the Digital Catapult yesterday talking about the new meta-morello layer and it was extremely well received. This got me thinking and I seem to remember you mentioned you were putting your Morello board on the Internet? Did you do this? Maybe you've already looked at this but I was pondering whether we could connect a GitHub workflow to a build system artifact folder which we could then expose as a USB gadget device. This could then be made to look to the Morello Hardware like a connected USB drive, I think. And thus we could enable people to remotely build and test and experiment with real CHERI enabled hardware? In particular one of the really interesting ideas mentioned to me yesterday was that even businesses without access to production CHERI silicon could run and test their products on a CHERI enabled development board, thus ensuring a level of enhanced security on their non-CHERI production hardware. A sort of "Tested with CHERI" stamp. Let me know if any of this is of interest! Cheers, Alex

2 years

2
2
0 0

2025

2024

2023

2022

linux-morello-distros