From 627fe3fb790fa71dea2b5699f4e23bbbcf184d5f Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Fri, 20 Feb 2004 15:21:54 +0000
Subject: [PATCH] 	* binutils-all/objcopy.exp: Reorder arguments for
 POSIXLY_CORRECT 	systems.p

---
 binutils/testsuite/ChangeLog                |  4 ++++
 binutils/testsuite/binutils-all/objcopy.exp | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 829c5b8cc86..d433e8cf367 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-20  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* binutils-all/objcopy.exp: Reorder arguments for POSIXLY_CORRECT
+	systems.p
 
 For older changes see ChangeLog-9303
 
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index a03e606aab0..c6a2d530e3e 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -175,7 +175,7 @@ if ![regexp "start address (\[0-9a-fA-FxX\]+)" $got all origstart] then {
     perror "objdump can not recognize bintest.o"
     set origstart ""
 } else {
-    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec --set-start 0x7654"]
+    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec --set-start 0x7654 $tempfile ${copyfile}.srec"]
     if ![string match "" $got] then {
 	fail "objcopy --set-start"
     } else {
@@ -192,7 +192,7 @@ if ![regexp "start address (\[0-9a-fA-FxX\]+)" $got all origstart] then {
 	}
     }
 
-    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec --adjust-start 0x123"]
+    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec --adjust-start 0x123 $tempfile ${copyfile}.srec"]
     if ![string match "" $got] then {
 	fail "objcopy --adjust-start"
     } else {
@@ -237,7 +237,7 @@ while {[regexp $headers_regexp $got all name size vma rest]} {
 if {$low == "" || $origstart == ""} then {
     perror "objdump can not recognize bintest.o"
 } else {
-    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec --adjust-vma 0x123"]
+    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec --adjust-vma 0x123 $tempfile ${copyfile}.srec"]
     if ![string match "" $got] then {
         fail "objcopy --adjust-vma"
     } else {
@@ -271,7 +271,7 @@ if {$low == "" || $origstart == ""} then {
 	set got $rest
     }
 
-    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec $arg"]
+    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $arg $tempfile ${copyfile}.srec"]
     if ![string match "" $got] then {
 	fail "objcopy --adjust-section-vma +"
     } else {
@@ -291,7 +291,7 @@ if {$low == "" || $origstart == ""} then {
     }
 
     regsub -all "\\+4" $arg "=[expr $low + 4]" argeq
-    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $tempfile ${copyfile}.srec $argeq"]
+    set got [binutils_run $OBJCOPY "$OBJCOPYFLAGS -O srec $argeq $tempfile ${copyfile}.srec"]
     if ![string match "" $got] then {
 	fail "objcopy --adjust-section-vma ="
     } else {
-- 
2.30.2