From: DJ Delorie <dj@redhat.com>
Date: Fri, 26 Dec 2003 16:27:37 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: gdb_6_1-branchpoint~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f9c405836dd24090e3229c64b43e0f615f1048b;p=thirdparty%2Fbinutils-gdb.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 05a9b9066ce..ada155da9d1 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cp-demangle.c (is_ctor_or_dtor): Fix error in last change.
+
 2003-12-22  Daniel Jacobowitz  <drow@mvista.com>
 
 	PR debug/13272
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index b54cbe2bc31..16871abaad3 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -4085,8 +4085,7 @@ is_ctor_or_dtor (mangled, ctor_kind, dtor_kind)
 	  free (di.comps);
 	if (di.subs != NULL)
 	  free (di.subs);
-	*palc = 1;
-	return NULL;
+	return 0;
       }
 #endif