Merge branch 'PHP-8.4' into PHP-8.5

arnaud-lb · arnaud-lb · commit 6f32a4a7df6b · 2026-02-16T14:52:27.000+01:00
* PHP-8.4:
  Fix build with -std=
diff --git a/NEWS b/NEWS
@@ -15,6 +15,7 @@ PHP                                                                        NEWS
     accessing properties on Reflection LazyProxy via isset()). (Arnaud)
   . Fixed OSS-Fuzz #478009707 (Borked assign-op/inc/dec on untyped hooked
     property backing value). (ilutov)
+  . Fixed bug GH-21215 (Build fails with -std=). (Arnaud)
 
 - Date:
   . Fixed bug GH-20936 (DatePeriod::__set_state() cannot handle null start).
diff --git a/main/debug_gdb_scripts.c b/main/debug_gdb_scripts.c
diff --git a/scripts/gdb/debug_gdb_scripts_gen.php b/scripts/gdb/debug_gdb_scripts_gen.php
@@ -27,7 +27,7 @@
      *
      * See https://sourceware.org/gdb/current/onlinedocs/gdb.html/dotdebug_005fgdb_005fscripts-section.html#dotdebug_005fgdb_005fscripts-section
      */
-    asm(
+    __asm__(
         ".pushsection \".debug_gdb_scripts\", \"MS\",%%progbits,1\n"
         ".byte 4 /* Python Text */\n"
         ".ascii \"gdb.inlined-script\\n\"\n"

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* See https://sourceware.org/gdb/current/onlinedocs/gdb.html/dotdebug_005fgdb_005fscripts-section.html#dotdebug_005fgdb_005fscripts-section`
`29`	`29`	`*/`
`30`		`- asm(`
	`30`	`+ __asm__(`
`31`	`31`	`".pushsection \".debug_gdb_scripts\", \"MS\",%%progbits,1\n"`
`32`	`32`	`".byte 4 /* Python Text */\n"`
`33`	`33`	`".ascii \"gdb.inlined-script\\n\"\n"`