Merge remote branch 'origin/master' into edge

Author: automatic-merge

.github/workflows/build-binaries.sh

@@ -20,6 +20,7 @@ export CPATH=/usr/local/include:/mingw64/include
 export LIBRARY_PATH=/usr/local/lib:/mingw64/lib
 export DYLD_LIBRARY_PATH=/usr/local/lib
 export PATH=`ls -d $PWD/cached_gnat/*/bin |tr '\n' ':'`$PATH
+export ADAFLAGS=-g1
 echo PATH=$PATH
 
 BRANCH=master
@@ -78,5 +79,16 @@ if [ $RUNNER_OS = macOS ]; then
 fi
 
 if [ "$DEBUG" != "debug" ]; then
-    strip -v integration/vscode/ada/*/ada_language_server*
+    if [ $RUNNER_OS = macOS ]; then
+        # Install binutils to have objcopy on Mac OS X
+        brew install binutils
+        export PATH="/usr/local/opt/binutils/bin:$PATH"
+    fi
+    ALS=`ls integration/vscode/ada/*/ada_language_server*`
+    objcopy --only-keep-debug ${ALS} ${ALS}.debug
+    objcopy --strip-all ${ALS}
+    cd `dirname $ALS`
+    ALS=`basename ${ALS}`
+    objcopy --add-gnu-debuglink=${ALS}.debug ${ALS}
+    cd -
 fi

.github/workflows/pack-binaries.sh

@@ -19,6 +19,7 @@ function make_change_log()
 
 chmod -R -v +x als-*-$DEBUG
 for X in Linux macOS Windows ; do mv -v -f als-$X-$DEBUG/* integration/vscode/ada/; done
+rm -f -v integration/vscode/ada/{linux,darwin,win32}/*.debug
 pushd integration/vscode/ada
 sed -i -e "/version/s/[0-9][0-9.]*/$TAG/" package.json
 [ -z "$DEBUG" ] || sed -i -e '/^    "name"/s/ada/ada-debug/' \