From: Pietro Monteiro <pietro@sociotechnical.xyz>
Date: Thu, 29 Jan 2026 01:16:04 +0000 (-0500)
Subject: libffi: Remove more unneeded files when merging
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73650105ba44665fe9cdb9f001953bb32e99fec0;p=thirdparty%2Fgcc.git

libffi: Remove more unneeded files when merging

Delete .allow-ai-service and .gail-labels which are present in newer
versions of libffi.

libffi/ChangeLog:
	PR libffi/117635
	* merge.sh: Delete .allow-ai-service and .gail-labels when
	merging new upstream versions.

Signed-off-by: Pietro Monteiro <pietro@sociotechnical.xyz>
---

diff --git a/libffi/merge.sh b/libffi/merge.sh
index b36fbb92185..d9db9b01a78 100755
--- a/libffi/merge.sh
+++ b/libffi/merge.sh
@@ -33,9 +33,11 @@ echo Current upstream revision: $CUR_REV
 
 # Remove the unused files.
 pushd upstream
-rm -rf ChangeLog.old .appveyor* .ci .github .gitignore .travis* \
-	config.guess config.sub libtool-ldflags m4 make_sunver.pl \
-	msvc_build
+
+rm -rf ChangeLog.old .allow-ai-service .gail-labels .appveyor* .ci .github \
+	.gitignore .travis* config.guess config.sub libtool-ldflags m4 \
+	make_sunver.pl msvc_build
+
 rm -rf .git autogen.sh
 cp -a . ..
 popd