commit: 1f246754125269d39a802835d6f0bb32bb73692e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jun 25 05:53:35 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 25 22:22:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f246754
profiles: split sparc into 32ul + 64ul This lets us easily inherit features/wd40 for just 32ul, as 64ul now has Rust. profiles/default/linux/sparc/17.0 is now purely for 32-bit (64-bit kernels still, just like before), rather than being used partly by the 64-bit (64ul) subprofile. Bug: https://bugs.gentoo.org/769467 See: ff1eda53e71a352f68e02d686d6436dc2f37c518 See: 0a1c580aff19787c759a4690f952b6dcba2a5012 See: 40a8f13c5c6e1ab840eb57d47c0eba58f2e90634 Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/arch/sparc/32ul/eapi | 1 + profiles/arch/sparc/32ul/make.defaults | 9 +++++++++ profiles/arch/sparc/32ul/parent | 2 ++ profiles/arch/sparc/make.defaults | 4 ---- profiles/arch/sparc/parent | 1 - profiles/default/linux/sparc/17.0/64ul/parent | 5 ++++- profiles/default/linux/sparc/17.0/parent | 1 + profiles/default/linux/sparc/parent | 2 +- 8 files changed, 18 insertions(+), 7 deletions(-) diff --git a/profiles/arch/sparc/32ul/eapi b/profiles/arch/sparc/32ul/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/sparc/32ul/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/sparc/32ul/make.defaults b/profiles/arch/sparc/32ul/make.defaults new file mode 100644 index 000000000000..46df0689c786 --- /dev/null +++ b/profiles/arch/sparc/32ul/make.defaults @@ -0,0 +1,9 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +CHOST="sparc-unknown-linux-gnu" + +# Multilib stuff +MULTILIB_ABIS="sparc32" +DEFAULT_ABI="sparc32" +ABI="${DEFAULT_ABI}" diff --git a/profiles/arch/sparc/32ul/parent b/profiles/arch/sparc/32ul/parent new file mode 100644 index 000000000000..154b8158dc01 --- /dev/null +++ b/profiles/arch/sparc/32ul/parent @@ -0,0 +1,2 @@ +.. +../../../features/wd40 diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults index b25d074c2cd5..23b5d7dad10a 100644 --- a/profiles/arch/sparc/make.defaults +++ b/profiles/arch/sparc/make.defaults @@ -5,7 +5,6 @@ ARCH="sparc" ACCEPT_KEYWORDS="${ARCH}" # 64bit kernel, 32bit userland -CHOST="sparc-unknown-linux-gnu" PROFILE_ARCH="sparc64" # We need sparc64 binutils for linux-headers @@ -17,9 +16,6 @@ CHOST_sparc64="sparc64-unknown-linux-gnu" LDFLAGS_sparc64="-m elf64_sparc" # Multilib stuff -MULTILIB_ABIS="sparc32" -DEFAULT_ABI="sparc32" -ABI="${DEFAULT_ABI}" CFLAGS_sparc32="" # 32 bit is the default, so no need to set it. LDFLAGS_sparc32="" # setting it would make gcc use -m32 and -m64 at the same time CHOST_sparc32="sparc-unknown-linux-gnu" diff --git a/profiles/arch/sparc/parent b/profiles/arch/sparc/parent index e234bf836e61..eb001c6e8ab8 100644 --- a/profiles/arch/sparc/parent +++ b/profiles/arch/sparc/parent @@ -1,2 +1 @@ ../base -../../features/wd40 diff --git a/profiles/default/linux/sparc/17.0/64ul/parent b/profiles/default/linux/sparc/17.0/64ul/parent index e7b5079fc132..db96bde2f63d 100644 --- a/profiles/default/linux/sparc/17.0/64ul/parent +++ b/profiles/default/linux/sparc/17.0/64ul/parent @@ -1,2 +1,5 @@ -.. +../../../../../base +../../../../../releases/17.0 +../../.. +../../../../../features/multilib ../../../../../arch/sparc/64ul diff --git a/profiles/default/linux/sparc/17.0/parent b/profiles/default/linux/sparc/17.0/parent index a94c5be1f1e0..682ac198547d 100644 --- a/profiles/default/linux/sparc/17.0/parent +++ b/profiles/default/linux/sparc/17.0/parent @@ -1,3 +1,4 @@ .. ../../../../releases/17.0 ../../../../features/multilib +../../../../arch/sparc/32ul diff --git a/profiles/default/linux/sparc/parent b/profiles/default/linux/sparc/parent index f8f06632ebe0..6715c738f207 100644 --- a/profiles/default/linux/sparc/parent +++ b/profiles/default/linux/sparc/parent @@ -1,3 +1,3 @@ ../../../base .. -../../../arch/sparc +../../../arch/sparc/32ul
