Skip to content

Commit

Permalink
Revert "Enable whole program optimization for builds without PGO, too"
Browse files Browse the repository at this point in the history
This reverts commit f052e99.

There appear to be link issues with upcoming 19.11 and /LTCG, prefer
wider dependency compatibility.
  • Loading branch information
weltling committed Jul 13, 2017
1 parent d9f7288 commit bc16dee
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions win32/build/confutils.js
Original file line number Diff line number Diff line change
Expand Up @@ -1229,9 +1229,6 @@ function SAPI(sapiname, file_list, makefiletarget, cflags, obj_dir)
}

ldflags += " /PGD:$(PGOPGD_DIR)\\" + makefiletarget.substring(0, makefiletarget.indexOf(".")) + ".pgd";
} else if (PHP_DEBUG != "yes") {
ADD_FLAG('CFLAGS_' + SAPI, "/GL");
ADD_FLAG('LDFLAGS_' + SAPI, "/LTCG:INCREMENTAL");
}

if (MODE_PHPIZE) {
Expand Down Expand Up @@ -1432,9 +1429,6 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
ADD_FLAG('CFLAGS_' + EXT, "/GL /O2");

ldflags = " /PGD:$(PGOPGD_DIR)\\" + dllname.substring(0, dllname.indexOf(".")) + ".pgd";
} else if (PHP_DEBUG != "yes") {
ADD_FLAG('CFLAGS_' + EXT, "/GL");
ADD_FLAG('LDFLAGS_' + EXT, "/LTCG:INCREMENTAL");
}

MFO.WriteLine("$(BUILD_DIR)\\" + libname + ": $(BUILD_DIR)\\" + dllname);
Expand Down Expand Up @@ -1477,9 +1471,6 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
ADD_FLAG("STATIC_EXT_CFLAGS", "/GL /O2");
static_pgo_enabled = true;
}
} else if (PHP_DEBUG != "yes") {
ADD_FLAG("STATIC_EXT_CFLAGS", "/GL");
ADD_FLAG('STATIC_EXT_LDFLAGS', "/LTCG:INCREMENTAL");
}

/* find the header that declares the module pointer,
Expand Down

0 comments on commit bc16dee

Please sign in to comment.