[PATCH] Remove vestiges of MODIFY_JNI_METHOD_CALL

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] Remove vestiges of MODIFY_JNI_METHOD_CALL

Tom Tromey-3
I happened to notice that MODIFY_JNI_METHOD_CALL was defined in
cygming.h and documented in tm.texi.  However, because it was only
needed for gcj, it is obsolete.  This patch removes the vestiges.

Tested by grep, and rebuilding the documentation.

gcc/ChangeLog
2019-11-13  Tom Tromey  <[hidden email]>

        * doc/tm.texi: Rebuild.
        * doc/tm.texi.in (Misc): Don't document MODIFY_JNI_METHOD_CALL.
        * config/i386/cygming.h (MODIFY_JNI_METHOD_CALL): Don't define.
---
 gcc/ChangeLog             |  6 ++++++
 gcc/config/i386/cygming.h |  8 --------
 gcc/doc/tm.texi           | 16 ----------------
 gcc/doc/tm.texi.in        | 16 ----------------
 4 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h
index 6426d96b13c..90006e1a013 100644
--- a/gcc/config/i386/cygming.h
+++ b/gcc/config/i386/cygming.h
@@ -385,14 +385,6 @@ do { \
  const0_rtx)); \
     }
 
-/* Java Native Interface (JNI) methods on Win32 are invoked using the
-   stdcall calling convention.  */
-#undef MODIFY_JNI_METHOD_CALL
-#define MODIFY_JNI_METHOD_CALL(MDECL)      \
-  build_type_attribute_variant ((MDECL),      \
-       build_tree_list (get_identifier ("stdcall"),   \
- NULL))
-
 /* For Win32 ABI compatibility */
 #undef DEFAULT_PCC_STRUCT_RETURN
 #define DEFAULT_PCC_STRUCT_RETURN 0
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 11c236e1c65..4b858d43712 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -11778,22 +11778,6 @@ object files that are not referenced from @code{main} and uses export
 lists.
 @end defmac
 
-@defmac MODIFY_JNI_METHOD_CALL (@var{mdecl})
-Define this macro to a C expression representing a variant of the
-method call @var{mdecl}, if Java Native Interface (JNI) methods
-must be invoked differently from other methods on your target.
-For example, on 32-bit Microsoft Windows, JNI methods must be invoked using
-the @code{stdcall} calling convention and this macro is then
-defined as this expression:
-
-@smallexample
-build_type_attribute_variant (@var{mdecl},
-                              build_tree_list
-                              (get_identifier ("stdcall"),
-                               NULL))
-@end smallexample
-@end defmac
-
 @deftypefn {Target Hook} bool TARGET_CANNOT_MODIFY_JUMPS_P (void)
 This target hook returns @code{true} past the point in which new jump
 instructions could be created.  On machines that require a register for
diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
index b8c41b5a7aa..a183cb35bd8 100644
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -7996,22 +7996,6 @@ object files that are not referenced from @code{main} and uses export
 lists.
 @end defmac
 
-@defmac MODIFY_JNI_METHOD_CALL (@var{mdecl})
-Define this macro to a C expression representing a variant of the
-method call @var{mdecl}, if Java Native Interface (JNI) methods
-must be invoked differently from other methods on your target.
-For example, on 32-bit Microsoft Windows, JNI methods must be invoked using
-the @code{stdcall} calling convention and this macro is then
-defined as this expression:
-
-@smallexample
-build_type_attribute_variant (@var{mdecl},
-                              build_tree_list
-                              (get_identifier ("stdcall"),
-                               NULL))
-@end smallexample
-@end defmac
-
 @hook TARGET_CANNOT_MODIFY_JUMPS_P
 
 @hook TARGET_HAVE_CONDITIONAL_EXECUTION
--
2.20.1

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Remove vestiges of MODIFY_JNI_METHOD_CALL

Jeff Law
On 11/13/19 2:50 PM, Tom Tromey wrote:

> I happened to notice that MODIFY_JNI_METHOD_CALL was defined in
> cygming.h and documented in tm.texi.  However, because it was only
> needed for gcj, it is obsolete.  This patch removes the vestiges.
>
> Tested by grep, and rebuilding the documentation.
>
> gcc/ChangeLog
> 2019-11-13  Tom Tromey  <[hidden email]>
>
> * doc/tm.texi: Rebuild.
> * doc/tm.texi.in (Misc): Don't document MODIFY_JNI_METHOD_CALL.
> * config/i386/cygming.h (MODIFY_JNI_METHOD_CALL): Don't define.
THanks.  And FWIW removal of this kind of missed stuff shouldn't require
explicit approvals.

jeff