Review

Author: arnaud-lb

scripts/gdb/php_gdb.gdb renamed to .gdbinit

@@ -1704,7 +1704,7 @@ if printf "#if __ELF__\nelf\n#endif\n" | $CC -E - | grep elf > /dev/null; then
   PHP_ADD_SOURCES(main, debug_gdb_scripts.c)
 
   cat >> Makefile.objects <<EOF
-$abs_srcdir/main/debug_gdb_scripts.c: $abs_srcdir/scripts/gdb/debug_gdb_scripts_gen.php $abs_srcdir/scripts/gdb/php_gdb.py $abs_srcdir/scripts/gdb/php_gdb.gdb
+$abs_srcdir/main/debug_gdb_scripts.c: $abs_srcdir/scripts/gdb/debug_gdb_scripts_gen.php $abs_srcdir/scripts/gdb/php_gdb.py $abs_srcdir/.gdbinit
 	@if test ! -z "\$(PHP)"; then \\
 		\$(PHP) $abs_srcdir/scripts/gdb/debug_gdb_scripts_gen.php; \\
 	fi;

configure.ac

@@ -1,7 +1,7 @@
 /*
  * Generated by debug_gdb_scripts_gen.php.
  *
- * This inlines php_gdb.gdb and php_gdb.py into the .debug_gdb_scripts
+ * This inlines .gdbinit and php_gdb.py into the .debug_gdb_scripts
  * section of the binary, so that they can be found by gdb.
  *
  * See https://sourceware.org/gdb/current/onlinedocs/gdb.html/dotdebug_005fgdb_005fscripts-section.html#dotdebug_005fgdb_005fscripts-section
@@ -1015,4 +1015,4 @@ asm(
     ".ascii \"\\n\"\n"
     ".byte 0\n"
     ".popsection\n"
-);
+);

main/debug_gdb_scripts.c

@@ -1,16 +1,16 @@
 #!/usr/bin/env php
 <?php
 
-$mainDir = sprintf('%s/main', dirname(__DIR__, 2));
+$rootDir = dirname(__DIR__, 2);
+$mainDir = sprintf('%s/main', $rootDir);
 $outputFile = sprintf('%s/debug_gdb_scripts.c', $mainDir);
 
 printf("Generating %s\n", $outputFile);
 
-$gdbscript = file_get_contents(sprintf("%s/php_gdb.gdb", __DIR__));
+$gdbscript = file_get_contents(sprintf("%s/.gdbinit", $rootDir));
 $pyscript = file_get_contents(sprintf("%s/php_gdb.py", __DIR__));
 
-// We can not inline scripts in the gdb command languages, but we can embed them
-// in the python script.
+// We can not inline .gdbinit, but we can embed it in the python script.
 $pyscript = sprintf(
     "gdb.execute('''\n%s\n''')\n%s",
     addcslashes($gdbscript, '\'\\'),
@@ -22,7 +22,7 @@
     /*
      * Generated by %s.
      *
-     * This inlines php_gdb.gdb and php_gdb.py into the .debug_gdb_scripts
+     * This inlines .gdbinit and php_gdb.py into the .debug_gdb_scripts
      * section of the binary, so that they can be found by gdb.
      *
      * See https://sourceware.org/gdb/current/onlinedocs/gdb.html/dotdebug_005fgdb_005fscripts-section.html#dotdebug_005fgdb_005fscripts-section
@@ -35,6 +35,7 @@
         ".byte 0\n"
         ".popsection\n"
     );
+
     C,
     basename(__FILE__),
     implode("\n    ", array_map(function ($line) {