5595 libzpool won't build with a studio primary

*** 21,32 ****
  /*
   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
- #pragma ident   "%Z%%M% %I%     %E% SMI"
- 
  /*
   * Given a file containing sections with stabs data, convert the stabs data to
   * CTF data, and replace the stabs sections with a CTF section.
   */
  
--- 21,30 ----
*** 148,158 ****
  {
          tdata_t *filetd, *mstrtd;
          char *label = NULL;
          int verbose = 0;
          int ignore_non_c = 0;
-         int keep_stabs = 0;
          int c;
  
          sighold(SIGINT);
          sighold(SIGQUIT);
          sighold(SIGTERM);
--- 146,155 ----
*** 162,172 ****
          if (getenv("CTFCONVERT_DEBUG_LEVEL"))
                  debug_level = atoi(getenv("CTFCONVERT_DEBUG_LEVEL"));
          if (getenv("CTFCONVERT_DEBUG_PARSE"))
                  debug_parse = atoi(getenv("CTFCONVERT_DEBUG_PARSE"));
  
!         while ((c = getopt(argc, argv, ":l:L:o:givs")) != EOF) {
                  switch (c) {
                  case 'l':
                          label = optarg;
                          break;
                  case 'L':
--- 159,169 ----
          if (getenv("CTFCONVERT_DEBUG_LEVEL"))
                  debug_level = atoi(getenv("CTFCONVERT_DEBUG_LEVEL"));
          if (getenv("CTFCONVERT_DEBUG_PARSE"))
                  debug_parse = atoi(getenv("CTFCONVERT_DEBUG_PARSE"));
  
!         while ((c = getopt(argc, argv, ":l:L:o:ivs")) != EOF) {
                  switch (c) {
                  case 'l':
                          label = optarg;
                          break;
                  case 'L':
*** 180,204 ****
                          dynsym = CTF_USE_DYNSYM;
                          break;
                  case 'i':
                          ignore_non_c = 1;
                          break;
-                 case 'g':
-                         keep_stabs = CTF_KEEP_STABS;
-                         break;
                  case 'v':
                          verbose = 1;
                          break;
                  default:
                          usage();
                          exit(2);
                  }
          }
  
-         if (getenv("STRIPSTABS_KEEP_STABS") != NULL)
-                 keep_stabs = CTF_KEEP_STABS;
- 
          if (argc - optind != 1 || label == NULL) {
                  usage();
                  exit(2);
          }
  
--- 177,195 ----
*** 238,252 ****
           * If the user supplied an output file that is different from the
           * input file, write directly to the output file.  Otherwise, write
           * to a temporary file, and replace the input file when we're done.
           */
          if (outfile && strcmp(infile, outfile) != 0) {
!                 write_ctf(mstrtd, infile, outfile, dynsym | keep_stabs);
          } else {
                  char *tmpname = mktmpname(infile, ".ctf");
  
!                 write_ctf(mstrtd, infile, tmpname, dynsym | keep_stabs);
                  if (rename(tmpname, infile) != 0)
                          terminate("Couldn't rename temp file %s", tmpname);
                  free(tmpname);
          }
  
--- 229,243 ----
           * If the user supplied an output file that is different from the
           * input file, write directly to the output file.  Otherwise, write
           * to a temporary file, and replace the input file when we're done.
           */
          if (outfile && strcmp(infile, outfile) != 0) {
!                 write_ctf(mstrtd, infile, outfile, dynsym);
          } else {
                  char *tmpname = mktmpname(infile, ".ctf");
  
!                 write_ctf(mstrtd, infile, tmpname, dynsym);
                  if (rename(tmpname, infile) != 0)
                          terminate("Couldn't rename temp file %s", tmpname);
                  free(tmpname);
          }