From eafca96ffb53fdd805193635fda8b1e718532f2a Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 9 Oct 2020 09:49:57 +0200 Subject: [PATCH] [Ada] Cannot process -S -o with GNAT LLVM gcc/ada/ * opt.ads (Generate_Asm): New flag. * osint-c.adb (Set_Output_Object_File_Name): Accept any extension when generating assembly. * adabkend.adb (Scan_Compiler_Args): Recognize -S. --- gcc/ada/adabkend.adb | 3 +++ gcc/ada/opt.ads | 4 ++++ gcc/ada/osint-c.adb | 1 + 3 files changed, 8 insertions(+) diff --git a/gcc/ada/adabkend.adb b/gcc/ada/adabkend.adb index 6fb4a84b71f..b10c0bd94ca 100644 --- a/gcc/ada/adabkend.adb +++ b/gcc/ada/adabkend.adb @@ -218,6 +218,9 @@ package body Adabkend is end case; end if; + elsif Switch_Chars (First .. Last) = "S" then + Generate_Asm := True; + -- Ignore all other back-end switches elsif Is_Back_End_Switch (Switch_Chars) then diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads index 3e9f36edc7e..5017792a981 100644 --- a/gcc/ada/opt.ads +++ b/gcc/ada/opt.ads @@ -719,6 +719,10 @@ package Opt is -- the name is of the form .xxx, then to name.xxx where name is the source -- file name with extension stripped. + Generate_Asm : Boolean := False; + -- GNAT + -- True if generating assembly instead of an object file, via the -S switch + Generate_C_Code : Boolean := False; -- GNAT, GNATBIND -- If True, the Cprint circuitry to generate C code output is activated. diff --git a/gcc/ada/osint-c.adb b/gcc/ada/osint-c.adb index 0010a8deec1..8ef8b8bf093 100644 --- a/gcc/ada/osint-c.adb +++ b/gcc/ada/osint-c.adb @@ -480,6 +480,7 @@ package body Osint.C is or else (Name (NL - EL + Name'First .. Name'Last) /= Ext and then Name (NL - 2 + Name'First .. Name'Last) /= ".o" + and then not Generate_Asm and then (not Generate_C_Code or else Name (NL - 2 + Name'First .. Name'Last) /= ".c")) -- 2.30.2