summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/collect2.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8d6d28fe63..96d4d9b0227 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-25 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
+
+ * collect2.c (scan_libraries): Use CONST_CAST2 to perform char ** to
+ const char ** conversion.
+
2009-07-25 David Daney <ddaney@caviumnetworks.com>
* system.h (gcc_assert): Invoke __builtin_unreachable() instead of
diff --git a/gcc/collect2.c b/gcc/collect2.c
index 57866aac8a1..aed4c675860 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -2271,7 +2271,7 @@ scan_libraries (const char *prog_name)
void (*quit_handler) (int);
#endif
char *real_ldd_argv[4];
- const char **ldd_argv = (const char **) real_ldd_argv;
+ const char **ldd_argv = CONST_CAST2 (const char **, char **, real_ldd_argv);
int argc = 0;
struct pex_obj *pex;
const char *errmsg;