summaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorkazu <kazu@138bc75d-0d04-0410-961f-82ee72b054a4>2005-04-04 15:29:52 +0000
committerkazu <kazu@138bc75d-0d04-0410-961f-82ee72b054a4>2005-04-04 15:29:52 +0000
commit34882fefeb29d8356b0bb17802e26e097ed65688 (patch)
tree8490d56079283c01075dcee78421b4ae9fcf7ea1 /gcc/java
parentcba6c3cc933612790bcc31aa554b5c73d007e68a (diff)
downloadgcc-34882fefeb29d8356b0bb17802e26e097ed65688.tar.gz
* gcj.texi: Fix a typo.
* lang.c: Fix a comment typo. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97551 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/gcj.texi2
-rw-r--r--gcc/java/lang.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e45415e10aa..6d4d4bfa314 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-04 Kazu Hirata <kazu@cs.umass.edu>
+
+ * gcj.texi: Fix a typo.
+ * lang.c: Fix a comment typo.
+
2005-04-01 Thomas Fitzsimmons <fitzsim@redhat.com>
* gcj.texi (Invoking gij): Add descriptions of new -X options.
diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi
index e71511af770..523a0b59b02 100644
--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@@ -1653,7 +1653,7 @@ java::util::Hashtable *ht = new java::util::Hashtable(120);
@node Memory allocation
@section Memory allocation
-When allocting memory in @acronym{CNI} methods it is best to handle
+When allocating memory in @acronym{CNI} methods it is best to handle
out-of-memory conditions by throwing a Java exception. These
functions are provided for that purpose:
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 553e20cf57f..e0d2672b2a5 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -801,7 +801,7 @@ merge_init_test_initialization (void **entry, void *x)
does this by setting the DECL_INITIAL of the init_test_decl for that
class, and no initializations are emitted for that class.
- However, what if the method that is suppoed to do the initialization
+ However, what if the method that is supposed to do the initialization
is itself inlined in the caller? When expanding the called method
we'll assume that the class initialization has already been done,
because the DECL_INITIAL of the init_test_decl is set.