merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 6712b5e4096c5dae290f16e760c127a900b4ae62..fe9b38f922924da5de572abaafcd330328ee132e 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-09  Rafael Espindola  <espindola@google.com>
+
+       * plugin-api.h (ld_plugin_add_input_library): Change argument name to
+       libname.
+
 2008-10-03  Rafael Espindola  <espindola@google.com>
 
        * plugin-api.h: New.

diff --git a/include/plugin-api.h b/include/plugin-api.h
index 530f3f448737f3aa1dec68e542da6ad5e8a02184..a026e7a004bc71d0d25f526caeb14c360d700c42 100644 (file)
--- a/include/plugin-api.h
+++ b/include/plugin-api.h
@@ -218,7 +218,7 @@ enum ld_plugin_status
 
 typedef
 enum ld_plugin_status
-(*ld_plugin_add_input_library) (char *pathname);
+(*ld_plugin_add_input_library) (char *libname);
 
 /* The linker's interface for issuing a warning or error message.  */