This code was provoked by PR127204 which highlighted an incomplete set of
builtin tests. This patch completes all the testing of the GCC supported
builtin trig functions (required to implement the ISO libraries) and it
will enable the ISO library functionality appropriately. The GCC builtin
trig functions are also filtered on gm2 LONGREAL support through
(-fdump-builtins). Bootstrapped on amd64, ppcle64 and arm64 (debian,
freebsd51).
gcc/m2/ChangeLog:
* gm2-gcc/m2builtins.cc (define_builtin): Reimplement.
(do_define_builtin): New function.
(data_type_supported): Ditto.
(param_data_type_supported): Ditto.
(dump_builtin): Call dump_available if
param_data_type_supported.
* gm2-libs-iso-common/ComplexMath.def (arcsin): Replace
with template tag.
(arccos): Ditto.
(arctan): Ditto.
* gm2-libs-iso-common/ComplexMath.mod (arcsin): Replace
with template tag.
(arccos): Ditto.
(arctan): Ditto.
* gm2-libs-iso-common/LongComplexMath.def (arcsin): Replace
with template tag.
(arccos): Ditto.
(arctan): Ditto.
* gm2-libs-iso-common/LongComplexMath.mod (arcsin): Replace
with template tag.
(arccos): Ditto.
(arctan): Ditto.
* gm2-libs-iso-common/ShortComplexMath.def (arcsin): Replace
with template tag.
(arccos): Ditto.
(arctan): Ditto.
* gm2-libs-iso-common/ShortComplexMath.mod (arcsin): Replace
with template tag.
(arccos): Ditto.
(arctan): Ditto.
* gm2-libs-pim-common/Builtins.def (carcsinf): Replace
with template tag.
(carcsin): Ditto.
(carcsinl): Ditto.
(carccosf): Ditto.
(carccos): Ditto.
(carccosl): Ditto.
(carctanf): Ditto.
(carctan): Ditto.
(carctanl): Ditto.
* gm2-libs-pim-common/Builtins.mod: (carcsinf): Replace
with template tag.
(carcsin): Ditto.
(carcsinl): Ditto.
(carccosf): Ditto.
(carccos): Ditto.
(carccosl): Ditto.
(carctanf): Ditto.
(carctan): Ditto.
(carctanl): Ditto.
* gm2-libs-pim-common/cbuiltin.def (casinf): Replace
with template tag.
(casin): Ditto.
(casinl): Ditto.
(cacosf): Ditto.
(cacos): Ditto.
(cacosl): Ditto.
(catanf): Ditto.
(catan): Ditto.
(catanl): Ditto.
* gm2spec.cc (lang_specific_driver): Comment formatting.
* tools-src/mktargetsrc.py (do_output_mod_builtin): New
function.
(output_mod_builtin): Ditto.
(list_of_builtins): Add casin, casinf, casinl, cacos, cacosf,
cacosl, catan, catanf and catanl.
libgm2/ChangeLog:
* Makefile.am (GM2_FOR_TARGET_ESC): Remove.
* Makefile.in: Rebuild.
* libm2iso/Makefile.am (GM2_FOR_TARGET_ESC): Remove
and replace with "$(GM2_FOR_TARGET)".
* libm2iso/Makefile.in: Rebuild.
* libm2min/Makefile.am (GM2_FOR_TARGET_ESC): Remove
and replace with "$(GM2_FOR_TARGET)".
* libm2min/Makefile.in: Rebuild.
* libm2pim/Makefile.am (GM2_FOR_TARGET_ESC): Remove
and replace with "$(GM2_FOR_TARGET)".
* libm2pim/Makefile.in: Rebuild.
Signed-off-by: Gaius Mulley <[email protected]>
---
gcc/m2/gm2-gcc/m2builtins.cc | 90 ++++++++++++++++++-
gcc/m2/gm2-libs-iso-common/ComplexMath.def | 8 +-
gcc/m2/gm2-libs-iso-common/ComplexMath.mod | 21 +----
.../gm2-libs-iso-common/LongComplexMath.def | 8 +-
.../gm2-libs-iso-common/LongComplexMath.mod | 21 +----
.../gm2-libs-iso-common/ShortComplexMath.def | 8 +-
.../gm2-libs-iso-common/ShortComplexMath.mod | 21 +----
gcc/m2/gm2-libs-pim-common/Builtins.def | 27 +++---
gcc/m2/gm2-libs-pim-common/Builtins.mod | 51 ++---------
gcc/m2/gm2-libs-pim-common/cbuiltin.def | 21 ++---
gcc/m2/gm2spec.cc | 2 +-
gcc/m2/tools-src/mktargetsrc.py | 21 ++++-
libgm2/Makefile.am | 3 -
libgm2/Makefile.in | 3 -
libgm2/libm2iso/Makefile.am | 15 ++--
libgm2/libm2iso/Makefile.in | 15 ++--
libgm2/libm2min/Makefile.am | 2 +-
libgm2/libm2min/Makefile.in | 2 +-
libgm2/libm2pim/Makefile.am | 9 +-
libgm2/libm2pim/Makefile.in | 9 +-
20 files changed, 181 insertions(+), 176 deletions(-)
diff --git a/gcc/m2/gm2-gcc/m2builtins.cc b/gcc/m2/gm2-gcc/m2builtins.cc
index 01d429abc91..6cc94092659 100644
--- a/gcc/m2/gm2-gcc/m2builtins.cc
+++ b/gcc/m2/gm2-gcc/m2builtins.cc
@@ -1457,11 +1457,11 @@ dump_available (const char *name)
printf ("builtin procedure function: %s\n", name);
}
-/* Define a single builtin. */
+/* Declare the builtin and pushes it to the builtins_macros array. */
static void
-define_builtin (enum built_in_function val, const char *name, tree prototype,
- const char *libname, int flags)
+do_define_builtin (enum built_in_function val, const char *name,
+ tree prototype, const char *libname, int flags)
{
tree decl;
builtin_macro_definition bmd;
@@ -1485,6 +1485,86 @@ define_builtin (enum built_in_function val, const char
*name, tree prototype,
dump_available (libname);
}
+/* Return true if the data type is supported by the target and gm2. */
+
+static bool
+data_type_supported (tree datatype)
+{
+ if (M2Options_GetIEEELongDouble ())
+ {
+ /* Check to see the data type does not conflict with command
+ line option -mabi=ieeelongdouble. */
+ if (datatype == long_double_type_node
+ && datatype != m2type_GetM2LongRealType ())
+ return false;
+ if (TREE_CODE (datatype) == COMPLEX_TYPE
+ && (TREE_TYPE (datatype) == long_double_type_node)
+ && datatype != m2type_GetM2LongRealType ())
+ return false;
+ }
+ return true;
+}
+
+/* Return true if the datatypes in prototype are supported. */
+
+static bool
+param_data_type_supported (tree prototype)
+{
+ tree t = prototype;
+
+ // debug_tree (t);
+ if (TREE_CODE (t) == FUNCTION_DECL)
+ {
+ tree param_list = DECL_ARGUMENTS (t);
+ tree returnType = TREE_TYPE (TREE_TYPE (t));
+ if (! data_type_supported (returnType))
+ return false;
+ while (param_list != NULL_TREE)
+ {
+ t = param_list;
+ if (TREE_CODE (t) == PARM_DECL)
+ {
+ if (TREE_TYPE (t)
+ && (TREE_CODE (TREE_TYPE (t)) == REFERENCE_TYPE))
+ t = TREE_TYPE (TREE_TYPE (t));
+ else
+ t = TREE_TYPE (t);
+ if (! data_type_supported (t))
+ return false;
+ }
+ param_list = TREE_CHAIN (param_list);
+ }
+ }
+ else if (TREE_CODE (t) == FUNCTION_DECL)
+ {
+ tree param_list = TYPE_ARG_TYPES (t);
+ tree returnType = TREE_TYPE (TREE_TYPE (t));
+ if (! data_type_supported (returnType))
+ return false;
+ while (param_list != NULL_TREE)
+ {
+ t = param_list;
+ t = TREE_VALUE (t);
+ if (! data_type_supported (t))
+ return false;
+ param_list = TREE_CHAIN (param_list);
+ }
+ }
+ return true;
+}
+
+/* Check to ensure the parameter and return data types are supported.
+ For example the ppcle64 has multiple 128 bit long double datatypes.
+ But gm2 only supports IEEE 128. */
+
+static void
+define_builtin (enum built_in_function val, const char *name, tree prototype,
+ const char *libname, int flags)
+{
+ if (param_data_type_supported (prototype))
+ do_define_builtin (val, name, prototype, libname, flags);
+}
+
/* Define a math type variant of the builtin function. */
static
@@ -1545,7 +1625,9 @@ static
void
dump_builtin (struct builtin_function_entry *fe)
{
- if (M2Options_GetDumpBuiltins () && do_target_support_exists (fe))
+ if (M2Options_GetDumpBuiltins ()
+ && do_target_support_exists (fe)
+ && param_data_type_supported (fe->function_node))
dump_available (fe->name);
}
diff --git a/gcc/m2/gm2-libs-iso-common/ComplexMath.def
b/gcc/m2/gm2-libs-iso-common/ComplexMath.def
index 96df692456d..5da9b388a4b 100644
--- a/gcc/m2/gm2-libs-iso-common/ComplexMath.def
+++ b/gcc/m2/gm2-libs-iso-common/ComplexMath.def
@@ -48,13 +48,13 @@ PROCEDURE __BUILTIN__ ln (z: COMPLEX): COMPLEX;
(* <DEF_TARGET_PROCEDURE(tan,COMPLEX,COMPLEX,__builtin_ctan,cbuiltin.ctan)>
*)
(* Returns the tangent of z *)
-PROCEDURE __BUILTIN__ arcsin (z: COMPLEX): COMPLEX;
- (* Returns the arcsine of z *)
+ (*
<DEF_TARGET_PROCEDURE(arcsin,COMPLEX,COMPLEX,__builtin_arcsin,cbuiltin.arcsin)>
*)
+ (* Returns the arcsine of z *)
-PROCEDURE __BUILTIN__ arccos (z: COMPLEX): COMPLEX;
+ (*
<DEF_TARGET_PROCEDURE(arccos,COMPLEX,COMPLEX,__builtin_arccos,cbuiltin.arccos)>
*)
(* Returns the arccosine of z *)
-PROCEDURE __BUILTIN__ arctan (z: COMPLEX): COMPLEX;
+ (*
<DEF_TARGET_PROCEDURE(arctan,COMPLEX,COMPLEX,__builtin_arctan,cbuiltin.arctan)>
*)
(* Returns the arctangent of z *)
PROCEDURE polarToComplex (abs, arg: REAL): COMPLEX;
diff --git a/gcc/m2/gm2-libs-iso-common/ComplexMath.mod
b/gcc/m2/gm2-libs-iso-common/ComplexMath.mod
index fbade8c4d91..c4a22d0f1a1 100644
--- a/gcc/m2/gm2-libs-iso-common/ComplexMath.mod
+++ b/gcc/m2/gm2-libs-iso-common/ComplexMath.mod
@@ -94,29 +94,14 @@ END ln ;
(* Returns the tangent of z *)
(* <MOD_TARGET_PROCEDURE(tan,COMPLEX,COMPLEX,__builtin_ctan,cbuiltin.ctan)> *)
-
(* Returns the arcsine of z *)
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_carcsin)) arcsin (z: COMPLEX):
COMPLEX;
-BEGIN
- RETURN cbuiltin.casin (z)
-END arcsin ;
-
+(*
<MOD_TARGET_PROCEDURE(arcsin,COMPLEX,COMPLEX,__builtin_carcsin,cbuiltin.casin)>
*)
(* Returns the arccosine of z *)
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_carccos)) arccos (z: COMPLEX):
COMPLEX;
-BEGIN
- RETURN cbuiltin.cacos (z)
-END arccos ;
-
+(*
<MOD_TARGET_PROCEDURE(arccos,COMPLEX,COMPLEX,__builtin_carccos,cbuiltin.cacos)>
*)
(* Returns the arctangent of z *)
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_carctan)) arctan (z: COMPLEX):
COMPLEX;
-BEGIN
- RETURN cbuiltin.catan (z)
-END arctan ;
+(*
<MOD_TARGET_PROCEDURE(arctan,COMPLEX,COMPLEX,__builtin_carctan,cbuiltin.catan)>
*)
(* Returns the complex number with the specified polar coordinates *)
diff --git a/gcc/m2/gm2-libs-iso-common/LongComplexMath.def
b/gcc/m2/gm2-libs-iso-common/LongComplexMath.def
index 86c67a15a41..ad18e9c24bb 100644
--- a/gcc/m2/gm2-libs-iso-common/LongComplexMath.def
+++ b/gcc/m2/gm2-libs-iso-common/LongComplexMath.def
@@ -48,13 +48,13 @@ PROCEDURE ln (z: LONGCOMPLEX): LONGCOMPLEX;
(* Returns the tangent of z *)
(*
<DEF_TARGET_PROCEDURE(tan,LONGCOMPLEX,LONGCOMPLEX,__builtin_ctanl,cbuiltin.ctanl)>
*)
-PROCEDURE arcsin (z: LONGCOMPLEX): LONGCOMPLEX;
- (* Returns the arcsine of z *)
+ (*
<DEF_TARGET_PROCEDURE(arcsin,LONGCOMPLEX,LONGCOMPLEX,__builtin_arcsin,cbuiltin.arcsin)>
*)
+ (* Returns the arcsine of z *)
-PROCEDURE arccos (z: LONGCOMPLEX): LONGCOMPLEX;
+ (*
<DEF_TARGET_PROCEDURE(arccos,LONGCOMPLEX,LONGCOMPLEX,__builtin_arccos,cbuiltin.arccos)>
*)
(* Returns the arccosine of z *)
-PROCEDURE arctan (z: LONGCOMPLEX): LONGCOMPLEX;
+ (*
<DEF_TARGET_PROCEDURE(arctan,LONGCOMPLEX,LONGCOMPLEX,__builtin_arctan,cbuiltin.arctan)>
*)
(* Returns the arctangent of z *)
PROCEDURE polarToComplex (abs, arg: LONGREAL): LONGCOMPLEX;
diff --git a/gcc/m2/gm2-libs-iso-common/LongComplexMath.mod
b/gcc/m2/gm2-libs-iso-common/LongComplexMath.mod
index 9203bbfcad8..36ac1b00a24 100644
--- a/gcc/m2/gm2-libs-iso-common/LongComplexMath.mod
+++ b/gcc/m2/gm2-libs-iso-common/LongComplexMath.mod
@@ -94,29 +94,14 @@ END ln ;
(* Returns the tangent of z *)
(*
<MOD_TARGET_PROCEDURE(tan,LONGCOMPLEX,LONGCOMPLEX,__builtin_ctanl,cbuiltin.ctanl)>
*)
-
(* Returns the arcsine of z *)
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_carcsinl)) arcsin (z:
LONGCOMPLEX): LONGCOMPLEX;
-BEGIN
- RETURN cbuiltin.casinl (z)
-END arcsin ;
-
+(*
<MOD_TARGET_PROCEDURE(arcsin,LONGCOMPLEX,LONGCOMPLEX,__builtin_carcsinl,cbuiltin.casinl)>
*)
(* Returns the arccosine of z *)
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_carccosl)) arccos (z:
LONGCOMPLEX): LONGCOMPLEX;
-BEGIN
- RETURN cbuiltin.cacosl (z)
-END arccos ;
-
+(*
<MOD_TARGET_PROCEDURE(arccos,LONGCOMPLEX,LONGCOMPLEX,__builtin_carccosl,cbuiltin.cacosl)>
*)
(* Returns the arctangent of z *)
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_carctanl)) arctan (z:
LONGCOMPLEX): LONGCOMPLEX;
-BEGIN
- RETURN cbuiltin.catanl (z)
-END arctan ;
+(*
<MOD_TARGET_PROCEDURE(arctan,LONGCOMPLEX,LONGCOMPLEX,__builtin_carctanl,cbuiltin.catanl)>
*)
(* Returns the complex number with the specified polar coordinates *)
diff --git a/gcc/m2/gm2-libs-iso-common/ShortComplexMath.def
b/gcc/m2/gm2-libs-iso-common/ShortComplexMath.def
index d9c698ed5b7..a3b1e60f621 100644
--- a/gcc/m2/gm2-libs-iso-common/ShortComplexMath.def
+++ b/gcc/m2/gm2-libs-iso-common/ShortComplexMath.def
@@ -63,13 +63,13 @@ PROCEDURE ln (z: SHORTCOMPLEX): SHORTCOMPLEX;
(* Returns the tangent of z *)
(*
<DEF_TARGET_PROCEDURE(tan,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_ctanf,cbuiltin.ctanf)>
*)
-PROCEDURE arcsin (z: SHORTCOMPLEX): SHORTCOMPLEX;
- (* Returns the arcsine of z *)
+ (*
<DEF_TARGET_PROCEDURE(arcsin,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_arcsin,cbuiltin.arcsin)>
*)
+ (* Returns the arcsine of z *)
-PROCEDURE arccos (z: SHORTCOMPLEX): SHORTCOMPLEX;
+ (*
<DEF_TARGET_PROCEDURE(arccos,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_arccos,cbuiltin.arccos)>
*)
(* Returns the arccosine of z *)
-PROCEDURE arctan (z: SHORTCOMPLEX): SHORTCOMPLEX;
+ (*
<DEF_TARGET_PROCEDURE(arctan,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_arctan,cbuiltin.arctan)>
*)
(* Returns the arctangent of z *)
PROCEDURE polarToComplex (abs, arg: SHORTREAL): SHORTCOMPLEX;
diff --git a/gcc/m2/gm2-libs-iso-common/ShortComplexMath.mod
b/gcc/m2/gm2-libs-iso-common/ShortComplexMath.mod
index acfbcb0b50b..e209975e894 100644
--- a/gcc/m2/gm2-libs-iso-common/ShortComplexMath.mod
+++ b/gcc/m2/gm2-libs-iso-common/ShortComplexMath.mod
@@ -94,29 +94,14 @@ END ln ;
(* Returns the tangent of z *)
(*
<MOD_TARGET_PROCEDURE(tan,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_ctanf,cbuiltin.ctanf)>
*)
-
(* Returns the arcsine of z *)
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_carcsinf)) arcsin (z:
SHORTCOMPLEX): SHORTCOMPLEX;
-BEGIN
- RETURN cbuiltin.casinf (z)
-END arcsin ;
-
+(*
<MOD_TARGET_PROCEDURE(arcsin,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_carcsinf,cbuiltin.casinf)>
*)
(* Returns the arccosine of z *)
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_carccosf)) arccos (z:
SHORTCOMPLEX): SHORTCOMPLEX;
-BEGIN
- RETURN cbuiltin.cacosf (z)
-END arccos ;
-
+(*
<MOD_TARGET_PROCEDURE(arccos,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_carccosf,cbuiltin.cacosf)>
*)
(* Returns the arctangent of z *)
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_carctanf)) arctan (z:
SHORTCOMPLEX): SHORTCOMPLEX;
-BEGIN
- RETURN cbuiltin.catanf (z)
-END arctan ;
+(*
<MOD_TARGET_PROCEDURE(arctan,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_carctanf,cbuiltin.catanf)>
*)
(* Returns the complex number with the specified polar coordinates *)
diff --git a/gcc/m2/gm2-libs-pim-common/Builtins.def
b/gcc/m2/gm2-libs-pim-common/Builtins.def
index 126b8e3c3bf..36e7652009c 100644
--- a/gcc/m2/gm2-libs-pim-common/Builtins.def
+++ b/gcc/m2/gm2-libs-pim-common/Builtins.def
@@ -187,19 +187,19 @@ PROCEDURE __BUILTIN__ clnl (z: LONGCOMPLEX) : LONGCOMPLEX
;
(* <DEF_BUILTIN_PROCEDURE(ctan,COMPLEX,COMPLEX,__builtin_ctan,cbuiltin.ctan)>
*)
(*
<DEF_BUILTIN_PROCEDURE(ctanl,LONGCOMPLEX,LONGCOMPLEX,__builtin_ctanl,cbuiltin.ctanl)>
*)
-PROCEDURE __BUILTIN__ carcsinf (z: SHORTCOMPLEX) : SHORTCOMPLEX ;
-PROCEDURE __BUILTIN__ carcsin (z: COMPLEX) : COMPLEX ;
-PROCEDURE __BUILTIN__ carcsinl (z: LONGCOMPLEX) : LONGCOMPLEX ;
+(*
<DEF_BUILTIN_PROCEDURE(carsinf,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_carsinf,cbuiltin.carsinf)>
*)
+(*
<DEF_BUILTIN_PROCEDURE(carsin,COMPLEX,COMPLEX,__builtin_carsin,cbuiltin.carsin)>
*)
+(*
<DEF_BUILTIN_PROCEDURE(carsinl,LONGCOMPLEX,LONGCOMPLEX,__builtin_carsinl,cbuiltin.carsinl)>
*)
-PROCEDURE __BUILTIN__ carccosf (z: SHORTCOMPLEX) : SHORTCOMPLEX ;
-PROCEDURE __BUILTIN__ carccos (z: COMPLEX) : COMPLEX ;
-PROCEDURE __BUILTIN__ carccosl (z: LONGCOMPLEX) : LONGCOMPLEX ;
+(*
<DEF_BUILTIN_PROCEDURE(carcosf,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_carcosf,cbuiltin.carcosf)>
*)
+(*
<DEF_BUILTIN_PROCEDURE(carcos,COMPLEX,COMPLEX,__builtin_carcos,cbuiltin.carcos)>
*)
+(*
<DEF_BUILTIN_PROCEDURE(carcosl,LONGCOMPLEX,LONGCOMPLEX,__builtin_carcosl,cbuiltin.carcosl)>
*)
-PROCEDURE __BUILTIN__ carctanf (z: SHORTCOMPLEX) : SHORTCOMPLEX ;
-PROCEDURE __BUILTIN__ carctan (z: COMPLEX) : COMPLEX ;
-PROCEDURE __BUILTIN__ carctanl (z: LONGCOMPLEX) : LONGCOMPLEX ;
+(*
<DEF_BUILTIN_PROCEDURE(cartanf,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_cartanf,cbuiltin.cartanf)>
*)
+(*
<DEF_BUILTIN_PROCEDURE(cartan,COMPLEX,COMPLEX,__builtin_cartan,cbuiltin.cartan)>
*)
+(*
<DEF_BUILTIN_PROCEDURE(cartanl,LONGCOMPLEX,LONGCOMPLEX,__builtin_cartanl,cbuiltin.cartanl)>
*)
-(* memory and string intrincic procedure functions *)
+(* Memory and string intrincic procedure functions. *)
PROCEDURE __BUILTIN__ alloca (i: CARDINAL) : ADDRESS ;
PROCEDURE __BUILTIN__ memcpy (dest, src: ADDRESS;
@@ -234,10 +234,9 @@ PROCEDURE __BUILTIN__ clzll (value: LONGCARD) : INTEGER ;
PROCEDURE __BUILTIN__ ctz (value: CARDINAL) : INTEGER ;
PROCEDURE __BUILTIN__ ctzll (value: LONGCARD) : INTEGER ;
-(*
- longjmp - this GCC builtin restricts the val to always 1.
-*)
-(* do not use these two builtins, as gcc, only really
+(* The longjmp GCC builtin restricts the val to always 1. *)
+
+(* Do not use these two builtins, as gcc, only really
anticipates that the Ada front end should use them
and it only uses them in its runtime exception handling.
We leave them here in the hope that someday they will
diff --git a/gcc/m2/gm2-libs-pim-common/Builtins.mod
b/gcc/m2/gm2-libs-pim-common/Builtins.mod
index 8e6fe677808..5a14dc9eb70 100644
--- a/gcc/m2/gm2-libs-pim-common/Builtins.mod
+++ b/gcc/m2/gm2-libs-pim-common/Builtins.mod
@@ -445,50 +445,17 @@ END clnl ;
(* <MOD_BUILTIN_PROCEDURE(ctan,COMPLEX,COMPLEX,__builtin_ctan,cbuiltin.ctan)>
*)
(*
<MOD_BUILTIN_PROCEDURE(ctanl,LONGCOMPLEX,LONGCOMPLEX,__builtin_ctanl,cbuiltin.ctanl)>
*)
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_casinf)) carcsinf (z:
SHORTCOMPLEX) : SHORTCOMPLEX ;
-BEGIN
- RETURN cbuiltin.casinf(z)
-END carcsinf ;
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_casin)) carcsin (z: COMPLEX) :
COMPLEX ;
-BEGIN
- RETURN cbuiltin.casin(z)
-END carcsin ;
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_casinl)) carcsinl (z:
LONGCOMPLEX) : LONGCOMPLEX ;
-BEGIN
- RETURN cbuiltin.casinl(z)
-END carcsinl ;
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_cacosf)) carccosf (z:
SHORTCOMPLEX) : SHORTCOMPLEX ;
-BEGIN
- RETURN cbuiltin.cacosf(z)
-END carccosf ;
+(*
<MOD_BUILTIN_PROCEDURE(casinf,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_casinf,cbuiltin.casinf)>
*)
+(*
<MOD_BUILTIN_PROCEDURE(casin,COMPLEX,COMPLEX,__builtin_casin,cbuiltin.casin)> *)
+(*
<MOD_BUILTIN_PROCEDURE(casinl,LONGCOMPLEX,LONGCOMPLEX,__builtin_casinl,cbuiltin.casinl)>
*)
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_cacos)) carccos (z: COMPLEX) :
COMPLEX ;
-BEGIN
- RETURN cbuiltin.cacos(z)
-END carccos ;
+(*
<MOD_BUILTIN_PROCEDURE(cacosf,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_cacosf,cbuiltin.cacosf)>
*)
+(*
<MOD_BUILTIN_PROCEDURE(cacos,COMPLEX,COMPLEX,__builtin_cacos,cbuiltin.cacos)> *)
+(*
<MOD_BUILTIN_PROCEDURE(cacosl,LONGCOMPLEX,LONGCOMPLEX,__builtin_cacosl,cbuiltin.cacosl)>
*)
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_cacosl)) carccosl (z:
LONGCOMPLEX) : LONGCOMPLEX ;
-BEGIN
- RETURN cbuiltin.cacosl(z)
-END carccosl ;
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_catanf)) carctanf (z:
SHORTCOMPLEX) : SHORTCOMPLEX ;
-BEGIN
- RETURN cbuiltin.catanf(z)
-END carctanf ;
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_catan)) carctan (z: COMPLEX) :
COMPLEX ;
-BEGIN
- RETURN cbuiltin.catan(z)
-END carctan ;
-
-PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_catanl)) carctanl (z:
LONGCOMPLEX) : LONGCOMPLEX ;
-BEGIN
- RETURN cbuiltin.catanl(z)
-END carctanl ;
+(*
<MOD_BUILTIN_PROCEDURE(catanf,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_catanf,cbuiltin.catanf)>
*)
+(*
<MOD_BUILTIN_PROCEDURE(catan,COMPLEX,COMPLEX,__builtin_catan,cbuiltin.catan)> *)
+(*
<MOD_BUILTIN_PROCEDURE(catanl,LONGCOMPLEX,LONGCOMPLEX,__builtin_catanl,cbuiltin.catanl)>
*)
PROCEDURE __ATTRIBUTE__ __BUILTIN__ ((__builtin_index)) index (s: ADDRESS; c:
INTEGER) : ADDRESS ;
BEGIN
diff --git a/gcc/m2/gm2-libs-pim-common/cbuiltin.def
b/gcc/m2/gm2-libs-pim-common/cbuiltin.def
index 45f17b3bf86..08794c4dd39 100644
--- a/gcc/m2/gm2-libs-pim-common/cbuiltin.def
+++ b/gcc/m2/gm2-libs-pim-common/cbuiltin.def
@@ -56,9 +56,6 @@ EXPORT UNQUALIFIED alloca, memcpy,
cexpf, cexp, cexpl,
clogf, clog, clogl,
(* <CBUILTIN_EXPORT_LIST> *)
- casinf, casin, casinl,
- cacosf, cacos, cacosl,
- catanf, catan, catanl,
index, rindex,
memcmp, memset, memmove,
@@ -177,17 +174,17 @@ PROCEDURE clogl (z: LONGCOMPLEX) : LONGCOMPLEX ;
(* <DEF_CBUILTIN_PROCEDURE(ctan,COMPLEX,COMPLEX,__builtin_ctan,cbuiltin.ctan)>
*)
(*
<DEF_CBUILTIN_PROCEDURE(ctanl,LONGCOMPLEX,LONGCOMPLEX,__builtin_ctanl,cbuiltin.ctanl)>
*)
-PROCEDURE casinf (z: SHORTCOMPLEX) : SHORTCOMPLEX ;
-PROCEDURE casin (z: COMPLEX) : COMPLEX ;
-PROCEDURE casinl (z: LONGCOMPLEX) : LONGCOMPLEX ;
+(*
<DEF_CBUILTIN_PROCEDURE(casinf,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_casinf,cbuiltin.casinf)>
*)
+(*
<DEF_CBUILTIN_PROCEDURE(casin,COMPLEX,COMPLEX,__builtin_casin,cbuiltin.casin)>
*)
+(*
<DEF_CBUILTIN_PROCEDURE(casinl,LONGCOMPLEX,LONGCOMPLEX,__builtin_casinl,cbuiltin.casinl)>
*)
-PROCEDURE cacosf (z: SHORTCOMPLEX) : SHORTCOMPLEX ;
-PROCEDURE cacos (z: COMPLEX) : COMPLEX ;
-PROCEDURE cacosl (z: LONGCOMPLEX) : LONGCOMPLEX ;
+(*
<DEF_CBUILTIN_PROCEDURE(cacosf,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_cacosf,cbuiltin.cacosf)>
*)
+(*
<DEF_CBUILTIN_PROCEDURE(cacos,COMPLEX,COMPLEX,__builtin_cacos,cbuiltin.cacos)>
*)
+(*
<DEF_CBUILTIN_PROCEDURE(cacosl,LONGCOMPLEX,LONGCOMPLEX,__builtin_cacosl,cbuiltin.cacosl)>
*)
-PROCEDURE catanf (z: SHORTCOMPLEX) : SHORTCOMPLEX ;
-PROCEDURE catan (z: COMPLEX) : COMPLEX ;
-PROCEDURE catanl (z: LONGCOMPLEX) : LONGCOMPLEX ;
+(*
<DEF_CBUILTIN_PROCEDURE(catanf,SHORTCOMPLEX,SHORTCOMPLEX,__builtin_catanf,cbuiltin.catanf)>
*)
+(*
<DEF_CBUILTIN_PROCEDURE(catan,COMPLEX,COMPLEX,__builtin_catan,cbuiltin.catan)>
*)
+(*
<DEF_CBUILTIN_PROCEDURE(catanl,LONGCOMPLEX,LONGCOMPLEX,__builtin_catanl,cbuiltin.catanl)>
*)
PROCEDURE index (s: ADDRESS; c: INTEGER) : ADDRESS ;
PROCEDURE rindex (s: ADDRESS; c: INTEGER) : ADDRESS ;
diff --git a/gcc/m2/gm2spec.cc b/gcc/m2/gm2spec.cc
index 755c60b1c88..43cf971c136 100644
--- a/gcc/m2/gm2spec.cc
+++ b/gcc/m2/gm2spec.cc
@@ -873,7 +873,7 @@ lang_specific_driver (struct cl_decoded_option
**in_decoded_options,
append_option (OPT_flibs_, xstrdup (libraries), 1);
}
else
- append_option (OPT_flibs_, xstrdup ("-"), 0); /* no system libs. */
+ append_option (OPT_flibs_, xstrdup ("-"), 0); /* No system libs. */
if (need_plugin)
append_option (OPT_fplugin_, "m2rte", 1);
diff --git a/gcc/m2/tools-src/mktargetsrc.py b/gcc/m2/tools-src/mktargetsrc.py
index b91ee7a299b..37ccb7ddd4d 100644
--- a/gcc/m2/tools-src/mktargetsrc.py
+++ b/gcc/m2/tools-src/mktargetsrc.py
@@ -213,7 +213,16 @@ list_of_builtins = [builtin_prototype("csinl",
"LONGCOMPLEX", ["z"], ["LONGCOMPL
builtin_prototype("ccosf", "SHORTCOMPLEX", ["z"],
["SHORTCOMPLEX"]),
builtin_prototype("ctanl", "LONGCOMPLEX", ["z"],
["LONGCOMPLEX"]),
builtin_prototype("ctan", "COMPLEX", ["z"], ["COMPLEX"]),
- builtin_prototype("ctanf", "SHORTCOMPLEX", ["z"],
["SHORTCOMPLEX"])]
+ builtin_prototype("ctanf", "SHORTCOMPLEX", ["z"],
["SHORTCOMPLEX"]),
+ builtin_prototype("casinf", "SHORTCOMPLEX", ["z"],
["SHORTCOMPLEX"]),
+ builtin_prototype("casin", "COMPLEX", ["z"], ["COMPLEX"]),
+ builtin_prototype("casinl", "LONGCOMPLEX", ["z"],
["LONGCOMPLEX"]),
+ builtin_prototype("cacosf", "SHORTCOMPLEX", ["z"],
["SHORTCOMPLEX"]),
+ builtin_prototype("cacos", "COMPLEX", ["z"], ["COMPLEX"]),
+ builtin_prototype("cacosl", "LONGCOMPLEX", ["z"],
["LONGCOMPLEX"]),
+ builtin_prototype("catanf", "SHORTCOMPLEX", ["z"],
["SHORTCOMPLEX"]),
+ builtin_prototype("catan", "COMPLEX", ["z"], ["COMPLEX"]),
+ builtin_prototype("catanl", "LONGCOMPLEX", ["z"],
["LONGCOMPLEX"])]
gcc_builtins = {element.builtinName: element for element in list_of_builtins}
@@ -249,8 +258,7 @@ def process_def_builtin(args, line, key, dictDefs):
else:
unavailable(args, funcname)
-
-def output_mod_builtin(args, keyname, line):
+def do_output_mod_builtin(args, keyname, line):
output(args, "(* " + gcc_builtins[keyname].name + " is available on the
target. *)\n")
output(args, "PROCEDURE __ATTRIBUTE__ __BUILTIN__ ")
output(args, "((%s)) %s (%s: %s) : %s ;" %
(gcc_builtins[keyname].builtinName,
@@ -267,6 +275,13 @@ END %s ;
""" % (builtin, gcc_builtins[keyname].name))
+def output_mod_builtin(args, keyname, line):
+ if keyname in gcc_builtins:
+ do_output_mod_builtin(args, keyname, line)
+ else:
+ unavailable(args, keyname)
+
+
def process_mod_builtin(args, line, key, dictDefs):
line = line.strip()
if startWith(line, "(*") and (len(line)>len("(*")):
diff --git a/libgm2/Makefile.am b/libgm2/Makefile.am
index bacc51bd2e3..23304a60b35 100644
--- a/libgm2/Makefile.am
+++ b/libgm2/Makefile.am
@@ -41,9 +41,7 @@ GM2_SRC = $(GCC_DIR)/m2
toolexeclibdir=@toolexeclibdir@
toolexecdir=@toolexecdir@
GM2_FOR_TARGET=@GM2_FOR_TARGET@
-GM2_FOR_TARGET_ESC=$(shell echo $(GM2_FOR_TARGET) | sed 's/ /\\ /g')
$(info GM2_FOR_TARGET is $(GM2_FOR_TARGET))
-$(info GM2_FOR_TARGET_ESC is $(GM2_FOR_TARGET_ESC))
SUBDIRS = libm2min libm2log libm2cor libm2iso libm2pim
GM2_BUILDDIR := $(shell pwd)
@@ -65,7 +63,6 @@ AM_MAKEFLAGS = \
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
"GM2_FOR_TARGET=$(GM2_FOR_TARGET)" \
- "GM2_FOR_TARGET_ESC=$(GM2_FOR_TARGET_ESC)" \
"CFLAGS=$(CFLAGS)" \
"CXXFLAGS=$(CXXFLAGS)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
diff --git a/libgm2/Makefile.in b/libgm2/Makefile.in
index 36570c81c13..85a240be89a 100644
--- a/libgm2/Makefile.in
+++ b/libgm2/Makefile.in
@@ -357,7 +357,6 @@ gcc_version := $(shell @get_gcc_base_ver@
$(top_srcdir)/../gcc/BASE-VER)
TOP_GCCDIR := $(shell cd $(top_srcdir) && cd .. && pwd)
GCC_DIR = $(TOP_GCCDIR)/gcc
GM2_SRC = $(GCC_DIR)/m2
-GM2_FOR_TARGET_ESC = $(shell echo $(GM2_FOR_TARGET) | sed 's/ /\\ /g')
SUBDIRS = libm2min libm2log libm2cor libm2iso libm2pim
GM2_BUILDDIR := $(shell pwd)
gm2_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
@@ -374,7 +373,6 @@ AM_MAKEFLAGS = \
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
"GM2_FOR_TARGET=$(GM2_FOR_TARGET)" \
- "GM2_FOR_TARGET_ESC=$(GM2_FOR_TARGET_ESC)" \
"CFLAGS=$(CFLAGS)" \
"CXXFLAGS=$(CXXFLAGS)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
@@ -721,7 +719,6 @@ uninstall-am:
.PRECIOUS: Makefile
$(info GM2_FOR_TARGET is $(GM2_FOR_TARGET))
-$(info GM2_FOR_TARGET_ESC is $(GM2_FOR_TARGET_ESC))
# GNU Make needs to see an explicit $(MAKE) variable in the command it
# runs to enable its job server during parallel builds. Hence the
diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am
index b271e34b18c..e799fd83f80 100644
--- a/libgm2/libm2iso/Makefile.am
+++ b/libgm2/libm2iso/Makefile.am
@@ -53,7 +53,6 @@ AM_MAKEFLAGS = \
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
"GM2_FOR_TARGET=$(GM2_FOR_TARGET)" \
- "GM2_FOR_TARGET_ESC=$(GM2_FOR_TARGET_ESC)" \
"CFLAGS=$(CFLAGS)" \
"CXXFLAGS=$(CXXFLAGS)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
@@ -251,7 +250,7 @@ SYSTEM.def: Makefile
-I=$(GM2_SRC)/gm2-libs-iso \
-I=$(GM2_SRC)/gm2-libs \
-I=$(GM2_SRC)/gm2-libs-iso-common \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
SYSTEM.def: Makefile
bash $(GM2_SRC)/tools-src/makeSystem -fiso \
@@ -279,7 +278,7 @@ ShortComplexMath.def: Makefile
-M=$(GM2_SRC)/gm2-libs-iso-common/ShortComplexMath.mod \
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
-I=$(GM2_SRC)/gm2-libs-iso-common \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
ShortComplexMath.def: Makefile
cp $(GM2_SRC)/gm2-libs-iso-common/ShortComplexMath.def $@
@@ -291,7 +290,7 @@ ShortComplexMath.mod: Makefile
-M=$(GM2_SRC)/gm2-libs-iso-common/ShortComplexMath.mod \
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
-I=$(GM2_SRC)/gm2-libs-iso-common \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
ShortComplexMath.mod: Makefile
cp $(GM2_SRC)/gm2-libs-iso-common/ShortComplexMath.mod $@
@@ -304,7 +303,7 @@ ComplexMath.def: Makefile
-M=$(GM2_SRC)/gm2-libs-iso-common/ComplexMath.mod \
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
-I=$(GM2_SRC)/gm2-libs-iso-common \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
ComplexMath.def: Makefile
cp $(GM2_SRC)/gm2-libs-iso-common/ComplexMath.def $@
@@ -316,7 +315,7 @@ ComplexMath.mod: Makefile
-M=$(GM2_SRC)/gm2-libs-iso-common/ComplexMath.mod \
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
-I=$(GM2_SRC)/gm2-libs-iso-common \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
ComplexMath.mod: Makefile
cp $(GM2_SRC)/gm2-libs-iso-common/ComplexMath.mod $@
@@ -329,7 +328,7 @@ LongComplexMath.def: Makefile
-M=$(GM2_SRC)/gm2-libs-iso-common/LongComplexMath.mod \
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
-I=$(GM2_SRC)/gm2-libs-iso-common \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
LongComplexMath.def: Makefile
cp $(GM2_SRC)/gm2-libs-iso-common/LongComplexMath.def $@
@@ -341,7 +340,7 @@ LongComplexMath.mod: Makefile
-M=$(GM2_SRC)/gm2-libs-iso-common/LongComplexMath.mod \
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
-I=$(GM2_SRC)/gm2-libs-iso-common \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
LongComplexMath.mod: Makefile
cp $(GM2_SRC)/gm2-libs-iso-common/LongComplexMath.mod $@
diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in
index 00b4a6a4453..b9ff2d4e3b5 100644
--- a/libgm2/libm2iso/Makefile.in
+++ b/libgm2/libm2iso/Makefile.in
@@ -452,7 +452,6 @@ AM_MAKEFLAGS = \
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
"GM2_FOR_TARGET=$(GM2_FOR_TARGET)" \
- "GM2_FOR_TARGET_ESC=$(GM2_FOR_TARGET_ESC)" \
"CFLAGS=$(CFLAGS)" \
"CXXFLAGS=$(CXXFLAGS)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
@@ -964,7 +963,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso-common \
-@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_ISOLIB_TRUE@@[email protected]: Makefile
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ bash
$(GM2_SRC)/tools-src/makeSystem -fiso \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@
$(GM2_SRC)/gm2-libs-iso-common/SYSTEM.def \
@@ -989,7 +988,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-iso-common/ShortComplexMath.mod \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso-common \
-@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_ISOLIB_TRUE@@[email protected]:
Makefile
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ cp
$(GM2_SRC)/gm2-libs-iso-common/ShortComplexMath.def $@
@@ -998,7 +997,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-iso-common/ShortComplexMath.mod \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso-common \
-@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_ISOLIB_TRUE@@[email protected]:
Makefile
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ cp
$(GM2_SRC)/gm2-libs-iso-common/ShortComplexMath.mod $@
@@ -1008,7 +1007,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-iso-common/ComplexMath.mod \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso-common \
-@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_ISOLIB_TRUE@@[email protected]: Makefile
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ cp
$(GM2_SRC)/gm2-libs-iso-common/ComplexMath.def $@
@@ -1017,7 +1016,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-iso-common/ComplexMath.mod \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso-common \
-@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_ISOLIB_TRUE@@[email protected]: Makefile
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ cp
$(GM2_SRC)/gm2-libs-iso-common/ComplexMath.mod $@
@@ -1027,7 +1026,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-iso-common/LongComplexMath.mod \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso-common \
-@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_ISOLIB_TRUE@@[email protected]: Makefile
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ cp
$(GM2_SRC)/gm2-libs-iso-common/LongComplexMath.def $@
@@ -1036,7 +1035,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-iso-common/LongComplexMath.mod \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso -I=$(GM2_SRC)/gm2-libs \
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-iso-common \
-@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_ISOLIB_TRUE@@[email protected]: Makefile
@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ cp
$(GM2_SRC)/gm2-libs-iso-common/LongComplexMath.mod $@
diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am
index d3cc8882d30..3cb33ae6931 100644
--- a/libgm2/libm2min/Makefile.am
+++ b/libgm2/libm2min/Makefile.am
@@ -138,7 +138,7 @@ SYSTEM.def: Makefile
-D=$(GM2_SRC)/gm2-libs-min/SYSTEM.def \
-M=$(GM2_SRC)/gm2-libs-min/SYSTEM.mod \
-I=$(GM2_SRC)/gm2-libs-min -I=$(GM2_SRC)/gm2-libs \
- -C="$(GM2_FOR_TARGET_ESC) -fno-exceptions" -o $@
+ -C="$(GM2_FOR_TARGET) -fno-exceptions" -o $@
else
SYSTEM.def: Makefile
bash $(GM2_SRC)/tools-src/makeSystem -fpim \
diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in
index 3075d557c87..b8b76b205e0 100644
--- a/libgm2/libm2min/Makefile.in
+++ b/libgm2/libm2min/Makefile.in
@@ -779,7 +779,7 @@ libc.o: $(GM2_SRC)/gm2-libs-min/libc.c
@HAVE_PYTHON_INTERPRETER_TRUE@
-D=$(GM2_SRC)/gm2-libs-min/SYSTEM.def \
@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-min/SYSTEM.mod \
@HAVE_PYTHON_INTERPRETER_TRUE@ -I=$(GM2_SRC)/gm2-libs-min
-I=$(GM2_SRC)/gm2-libs \
-@HAVE_PYTHON_INTERPRETER_TRUE@ -C="$(GM2_FOR_TARGET_ESC)
-fno-exceptions" -o $@
+@HAVE_PYTHON_INTERPRETER_TRUE@ -C="$(GM2_FOR_TARGET)
-fno-exceptions" -o $@
@[email protected]: Makefile
@HAVE_PYTHON_INTERPRETER_FALSE@ bash $(GM2_SRC)/tools-src/makeSystem
-fpim \
@HAVE_PYTHON_INTERPRETER_FALSE@ $(GM2_SRC)/gm2-libs-min/SYSTEM.def
\
diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am
index 508358da9c5..5dfe3e7d6ce 100644
--- a/libgm2/libm2pim/Makefile.am
+++ b/libgm2/libm2pim/Makefile.am
@@ -52,7 +52,6 @@ AM_MAKEFLAGS = \
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
"GM2_FOR_TARGET=$(GM2_FOR_TARGET)" \
- "GM2_FOR_TARGET_ESC=$(GM2_FOR_TARGET_ESC)" \
"CFLAGS=$(CFLAGS)" \
"CXXFLAGS=$(CXXFLAGS)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
@@ -226,7 +225,7 @@ SYSTEM.def: Makefile
-M=$(GM2_SRC)/gm2-libs-pim-common/SYSTEM.mod \
-I=$(GM2_SRC)/gm2-libs-pim-common \
-I=$(GM2_SRC)/gm2-libs \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
SYSTEM.def: Makefile
bash $(GM2_SRC)/tools-src/makeSystem -fpim \
@@ -244,7 +243,7 @@ Builtins.def: Makefile
-M=$(GM2_SRC)/gm2-libs-pim-common/Builtins.mod \
-I=$(GM2_SRC)/gm2-libs-pim-common \
-I=$(GM2_SRC)/gm2-libs \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
Builtins.def: Makefile
cp $(GM2_SRC)/gm2-libs-pim-common/Builtins.def $@
@@ -256,7 +255,7 @@ Builtins.mod: Makefile
-M=$(GM2_SRC)/gm2-libs-pim-common/Builtins.mod \
-I=$(GM2_SRC)/gm2-libs-pim-common \
-I=$(GM2_SRC)/gm2-libs \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
Builtins.mod: Makefile
cp $(GM2_SRC)/gm2-libs-pim-common/Builtins.mod $@
@@ -269,7 +268,7 @@ cbuiltin.def: Makefile
-M=$(GM2_SRC)/gm2-libs-pim-common/Builtins.mod \
-I=$(GM2_SRC)/gm2-libs-pim-common \
-I=$(GM2_SRC)/gm2-libs \
- -C="$(GM2_FOR_TARGET_ESC)" -o $@
+ -C="$(GM2_FOR_TARGET)" -o $@
else
cbuiltin.def: Makefile
cp $(GM2_SRC)/gm2-libs-pim-common/cbuiltin.def $@
diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in
index c2cb4514409..5b380a155f2 100644
--- a/libgm2/libm2pim/Makefile.in
+++ b/libgm2/libm2pim/Makefile.in
@@ -441,7 +441,6 @@ AM_MAKEFLAGS = \
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
"GM2_FOR_TARGET=$(GM2_FOR_TARGET)" \
- "GM2_FOR_TARGET_ESC=$(GM2_FOR_TARGET_ESC)" \
"CFLAGS=$(CFLAGS)" \
"CXXFLAGS=$(CXXFLAGS)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
@@ -939,7 +938,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-pim-common/SYSTEM.mod \
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-pim-common \
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs \
-@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_PIMLIB_TRUE@@[email protected]: Makefile
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ bash
$(GM2_SRC)/tools-src/makeSystem -fpim \
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@
$(GM2_SRC)/gm2-libs-pim-common/SYSTEM.def \
@@ -954,7 +953,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-pim-common/Builtins.mod \
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-pim-common \
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs \
-@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_PIMLIB_TRUE@@[email protected]: Makefile
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ cp
$(GM2_SRC)/gm2-libs-pim-common/Builtins.def $@
@@ -963,7 +962,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-pim-common/Builtins.mod \
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-pim-common \
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs \
-@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_PIMLIB_TRUE@@[email protected]: Makefile
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ cp
$(GM2_SRC)/gm2-libs-pim-common/Builtins.mod $@
@@ -973,7 +972,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-M=$(GM2_SRC)/gm2-libs-pim-common/Builtins.mod \
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs-pim-common \
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-I=$(GM2_SRC)/gm2-libs \
-@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET_ESC)" -o $@
+@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@
-C="$(GM2_FOR_TARGET)" -o $@
@BUILD_PIMLIB_TRUE@@[email protected]: Makefile
@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ cp
$(GM2_SRC)/gm2-libs-pim-common/cbuiltin.def $@
--
2.47.3
