From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 20 Sep 2007 10:20:05 +0000 (+0000)
Subject: 2007-09-20  Paul Jarc  <prj-bugzilla-gcc@multivac.cwru.edu>
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=9658ef825c1c123b5fb8df0046be91ba31942731;hp=e64c07b90eac1b46178db38243decfe4a2c8b67a

2007-09-20  Paul Jarc  <prj-bugzilla-gcc@multivac.cwru.edu>

	PR bootstrap/31906
	* libtool-ldflags: Don't prefix arguments with -Xcompiler if
        they're already prefixed.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128617 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/ChangeLog b/ChangeLog
index 9d9940072f9..e57e59df468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-20  Paul Jarc  <prj-bugzilla-gcc@multivac.cwru.edu>
+
+	PR bootstrap/31906
+	* libtool-ldflags: Don't prefix arguments with -Xcompiler if
+        they're already prefixed.
+
 2007-09-19  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Move libgomp before
diff --git a/libtool-ldflags b/libtool-ldflags
index 6321747b4a9..e32e37bf10d 100755
--- a/libtool-ldflags
+++ b/libtool-ldflags
@@ -31,6 +31,7 @@
 # The output of the script.  This string is built up as we process the
 # arguments.
 result=
+prev_arg=
 
 for arg
 do
@@ -43,13 +44,21 @@ do
 	    # options.  So, we prefix these options with -Xcompiler to
 	    # make clear to libtool that they are in fact compiler
 	    # options.
-	    result="$result -Xcompiler" 
+	    case $prev_arg in
+		-Xpreprocessor|-Xcompiler|-Xlinker)
+		    # This option is already prefixed; don't prefix it again.
+		    ;;
+		*)
+		    result="$result -Xcompiler"
+		    ;;
+	    esac
 	    ;;
 	*)
 	    # We do not want to add -Xcompiler to other options because
 	    # that would prevent libtool itself from recognizing them.
 	    ;;
     esac
+    prev_arg=$arg
 
     # If $(LDFLAGS) is (say):
     #   a "b'c d" e