public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-5868] mips: Fix up mips*-sde-elf* build [PR112300]
@ 2023-11-27  8:23 Jakub Jelinek
  0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2023-11-27  8:23 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:221166ad15eb37b047c77118f2eb1c8442eaa27b

commit r14-5868-g221166ad15eb37b047c77118f2eb1c8442eaa27b
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Mon Nov 27 09:22:20 2023 +0100

    mips: Fix up mips*-sde-elf* build [PR112300]
    
    As reported in the PR, mipsisa64r2-sde-elf doesn't build because HEAP_TRAMPOLINES_INIT
    macro isn't defined anywhere.
    It is normally defined by
     # Figure out if we need to enable heap trampolines by default
     case ${target} in
     *-*-darwin2*)
       # Currently, we do this for macOS 11 and above.
       tm_defines="$tm_defines HEAP_TRAMPOLINES_INIT=1"
       ;;
     *)
       tm_defines="$tm_defines HEAP_TRAMPOLINES_INIT=0"
       ;;
     esac
    in config.gcc, but mips*-sde-elf* is the only target which overwrites
    tm_defines shell variable rather than just appending to it (or in one case
    prepending), all other targets append something to it, including other
    mips* triplets.
    I believe (just from looking at config.gcc) that the difference is that
    LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4 HEAP_TRAMPOLINES_INIT=0
    isn't defined without the patch and is with the patch.
    
    I think defining those first 4 shouldn't cause any harm and defining the
    last one is required for it to actually build at all.
    
    2023-11-27  Jakub Jelinek  <jakub@redhat.com>
    
            PR target/112300
            * config.gcc (mips*-sde-elf*): Append to tm_defines rather than
            overwriting them.

Diff:
---
 gcc/config.gcc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 0791f195981..3000379cafc 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2681,22 +2681,22 @@ mips*-sde-elf*)
 	esac
 	case ${target} in
 	  mipsisa32r6*)
-	    tm_defines="MIPS_ISA_DEFAULT=MIPS_ISA_MIPS32R6 MIPS_ABI_DEFAULT=ABI_32"
+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=MIPS_ISA_MIPS32R6 MIPS_ABI_DEFAULT=ABI_32"
 	    ;;
 	  mipsisa32r2*)
-	    tm_defines="MIPS_ISA_DEFAULT=MIPS_ISA_MIPS32R2 MIPS_ABI_DEFAULT=ABI_32"
+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=MIPS_ISA_MIPS32R2 MIPS_ABI_DEFAULT=ABI_32"
 	    ;;
 	  mipsisa32*)
-	    tm_defines="MIPS_ISA_DEFAULT=MIPS_ISA_MIPS32 MIPS_ABI_DEFAULT=ABI_32"
+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=MIPS_ISA_MIPS32 MIPS_ABI_DEFAULT=ABI_32"
 	    ;;
 	  mipsisa64r6*)
-	    tm_defines="MIPS_ISA_DEFAULT=MIPS_ISA_MIPS64R6 MIPS_ABI_DEFAULT=ABI_N32"
+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=MIPS_ISA_MIPS64R6 MIPS_ABI_DEFAULT=ABI_N32"
 	    ;;
 	  mipsisa64r2*)
-	    tm_defines="MIPS_ISA_DEFAULT=MIPS_ISA_MIPS64R2 MIPS_ABI_DEFAULT=ABI_N32"
+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=MIPS_ISA_MIPS64R2 MIPS_ABI_DEFAULT=ABI_N32"
 	    ;;
 	  mipsisa64*)
-	    tm_defines="MIPS_ISA_DEFAULT=MIPS_ISA_MIPS64 MIPS_ABI_DEFAULT=ABI_N32"
+	    tm_defines="${tm_defines} MIPS_ISA_DEFAULT=MIPS_ISA_MIPS64 MIPS_ABI_DEFAULT=ABI_N32"
 	    ;;
 	esac
 	;;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-11-27  8:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-27  8:23 [gcc r14-5868] mips: Fix up mips*-sde-elf* build [PR112300] Jakub Jelinek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).