Closes #25348: Merge with 3.5

diff --cc Misc/NEWS
index 6590842664c92fa6ac7628f316cdec55dfdd08a7,cc0c799d1ce281c94f199063b709cb2591a65d8a..54c70fced9384318319652a0f0abfc2d411a7681
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -581,6 -151,11 +581,10 @@@ Test
  Build
  -----
  
 -  old ``PCbuild\build_pgo.bat`` script is now deprecated, and simply calls
 -  ``PCbuild\build.bat --pgo %*``.
+ - Issue #25348: Added ``--pgo`` and ``--pgo-job`` arguments to
+   ``PCbuild\build.bat`` for building with Profile-Guided Optimization.  The
++  old ``PCbuild\build_pgo.bat`` script is removed.
+ 
  - Issue #25827: Add support for building with ICC to ``configure``, including
    a new ``--with-icc`` flag.
  

diff --cc PCbuild/build_pgo.bat
index 79ec2670b043653398e6a8bcd1c33cdc847fbff5,872c3822ecb21954c0c0228c7520f75ed5386a45..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/PCbuild/build_pgo.bat
--- 2/PCbuild/build_pgo.bat
+++ /dev/null
@@@ -1,48 -1,6 +1,0 @@@
--@echo off\r
- rem A batch program to build PGO (Profile guided optimization) by first\r
- rem building instrumented binaries, then running the testsuite, and\r
- rem finally building the optimized code.\r
- rem Note, after the first instrumented run, one can just keep on\r
- rem building the PGUpdate configuration while developing.\r
- \r
- setlocal\r
- set platf=Win32\r
- set parallel=/m\r
- set dir=%~dp0\r
- \r
- rem use the performance testsuite.  This is quick and simple\r
- set job1="%dir%..\tools\pybench\pybench.py" -n 1 -C 1 --with-gc\r
- set path1="%dir%..\tools\pybench"\r
- \r
- rem or the whole testsuite for more thorough testing\r
- set job2="%dir%..\lib\test\regrtest.py"\r
- set path2="%dir%..\lib"\r
- \r
- set job=%job1%\r
- set clrpath=%path1%\r
- \r
- :CheckOpts\r
- if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts\r
- if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts\r
- if "%1"=="-M" (set parallel=) & shift & goto CheckOpts\r
- \r
- \r
- rem We cannot cross compile PGO builds, as the optimization needs to be run natively\r
- set vs_platf=x86\r
- set PGO=%dir%win32-pgo\r
- \r
- if "%platf%"=="x64" (set vs_platf=amd64) & (set PGO=%dir%amd64-pgo)\r
- rem Setup the environment\r
- call "%dir%env.bat" %vs_platf%\r
- \r
- \r
- rem build the instrumented version\r
- msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGInstrument /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9\r
- \r
- rem remove .pyc files, .pgc files and execute the job\r
- "%PGO%\python.exe" "%dir%rmpyc.py" %clrpath%\r
- del "%PGO%\*.pgc"\r
- "%PGO%\python.exe" %job%\r
 -echo.DeprecationWarning:\r
 -echo.    This script is deprecated, use `build.bat --pgo` instead.\r
 -echo.\r
--\r
- rem build optimized version\r
- msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGUpdate /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9\r
 -call "%~dp0build.bat" --pgo %*\r