svn commit: r275862 - head/contrib/elftoolchain/elfcopy

[Ed Maste]

Author: emaste
Date: Wed Dec 17 14:46:21 2014
New Revision: 275862
URL: https://svnweb.freebsd.org/changeset/base/275862

Log:
  Do not strip all when stripping an explicit symbol
  
  When requested to strip specific symbols (-N flag) the default should be
  to strip nothing (other than the requested symbols). This is consistent
  with binutils strip(1).
  
  PR:		196038
  Reviewed by:	imp
  Sponsored by:	The FreeBSD Foundation
  Differential Revision: https://reviews.freebsd.org/D1327

Modified:
  head/contrib/elftoolchain/elfcopy/main.c

Modified: head/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- head/contrib/elftoolchain/elfcopy/main.c	Wed Dec 17 11:36:31 2014	(r275861)
+++ head/contrib/elftoolchain/elfcopy/main.c	Wed Dec 17 14:46:21 2014	(r275862)
@@ -1109,7 +1109,8 @@ strip_main(struct elfcopy *ecp, int argc
 
 	if (ecp->strip == 0 &&
 	    ((ecp->flags & DISCARD_LOCAL) == 0) &&
-	    ((ecp->flags & DISCARD_LLABEL) == 0))
+	    ((ecp->flags & DISCARD_LLABEL) == 0) &&
+	    lookup_symop_list(ecp, NULL, SYMOP_STRIP) == NULL)
 		ecp->strip = STRIP_ALL;
 	if (optind == argc)
 		strip_usage();