From d3a0d55d663e3837aaba816af1aabf983df0ffab Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 12 Jun 2009 17:45:57 +0000 Subject: [PATCH] re PR bootstrap/40430 (collect2.c fails to compile: new qualifiers in middle of multi-level non-const cast are unsafe) PR bootstrap/40430 * collect2.c (main): Use CONST_CAST2 in code inside #if LINK_ELIMINATE_DUPLICATE_LDIRECTORIES. From-SVN: r148434 --- gcc/ChangeLog | 6 ++++++ gcc/collect2.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de0d2cee708..93a0e896d26 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-06-12 Ian Lance Taylor + + PR bootstrap/40430 + * collect2.c (main): Use CONST_CAST2 in code inside #if + LINK_ELIMINATE_DUPLICATE_LDIRECTORIES. + 2009-06-12 Joey Ye PR middle-end/39146 diff --git a/gcc/collect2.c b/gcc/collect2.c index 9848b903580..efb00871755 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -1167,7 +1167,9 @@ main (int argc, char **argv) #else #if LINK_ELIMINATE_DUPLICATE_LDIRECTORIES case 'L': - if (is_in_args (arg, (const char **) ld1_argv, ld1-1)) + if (is_in_args (arg, + CONST_CAST2 (const char **, char **, ld1_argv), + ld1 - 1)) --ld1; break; #endif /* LINK_ELIMINATE_DUPLICATE_LDIRECTORIES */