From: Kai Tietz <kai.tietz@onevision.com>
Date: Sat, 30 Oct 2010 17:14:02 +0000 (+0000)
Subject: 2010-10-30  Kai Tietz  <kai.tietz@onevision.com>
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=290c52bdbb037510879e2b87a44ba790540cae16;p=deliverable%2Fbinutils-gdb.git

2010-10-30  Kai Tietz  <kai.tietz@onevision.com>

        * dlltool.c (scan_drectve_symbols): Allow quoted strings for -export
        directives.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8faa24207d..16404436c9 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-30  Kai Tietz  <kai.tietz@onevision.com>
+
+	* dlltool.c (scan_drectve_symbols): Allow quoted strings for -export
+	directives.
+
 2010-10-29  Joseph Myers  <joseph@codesourcery.com>
 
 	* readelf.c (display_tic6x_attribute): Use Tag_ABI_compatibility
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 3a91221c45..8c72647fe1 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -1399,12 +1399,26 @@ scan_drectve_symbols (bfd *abfd)
 	  flagword flags = BSF_FUNCTION;
 
 	  p += 8;
-	  name = p;
-	  while (p < e && *p != ',' && *p != ' ' && *p != '-')
-	    p++;
+	  /* Do we have a quoted export?  */
+	  if (*p == '"')
+	    {
+	      p++;
+	      name = p;
+	      while (p < e && *p != '"')
+		++p;
+	    }
+	  else
+	    {
+	      name = p;
+	      while (p < e && *p != ',' && *p != ' ' && *p != '-')
+		p++;
+	    }
 	  c = xmalloc (p - name + 1);
 	  memcpy (c, name, p - name);
 	  c[p - name] = 0;
+	  /* Advance over trailing quote.  */
+	  if (p < e && *p == '"')
+	    ++p;
 	  if (p < e && *p == ',')       /* found type tag.  */
 	    {
 	      char *tag_start = ++p;