aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2011-06-30 15:08:17 +0000
committerNick Clifton <nickc@redhat.com>2011-06-30 15:08:17 +0000
commit75d5a45f82040ef3e85023926a1840e27f127d73 (patch)
tree6552852c379cc92e4456a8a72d0b8a1c55e0847b /binutils
parent5f4cb1986d38875f7541b53e41ae7fb1e7460f14 (diff)
downloadfsf-binutils-gdb-75d5a45f82040ef3e85023926a1840e27f127d73.zip
fsf-binutils-gdb-75d5a45f82040ef3e85023926a1840e27f127d73.tar.gz
fsf-binutils-gdb-75d5a45f82040ef3e85023926a1840e27f127d73.tar.bz2
PR binutils/12558
* ar.c (main): When asked to move members in an archive that is being created, ignore the move request.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/ar.c16
2 files changed, 17 insertions, 5 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 69140c2..b34cd88 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-30 Nick Clifton <nickc@redhat.com>
+
+ PR binutils/12558
+ * ar.c (main): When asked to move members in an archive that is
+ being created, ignore the move request.
+
2011-06-29 Nick Clifton <nickc@redhat.com>
* readelf.c (get_section_type_name): When displaying an unknown
diff --git a/binutils/ar.c b/binutils/ar.c
index 42cc0c6..f8c977a 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -745,11 +745,17 @@ main (int argc, char **argv)
break;
case move:
- if (files != NULL)
- move_members (arch, files);
- else
- output_filename = NULL;
- break;
+ /* PR 12558: Creating and moving at the same time does
+ not make sense. Just create the archive instead. */
+ if (! silent_create)
+ {
+ if (files != NULL)
+ move_members (arch, files);
+ else
+ output_filename = NULL;
+ break;
+ }
+ /* Fall through. */
case replace:
case quick_append: