From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (wildebeest.demon.nl [212.238.236.112]) by sourceware.org (Postfix) with ESMTPS id 723603853C36 for ; Tue, 3 Aug 2021 21:17:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 723603853C36 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x0c.wildebeest.org [172.31.17.142]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 7DFDE30291A9; Tue, 3 Aug 2021 23:17:40 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id C2CC22E80E5C; Tue, 3 Aug 2021 23:17:39 +0200 (CEST) From: Mark Wielaard To: gcc-rust@gcc.gnu.org Cc: Mark Wielaard Subject: [PATCH] Remove split-stack from backend Date: Tue, 3 Aug 2021 23:17:36 +0200 Message-Id: <20210803211736.215366-1-mark@klomp.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-rust@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: gcc-rust mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Aug 2021 21:17:44 -0000 The backend was derived from the go backend which enables split stack support by default. This inserts a __morestack call at the start of each function. This is not needed for the rust backend. Remove the split stack support code from the rust backend and spec. --- gcc/rust/rust-backend.h | 12 ++++------- gcc/rust/rust-gcc.cc | 5 ----- gcc/rust/rustspec.cc | 47 ----------------------------------------- 3 files changed, 4 insertions(+), 60 deletions(-) diff --git a/gcc/rust/rust-backend.h b/gcc/rust/rust-backend.h index 4635796e953..1af76cfcc10 100644 --- a/gcc/rust/rust-backend.h +++ b/gcc/rust/rust-backend.h @@ -790,27 +790,23 @@ public: // recover and must be visible for correct panic recovery. static const unsigned int function_is_inlinable = 1 << 2; - // Set if the function may not split the stack. This is set for the - // implementation of recover itself, among other things. - static const unsigned int function_no_split_stack = 1 << 3; - // Set if the function does not return. This is set for the // implementation of panic. - static const unsigned int function_does_not_return = 1 << 4; + static const unsigned int function_does_not_return = 1 << 3; // Set if the function should be put in a unique section if // possible. This is used for field tracking. - static const unsigned int function_in_unique_section = 1 << 5; + static const unsigned int function_in_unique_section = 1 << 4; // Set if the function should be available for inlining in the // backend, but should not be emitted as a standalone function. Any // call to the function that is not inlined should be treated as a // call to a function defined in a different compilation unit. This // is like a C99 function marked inline but not extern. - static const unsigned int function_only_inline = 1 << 6; + static const unsigned int function_only_inline = 1 << 5; // const function - static const unsigned int function_read_only = 1 << 7; + static const unsigned int function_read_only = 1 << 6; // Declare or define a function of FNTYPE. // NAME is the Go name of the function. ASM_NAME, if not the empty diff --git a/gcc/rust/rust-gcc.cc b/gcc/rust/rust-gcc.cc index 3e47a7cba7a..5c37cea20da 100644 --- a/gcc/rust/rust-gcc.cc +++ b/gcc/rust/rust-gcc.cc @@ -3382,11 +3382,6 @@ Gcc_backend::function (Btype *fntype, const std::string &name, } if ((flags & function_is_inlinable) == 0) DECL_UNINLINABLE (decl) = 1; - if ((flags & function_no_split_stack) != 0) - { - tree attr = get_identifier ("no_split_stack"); - DECL_ATTRIBUTES (decl) = tree_cons (attr, NULL_TREE, NULL_TREE); - } if ((flags & function_does_not_return) != 0) TREE_THIS_VOLATILE (decl) = 1; if ((flags & function_in_unique_section) != 0) diff --git a/gcc/rust/rustspec.cc b/gcc/rust/rustspec.cc index 28c2d9a38fe..12ec874d222 100644 --- a/gcc/rust/rustspec.cc +++ b/gcc/rust/rustspec.cc @@ -104,9 +104,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, /* The total number of arguments with the new stuff. */ int num_args = 1; - /* Supports split stack */ - int supports_split_stack = 0; - /* Whether the -o option was used. */ bool saw_opt_o = false; @@ -118,11 +115,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, /* Whether the -S option was used. */ bool saw_opt_S = false; -#ifdef TARGET_CAN_SPLIT_STACK_64BIT - /* Whether the -m64 option is in force. */ - bool is_m64 = TARGET_CAN_SPLIT_STACK_64BIT; -#endif - /* The first input file with an extension of .go. */ const char *first_go_file = NULL; @@ -159,16 +151,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, library = (library == 0) ? 1 : library; break; -#ifdef TARGET_CAN_SPLIT_STACK_64BIT - case OPT_m32: - is_m64 = false; - break; - - case OPT_m64: - is_m64 = true; - break; -#endif - case OPT_pg: case OPT_p: saw_profile_flag = true; @@ -253,23 +235,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, /* Copy the 0th argument, i.e., the name of the program itself. */ new_decoded_options[j++] = decoded_options[i++]; -#ifdef TARGET_CAN_SPLIT_STACK - supports_split_stack = 1; -#endif - -#ifdef TARGET_CAN_SPLIT_STACK_64BIT - if (is_m64) - supports_split_stack = 1; -#endif - - /* If we are linking, pass -fsplit-stack if it is supported. */ - if ((library >= 0) && supports_split_stack) - { - generate_option (OPT_fsplit_stack, NULL, 1, CL_DRIVER, - &new_decoded_options[j]); - j++; - } - /* NOTE: We start at 1 now, not 0. */ while (i < argc) { @@ -402,18 +367,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, generate_option (OPT_shared_libgcc, NULL, 1, CL_DRIVER, &new_decoded_options[j++]); - /* libgcc wraps pthread_create to support split stack, however, due to - relative ordering of -lpthread and -lgcc, we can't just mark - __real_pthread_create in libgcc as non-weak. But we need to link in - pthread_create from pthread if we are statically linking, so we work- - around by passing -u pthread_create to the linker. */ - if (static_link && supports_split_stack) - { - generate_option (OPT_Wl_, "-u,pthread_create", 1, CL_DRIVER, - &new_decoded_options[j]); - j++; - } - #if defined(TARGET_SOLARIS) && !defined(USE_GLD) /* We use a common symbol for go$zerovalue. On Solaris, when not using the GNU linker, the Solaris linker needs an option to not -- 2.32.0