diff options
| author | Ian Lance Taylor <iant@google.com> | 2009-06-12 17:45:57 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2009-06-12 17:45:57 +0000 |
| commit | d3a0d55d663e3837aaba816af1aabf983df0ffab (patch) | |
| tree | 2571b37001781dba24682a36bf18261b0df39086 /gcc | |
| parent | 062b827975180b9b278666e5a08f6e55bb120010 (diff) | |
| download | gcc-d3a0d55d663e3837aaba816af1aabf983df0ffab.zip gcc-d3a0d55d663e3837aaba816af1aabf983df0ffab.tar.gz gcc-d3a0d55d663e3837aaba816af1aabf983df0ffab.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/collect2.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de0d2ce..93a0e89 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-06-12 Ian Lance Taylor <iant@google.com> + + PR bootstrap/40430 + * collect2.c (main): Use CONST_CAST2 in code inside #if + LINK_ELIMINATE_DUPLICATE_LDIRECTORIES. + 2009-06-12 Joey Ye <joey.ye@intel.com> PR middle-end/39146 diff --git a/gcc/collect2.c b/gcc/collect2.c index 9848b90..efb0087 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 */ |