diff options
| author | Gaius Mulley <gaius.mulley@southwales.ac.uk> | 2022-06-26 13:50:27 +0100 |
|---|---|---|
| committer | Gaius Mulley <gaius.mulley@southwales.ac.uk> | 2022-06-26 13:50:27 +0100 |
| commit | 60bd34a45bfed0da9605606a5596b96d8f13e5cb (patch) | |
| tree | f3e35cfecd6dbfef351b56a16b07243a8a0d1756 /gcc/m2/bnf/gm2l.bnf | |
| parent | 6c02f7ca5c93f4ea57fb7701b5daebc9e5cd3e94 (diff) | |
| download | gcc-60bd34a45bfed0da9605606a5596b96d8f13e5cb.tar.gz | |
Fixes to allow -fcpp and regression test link changes.
This patch fixes (re-introduces) the -fcpp option and it
migrates more testsuite tcl files to use the new linking mechanism.
2022-06-26 Gaius Mulley <gaius.mulley@southwales.ac.uk>
gcc/m2/ChangeLog:
* bnf/gm2l.bnf (ScanArgs): -fcppbegin changed to -fcpp-begin.
* gm2-compiler/M2DriverOptions.mod (ScanCppArgs):
-fcppbegin changed to -fcpp-begin, -fcppend changed to
-fcpp-end.
* gm2-compiler/M2GenGCC.mod (CodeFinallyEnd): Check
we are compiling the main module before generating
the scaffold.
* gm2-compiler/M2Options.mod (CppRemember): -fcppbegin
changed to -fcpp-begin. (CppArg) -fcppbegin
changed to -fcpp-begin, -fcppend changed to -fcpp-end.
-fcppprog changed to -fcpp-prog.
* gm2-compiler/P2SymBuild.mod (BlockEnd): Added assert.
(PopBlock) bug fix, curModuleSym is popped in
correct sequence.
* gm2-lang.cc (gm2_langhook_init_options):
-fcppbegin changed to -fcpp-begin. -fcppend changed to
-fcpp-end. -fcppprog changed to -fcpp-prog.
* gm2spec.cc (get_libexec): New function.
(gen_gm2_libexec) New function. (add_exec_dir) New function.
(lang_register_spec_functions) add exec_prefix.
* lang-specs.h: -fcppbegin changed to -fcpp-begin.
-fcppend changed to -fcpp-end.
* lang.opt: Uniform internal switch statement used
where necessary. -fcppbegin changed to -fcpp-begin.
-fcppend changed to -fcpp-end. -fcppprog= changed to -fcpp-prog=.
libgm2/Changelog:
* libm2iso/m2rts.h: (New file).
Signed-off-by: Gaius Mulley <gaius.mulley@southwales.ac.uk>
Diffstat (limited to 'gcc/m2/bnf/gm2l.bnf')
| -rw-r--r-- | gcc/m2/bnf/gm2l.bnf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/m2/bnf/gm2l.bnf b/gcc/m2/bnf/gm2l.bnf index 5d1fb880a3f..88cbb1ddc62 100644 --- a/gcc/m2/bnf/gm2l.bnf +++ b/gcc/m2/bnf/gm2l.bnf @@ -867,7 +867,7 @@ BEGIN ELSIF EqualArray(Mark (Slice (s, 0, 6)), '-fmod=') THEN SetModExtension (Slice (s, 6, 0)) - ELSIF EqualArray (s, '-fcppbegin') + ELSIF EqualArray (s, '-fcpp-begin') THEN i := ScanCppArgs (i) ELSIF EqualArray (s, '--M2RTS') OR EqualArray (s, '-M2RTS') |