diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 9a0cb3cf92f..8cf0b9a3eb9 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -39,6 +39,11 @@
 	* libffi/src/x86/unix64.S (.eh_frame)
 	[HAVE_AS_X86_64_UNWIND_SECTION_TYPE]: Use @unwind section type.
 
+2010-03-14  Matthias Klose  <doko@ubuntu.com>
+
+	* src/x86/ffi64.c: Fix typo in comment.
+	* src/x86/ffi.c: Use /* ... */ comment style.
+
 2010-02-24  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* doc/libffi.texi (The Closure API): Fix typo.
diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c
index d99528b11c7..80496532a30 100644
--- a/libffi/src/x86/ffi.c
+++ b/libffi/src/x86/ffi.c
@@ -585,10 +585,10 @@ ffi_prep_raw_closure_loc (ffi_raw_closure* closure,
     return FFI_BAD_ABI;
   }
 
-  // we currently don't support certain kinds of arguments for raw
-  // closures.  This should be implemented by a separate assembly language
-  // routine, since it would require argument processing, something we
-  // don't do now for performance.
+  /* we currently don't support certain kinds of arguments for raw
+     closures.  This should be implemented by a separate assembly
+     language routine, since it would require argument processing,
+     something we don't do now for performance.  */
 
   for (i = cif->nargs-1; i >= 0; i--)
     {
diff --git a/libffi/src/x86/ffi64.c b/libffi/src/x86/ffi64.c
index 51ada0e879f..07a2627b1f2 100644
--- a/libffi/src/x86/ffi64.c
+++ b/libffi/src/x86/ffi64.c
@@ -50,9 +50,10 @@ extern void ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags,
    gcc/config/i386/i386.c. Do *not* change one without the other.  */
 
 /* Register class used for passing given 64bit part of the argument.
-   These represent classes as documented by the PS ABI, with the exception
-   of SSESF, SSEDF classes, that are basically SSE class, just gcc will
-   use SF or DFmode move instead of DImode to avoid reformating penalties.
+   These represent classes as documented by the PS ABI, with the
+   exception of SSESF, SSEDF classes, that are basically SSE class,
+   just gcc will use SF or DFmode move instead of DImode to avoid
+   reformatting penalties.
 
    Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves
    whenever possible (upper half does contain padding).  */