Print this page
make: unifdef for two bugfixes conditioned for unknown reasons (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/main.cc
          +++ new/usr/src/cmd/make/bin/main.cc
↓ open down ↓ 54 lines elided ↑ open up ↑
  55   55  #include <sys/wait.h>           /* wait() */
  56   56  #include <unistd.h>             /* execv(), unlink(), access() */
  57   57  #include <vroot/report.h>       /* report_dependency(), get_report_file() */
  58   58  
  59   59  // From read2.cc
  60   60  extern  Name            normalize_name(register wchar_t *name_string, register int length);
  61   61  
  62   62  // From parallel.cc
  63   63  #define MAXJOBS_ADJUST_RFE4694000
  64   64  
  65      -#ifdef MAXJOBS_ADJUST_RFE4694000
  66   65  extern void job_adjust_fini();
  67      -#endif /* MAXJOBS_ADJUST_RFE4694000 */
  68   66  
  69   67  
  70   68  /*
  71   69   * Defined macros
  72   70   */
  73   71  #define LD_SUPPORT_ENV_VAR      "SGS_SUPPORT_32"
  74   72  #define LD_SUPPORT_ENV_VAR_32   "SGS_SUPPORT_32"
  75   73  #define LD_SUPPORT_ENV_VAR_64   "SGS_SUPPORT_64"
  76   74  #define LD_SUPPORT_MAKE_LIB     "libmakestate.so.1"
  77   75  #ifdef __i386
↓ open down ↓ 630 lines elided ↑ open up ↑
 708  706          }
 709  707          /* Remove the statefile lock file if the file has been locked */
 710  708          if ((make_state_lockfile != NULL) && (make_state_locked)) {
 711  709                  (void) unlink(make_state_lockfile);
 712  710                  make_state_lockfile = NULL;
 713  711                  make_state_locked = false;
 714  712          }
 715  713          /* Write .make.state */
 716  714          write_state_file(1, (Boolean) 1);
 717  715  
 718      -#if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
 719  716          job_adjust_fini();
 720      -#endif
 721  717  }
 722  718  
 723  719  /*
 724  720   *      handle_interrupt()
 725  721   *
 726  722   *      This is where C-C traps are caught.
 727  723   *
 728  724   *      Parameters:
 729  725   *
 730  726   *      Global variables used (except DMake 1.0):
↓ open down ↓ 426 lines elided ↑ open up ↑
1157 1153                   * If new MAKEFLAGS format, no need to add hyphen.
1158 1154                   * If old MAKEFLAGS format, add hyphen before flags.
1159 1155                   */
1160 1156  
1161 1157                  if ((strchr(cp, (int) hyphen_char) != NULL) ||
1162 1158                      (strchr(cp, (int) equal_char) != NULL)) {
1163 1159  
1164 1160                          /* New MAKEFLAGS format */
1165 1161  
1166 1162                          add_hyphen = false;
1167      -#ifdef ADDFIX5060758                    
     1163 +
1168 1164                          /* Check if MAKEFLAGS value begins with multiple
1169 1165                           * hyphen characters, and remove all duplicates.
1170 1166                           * Usually it happens when the next command is
1171 1167                           * used: $(MAKE) -$(MAKEFLAGS)
1172      -                         * This is a workaround for BugID 5060758.
     1168 +                         * 
     1169 +                         * This was a workaround for BugID 5060758, but
     1170 +                         * appears to have survived as a fix in make.
1173 1171                           */
1174 1172                          while (*cp) {
1175 1173                                  if (*cp != (int) hyphen_char) {
1176 1174                                          break;
1177 1175                                  }
1178 1176                                  cp++;
1179 1177                                  if (*cp == (int) hyphen_char) {
1180 1178                                          /* There are two hyphens. Skip one */
1181 1179                                          cp_orig = cp;
1182 1180                                          cp++;
1183 1181                                  }
1184 1182                                  if (!(*cp)) {
1185 1183                                          /* There are hyphens only. Skip all */
1186 1184                                          cp_orig = cp;
1187 1185                                          break;
1188 1186                                  }
1189 1187                          }
1190      -#endif
1191 1188                  } else {
1192 1189  
1193 1190                          /* Old MAKEFLAGS format */
1194 1191  
1195 1192                          add_hyphen = true;
1196 1193                  }
1197 1194          }
1198 1195  
1199 1196          /* Find the number of arguments in MAKEFLAGS */
1200 1197          while (cp && *cp) {
↓ open down ↓ 2014 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX