I've tested this on x86_64-darwin and will do so on powerpc64le-linux (to
check a GNU sed). However, I am not set up to test on Windows or VxWorks
both of which have been mentioned in recent patches. Currently,
--enable-languages=all bootstrap is broken on Darwin.
OK for trunk?
thanks
Iain
--- 8< ---
We create s-intnam.s using a sed script. This uses the a, c and i commands
which (for Posix sed versions) all require syntax like:
[1addr]a\
text
Write text to standard output as described previously.
The current script delimits the text with only a space (rather than \<newline>)
which leads to a build fail since the s-intnam.ads is not created.
gcc/ada/ChangeLog:
* xsintnam.sed: Posix-ify the a, c and i commands.
Signed-off-by: Iain Sandoe <[email protected]>
---
gcc/ada/xsintnam.sed | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/gcc/ada/xsintnam.sed b/gcc/ada/xsintnam.sed
index 45c80f41257..883ac9700be 100644
--- a/gcc/ada/xsintnam.sed
+++ b/gcc/ada/xsintnam.sed
@@ -1,8 +1,10 @@
#Indicate that the output was generated.
-/package Ada.Interrupts.Names/i -- Generated from Ada.Interrupts.Names for
use by pragma Interrupt_State
+/package Ada.Interrupts.Names/i\
+-- Generated from Ada.Interrupts.Names for use by pragma Interrupt_State
#Disable style checks.
-/package Ada.Interrupts.Names/i pragma Style_Checks ("N");
+/package Ada.Interrupts.Names/i\
+pragma Style_Checks ("N");
#Turn constants into named numbers.
s/constant Interrupt_ID/constant/g
@@ -12,7 +14,8 @@ s/package Ada.Interrupts.Names/package System.Interrupt_Names
with Preelaborate/
s/end Ada.Interrupts.Names/end System.Interrupt_Names/g
#Update the copyright header.
-/A D A . I N T E R R U P T S . N A M E S/c -- S Y S T E M . I N
T E R R U P T S _ N A M E S --
+/A D A . I N T E R R U P T S . N A M E S/c\
+-- S Y S T E M . I N T E R R U P T S _ N A M E S --
#The VxWorks and RTEMS versions of Ada.Interrupts.Names define a
Hardware_Interrupts
#subtype that references Interrupt_ID. Filter the subtype definition.
@@ -23,5 +26,7 @@ s/end Ada.Interrupts.Names/end System.Interrupt_Names/g
#The VxWorks and RTEMS versions of Ada.Interrupts.Names also don't define any
#interrupt constants, so just removing the subtype declaration we get an
"unused
#with clause" warning. Silence it.
-/with System.OS_Interface;/i pragma Warnings (Off);
-/with System.OS_Interface;/a pragma Warnings (On);
+/with System.OS_Interface;/i\
+pragma Warnings (Off);
+/with System.OS_Interface;/a\
+pragma Warnings (On);
--
2.50.1 (Apple Git-155)
