diff options
| author | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-24 14:06:35 +0000 |
|---|---|---|
| committer | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-24 14:06:35 +0000 |
| commit | 1ddf4bfd4e8523849c0357f0b3fc734459a90c64 (patch) | |
| tree | 1d950444c1c39945ba4aa6245c1a4e7884397052 | |
| parent | 262b29f2ac37d2dad47987b4fd19a2f21df19f87 (diff) | |
| download | gcc-1ddf4bfd4e8523849c0357f0b3fc734459a90c64.tar.gz | |
PR bootstrap/45751
* gcc/config/darwin-driver.c (darwin_default_min_version):
Adjust size passed to memcpy in two places.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164592 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/darwin-driver.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d8c5125c17c..7f024889c46 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-09-24 Iain Sandoe <iains@gcc.gnu.org> + Dominique Dhumieres <dominiq@lps.ens.fr> + + PR bootstrap/45751 + * gcc/config/darwin-driver.c (darwin_default_min_version): + Adjust size passed to memcpy in two places. + 2010-09-24 Richard Guenther <rguenther@suse.de> * c-decl.c (pop_scope): Always set file-scope DECL_CONTEXT. diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c index 099226c25d3..1123aa37c43 100644 --- a/gcc/config/darwin-driver.c +++ b/gcc/config/darwin-driver.c @@ -76,7 +76,7 @@ darwin_default_min_version (unsigned int *decoded_options_count, generate_option (OPT_mmacosx_version_min_, macosx_deployment_target, 1, CL_DRIVER, &(*decoded_options)[1]); memcpy (*decoded_options + 2, argv + 1, - (argc - 1) * sizeof (struct cl_decoded_option *)); + (argc - 1) * sizeof (struct cl_decoded_option)); return; } } @@ -128,7 +128,7 @@ darwin_default_min_version (unsigned int *decoded_options_count, generate_option (OPT_mmacosx_version_min_, new_flag, 1, CL_DRIVER, &(*decoded_options)[1]); memcpy (*decoded_options + 2, argv + 1, - (argc - 1) * sizeof (struct cl_decoded_option *)); + (argc - 1) * sizeof (struct cl_decoded_option)); return; parse_failed: |