5.36: disable BUILTIN_EXPECT and compile with -Os

Updates #85

Author: shawnlaffan

share/64bit-5.36.0.1.pp

@@ -107,17 +107,18 @@
             '<dist_sharedir>/perl-5.36/perlexe.rc.tt'           => 'win32/perlexe.rc',
             '<dist_sharedir>/perl-5.36/perl_pr19663.diff'       => '*',
             '<dist_sharedir>/perl-5.36/rt142390.patch'          => '*',
-            '<dist_sharedir>/perl-5.36/perl_pr20008.diff'          => '*',
+            '<dist_sharedir>/perl-5.36/perl_pr20008.diff'       => '*',
+            '<dist_sharedir>/perl-5.36/perl_pr20136.patch'      => '*',
             'config_H.gc'                                 => {
                 I_DBM  => 'define',
                 I_GDBM => 'define',
                 I_NDBM => 'define',
-                HAS_BUILTIN_EXPECT      => 'define',
+                #HAS_BUILTIN_EXPECT      => 'define',
                 HAS_BUILTIN_CHOOSE_EXPR => 'define',
             },
             'config.gc'                                 => {  # see Step.pm for list of default updates 
                 d_builtin_choose_expr => 'define',
-                d_builtin_expect      => 'define',
+                #d_builtin_expect      => 'define',
                 d_mkstemp             => 'define',
                 d_ndbm                => 'define',
                 i_db                  => 'define',

share/perl-5.36/perl_pr20136.patch

@@ -0,0 +1,41 @@
+From cc51139c88a245c5942733f231181798cd3b310f Mon Sep 17 00:00:00 2001
+From: Kenneth Olwing <[email protected]>
+Date: Thu, 25 Aug 2022 18:48:26 +0200
+Subject: [PATCH] Change optimization level for Win32 builds
+
+This fixes #20136.
+
+Building on Windows 11 with the Strawberry 5.32.1 (gcc 8.3.0) toolchain,
+multiple errors in the tests are seen. Worse, building on Windows 10
+no test errors crop up, but the resulting perl will still crash and die
+when run the tests manually on Windows 11.
+
+Changing the optimization level to -Os as found in #20024, the build now
+and tests now succeed.
+---
+ win32/GNUmakefile | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/win32/GNUmakefile b/win32/GNUmakefile
+index 7b91d35ab004..81ded707b946 100644
+--- a/win32/GNUmakefile
++++ b/win32/GNUmakefile
+@@ -608,11 +608,16 @@ LIBFILES	+= -lquadmath
+ endif
+ 
+ ifeq ($(CFG),Debug)
+-OPTIMIZE	= -g -O2
++# According to https://gcc.gnu.org/onlinedocs/gcc-8.3.0/gcc/Optimize-Options.html
++# -Og should provide some optimizations while still giving convenient debugging
++OPTIMIZE	= -g -Og
+ LINK_DBG	= -g
+ DEFINES		+= -DDEBUGGING
+ else
+-OPTIMIZE	= -O2
++# In https://github.com/Perl/perl5/issues/20081 it is found that the previous
++# optimization level -O2 causes generated code that fails in mysterious ways
++# when run on Win11 (*even* if it was built and successfully tested on Win10!).
++OPTIMIZE	= -Os
+ LINK_DBG	= -s
+ endif
+