From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eKYIOOh1emIAdAUAWB0awg (envelope-from ) for ; Tue, 10 May 2022 10:25:44 -0400 Received: by simark.ca (Postfix, from userid 112) id E14461E21F; Tue, 10 May 2022 10:25:44 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=Su/CERlz; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 1D8631E01D for ; Tue, 10 May 2022 10:25:44 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 868A43954403 for ; Tue, 10 May 2022 14:25:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 868A43954403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1652192743; bh=2Uw6tSipQPt5kDSa2Veu3gRyZzhxCw6Au7F4oPJy3eo=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Su/CERlz8jv66OaqOwNslQJrTb0dJfMYMQLK73+DWbjTiYG2Ji2Ca6cV+srYUTArr ilJAPZaZF2ryVKsAByqbu6naOq1uzRzJvT17ZwScrkctRsBeZkK4J6MvbYfmjh+YRR C9wZY6QXtKTpzIR6o0qPGUNszdOPUNTQGq04Dwcw= Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by sourceware.org (Postfix) with ESMTPS id 6866B394882E for ; Tue, 10 May 2022 14:24:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6866B394882E X-IronPort-AV: E=McAfee;i="6400,9594,10342"; a="256925965" X-IronPort-AV: E=Sophos;i="5.91,214,1647327600"; d="scan'208";a="256925965" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2022 07:24:52 -0700 X-IronPort-AV: E=Sophos;i="5.91,214,1647327600"; d="scan'208";a="552858773" Received: from labpcdell3650-003.iul.intel.com (HELO localhost) ([172.28.49.87]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2022 07:24:51 -0700 To: gdb-patches@sourceware.org Subject: [PATCH 01/18] gdb/testsuite: remove F77_FOR_TARGET support Date: Tue, 10 May 2022 16:24:20 +0200 Message-Id: <20220510142437.1397399-2-nils-christian.kempke@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220510142437.1397399-1-nils-christian.kempke@intel.com> References: <20220510142437.1397399-1-nils-christian.kempke@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Nils-Christian Kempke via Gdb-patches Reply-To: Nils-Christian Kempke Cc: JiniSusan.George@amd.com, aburgess@redhat.com Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" The last uses of the F77_FOR_TARGET via passing f77 to GDB's compile procedure were removed in this commit commit 0ecee54cfd04a60e7ca61ae07c72b20e21390257 Author: Tom Tromey Date: Wed Jun 29 17:50:47 2011 +0000 over 10 years ago. The last .f files in the testsuite by now are all being compiled by passing 'f90' to the GDB compile, thus only actually using F90_FOR_TARGET (array-element.f, block-data.f, subarray.f). Gfortran in this case is backwards compatible with most f77 code as claimed on gcc.gnu.org/fortran. The reason we'd like to get rid of this now is, that we'll be implementing a Fortran compiler identification mechanism, similar to the C/Cpp existing ones. It would be using the Fortran preprocessor macro defines to identify the Fortran compiler version at hand. We found it inconsequent to only implement this for f90 but, on the other hand, f77 seems deprecated. So, with this commit we remove the remaining lines for its support. --- gdb/testsuite/boards/cc-with-tweaks.exp | 5 ----- gdb/testsuite/boards/debug-types.exp | 1 - gdb/testsuite/boards/gold-gdb-index.exp | 1 - gdb/testsuite/lib/future.exp | 21 +-------------------- gdb/testsuite/lib/gdb.exp | 14 ++++---------- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/gdb/testsuite/boards/cc-with-tweaks.exp b/gdb/testsuite/boards/cc-with-tweaks.exp index b7ff98fba9..fe5b9eee27 100644 --- a/gdb/testsuite/boards/cc-with-tweaks.exp +++ b/gdb/testsuite/boards/cc-with-tweaks.exp @@ -44,7 +44,6 @@ set found_gcc [find_gcc] set found_gxx [find_g++] set found_gnatmake [find_gnatmake] set found_f90 [find_gfortran] -set found_f77 [find_g77] set_board_info compiler "$found_gcc" set contrib_dir [file normalize $srcdir/../contrib] @@ -64,10 +63,6 @@ if ![info exists F90_FOR_TARGET] { set F90_FOR_TARGET "$found_f90" } set F90_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $F90_FOR_TARGET" -if ![info exists F77_FOR_TARGET] { - set F77_FOR_TARGET "$found_f77" -} -set F77_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $F77_FOR_TARGET" set env(GDB) \ [cached_file gdb.sh "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS \"\$@\"" 1] diff --git a/gdb/testsuite/boards/debug-types.exp b/gdb/testsuite/boards/debug-types.exp index f04a733ac2..1c4982225d 100644 --- a/gdb/testsuite/boards/debug-types.exp +++ b/gdb/testsuite/boards/debug-types.exp @@ -29,7 +29,6 @@ set found_gcc [find_gcc] set found_gxx [find_g++] set found_gnatmake [find_gnatmake] set found_f90 [find_gfortran] -set found_f77 [find_g77] set_board_info compiler "$found_gcc" # The -fdebug-types-section switch only has an effect with DWARF version 4. diff --git a/gdb/testsuite/boards/gold-gdb-index.exp b/gdb/testsuite/boards/gold-gdb-index.exp index 30d2d8b329..f62f489266 100644 --- a/gdb/testsuite/boards/gold-gdb-index.exp +++ b/gdb/testsuite/boards/gold-gdb-index.exp @@ -29,7 +29,6 @@ set found_gcc [find_gcc] set found_gxx [find_g++] set found_gnatmake [find_gnatmake] set found_f90 [find_gfortran] -set found_f77 [find_g77] set_board_info compiler "$found_gcc" set opts [list] diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp index 2d68498623..36dd611d61 100644 --- a/gdb/testsuite/lib/future.exp +++ b/gdb/testsuite/lib/future.exp @@ -246,18 +246,6 @@ proc gdb_default_target_compile_1 {source destfile type options} { } } - if { $i == "f77" } { - set compiler_type "f77" - if {[board_info $dest exists f77flags]} { - append add_flags " [target_info f77flags]" - } - if {[board_info $dest exists f77compiler]} { - set compiler [target_info f77compiler] - } else { - set compiler [find_g77] - } - } - if { $i == "f90" } { set compiler_type "f90" if {[board_info $dest exists f90flags]} { @@ -359,7 +347,6 @@ proc gdb_default_target_compile_1 {source destfile type options} { global CC_FOR_TARGET global CXX_FOR_TARGET global D_FOR_TARGET - global F77_FOR_TARGET global F90_FOR_TARGET global GNATMAKE_FOR_TARGET global GO_FOR_TARGET @@ -390,12 +377,6 @@ proc gdb_default_target_compile_1 {source destfile type options} { } } - if {[info exists F77_FOR_TARGET]} { - if { $compiler_type == "f77" } { - set compiler $F77_FOR_TARGET - } - } - if {[info exists F90_FOR_TARGET]} { if { $compiler_type == "f90" } { set compiler $F90_FOR_TARGET @@ -646,7 +627,7 @@ proc gdb_default_target_compile {source destfile type options} { set need_local_lang 0 } - if { $i == "f77" || $i == "f90" } { + if { $i == "f90" } { set need_local_lang [info exists use_gdb_compile(fortran)] } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 47cb2b2367..75e2d5a697 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4363,8 +4363,8 @@ set gdb_saved_set_unbuffered_mode_obj "" # - ldflags=flag: Add FLAG to the linker flags. # - incdir=path: Add PATH to the searched include directories. # - libdir=path: Add PATH to the linker searched directories. -# - ada, c++, f77, f90, go, rust: Compile the file as Ada, C++, -# Fortran 77, Fortran 90, Go or Rust. +# - ada, c++, f90, go, rust: Compile the file as Ada, C++, +# Fortran 90, Go or Rust. # - debug: Build with debug information. # - optimize: Build with optimization. @@ -4397,7 +4397,6 @@ proc gdb_compile {source dest type options} { if {[lsearch -exact $options getting_compiler_info] == -1 && [lsearch -exact $options rust] == -1 && [lsearch -exact $options ada] == -1 - && [lsearch -exact $options f77] == -1 && [lsearch -exact $options f90] == -1 && [lsearch -exact $options go] == -1 && [test_compiler_info "clang-*"]} { @@ -4426,8 +4425,7 @@ proc gdb_compile {source dest type options} { # Place (and look for) Fortran `.mod` files in the output # directory for this specific test. - if {[lsearch -exact $options f77] != -1 \ - || [lsearch -exact $options f90] != -1 } { + if { [lsearch -exact $options f90] != -1 } { # Fortran compile. set mod_path [standard_output_file ""] if [test_compiler_info "gcc-*"] { @@ -4668,11 +4666,7 @@ proc gdb_compile {source dest type options} { } if {[lsearch $options quiet] < 0} { - # We shall update this on a per language basis, to avoid - # changing the entire testsuite in one go. - if {[lsearch $options f77] >= 0} { - gdb_compile_test $source $result - } elseif { $result != "" } { + if { $result != "" } { clone_output "gdb compile failed, $result" } } -- 2.25.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928