aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorKazu Hirata <kazu@cs.umass.edu>2005-04-04 15:29:52 +0000
committerKazu Hirata <kazu@gcc.gnu.org>2005-04-04 15:29:52 +0000
commitdf04438806922874ac6372c4f3e990a9fc7dfd90 (patch)
tree8490d56079283c01075dcee78421b4ae9fcf7ea1 /gcc
parent5e77eb534bb84d6afdf489f007079ce90fcf8b9d (diff)
downloadgcc-df04438806922874ac6372c4f3e990a9fc7dfd90.zip
gcc-df04438806922874ac6372c4f3e990a9fc7dfd90.tar.gz
gcc-df04438806922874ac6372c4f3e990a9fc7dfd90.tar.bz2
gcj.texi: Fix a typo.
* gcj.texi: Fix a typo. * lang.c: Fix a comment typo. From-SVN: r97551
Diffstat (limited to 'gcc')
-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 e45415e..6d4d4bf 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 e71511a..523a0b5 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 553e20c..e0d2672 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.