summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhainque <hainque@138bc75d-0d04-0410-961f-82ee72b054a4>2009-06-18 07:45:09 +0000
committerhainque <hainque@138bc75d-0d04-0410-961f-82ee72b054a4>2009-06-18 07:45:09 +0000
commit71a0b254c87715332b5e55ed98624ef214667c0c (patch)
treec78320f403fa179e3334c93b007803b977c62f46
parent2b3fc9df3214cd9407d339d25edc64857f653150 (diff)
downloadgcc-71a0b254c87715332b5e55ed98624ef214667c0c.tar.gz
* collect2.c (main): Use CONST_CAST2 to perform char ** to
const char ** conversion in AIX specific section. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148649 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/collect2.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c9e5ec84f2b..6469c25cb66 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-17 Olivier Hainque <hainque@adacore.com>
+
+ * collect2.c (main): Use CONST_CAST2 to perform char ** to
+ const char ** conversion in AIX specific section.
+
2009-06-17 H.J. Lu <hongjiu.lu@intel.com>
* config/i386/i386.c (ix86_special_builtin_type): Remove
diff --git a/gcc/collect2.c b/gcc/collect2.c
index efb00871755..57866aac8a1 100644
--- a/gcc/collect2.c
+++ b/gcc/collect2.c
@@ -1281,7 +1281,8 @@ main (int argc, char **argv)
/* The AIX linker will discard static constructors in object files if
nothing else in the file is referenced, so look at them first. */
{
- const char **export_object_lst = (const char **)object_lst;
+ const char **export_object_lst
+ = CONST_CAST2 (const char **, char **, object_lst);
while (export_object_lst < object)
scan_prog_file (*export_object_lst++, PASS_OBJ);