[FFmpeg-devel] [GASPP PATCH 1/2] Pass "-machine" options through to armasm

[FFmpeg-devel] [GASPP PATCH 1/2] Pass "-machine" options through to armasm

[Martin Storsjö via ffmpeg-devel]

Filter them out from the preprocessor invocation, and don't remove
them based on matching the "^-m" pattern.

As an alternative, we could also have gas-preprocessor.pl implicitly
add this option if the option "-arm64EC" is found, but requiring
the user to pass "-machine arm64ec" explicitly is more transparent.
---
 gas-preprocessor.pl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl
index 62c1a04..234c005 100755
--- a/gas-preprocessor.pl
+++ b/gas-preprocessor.pl
@@ -104,13 +104,17 @@ if ($as_type eq "armasm") {
 
     $preprocess_c_cmd[0] = "cpp";
 
-    # Remove -ignore XX parameter pairs from preprocess_c_cmd
+    # Remove -ignore XX and -machine XX parameter pairs from preprocess_c_cmd
     my $index = 1;
     while ($index < $#preprocess_c_cmd) {
         if ($preprocess_c_cmd[$index] eq "-ignore" and $index + 1 < $#preprocess_c_cmd) {
             splice(@preprocess_c_cmd, $index, 2);
             next;
         }
+        if ($preprocess_c_cmd[$index] eq "-machine" and $index + 1 < $#preprocess_c_cmd) {
+            splice(@preprocess_c_cmd, $index, 2);
+            next;
+        }
         $index++;
     }
     if (grep /^-MM$/, @preprocess_c_cmd) {
@@ -195,7 +199,8 @@ if ($as_type ne "armasm") {
     # which doesn't support any of the common compiler/preprocessor options.
     @gcc_cmd = grep ! /^-D/, @gcc_cmd;
     @gcc_cmd = grep ! /^-U/, @gcc_cmd;
-    @gcc_cmd = grep ! /^-m/, @gcc_cmd;
+    # Remove -m* parameters, except for -machine, which is a valid armasm option.
+    @gcc_cmd = grep ! /^-m(?!achine)/, @gcc_cmd;
     @gcc_cmd = grep ! /^-M/, @gcc_cmd;
     @gcc_cmd = grep ! /^-c$/, @gcc_cmd;
     @gcc_cmd = grep ! /^-I/, @gcc_cmd;
-- 
2.43.0

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

[FFmpeg-devel] [GASPP PATCH 2/2] Filter out the cl.exe option -arm64EC from armasm

[Martin Storsjö via ffmpeg-devel]

---
 gas-preprocessor.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl
index 234c005..1ba0563 100755
--- a/gas-preprocessor.pl
+++ b/gas-preprocessor.pl
@@ -188,6 +188,7 @@ if ($as_type ne "armasm") {
     @gcc_cmd = grep ! /^-Z/, @gcc_cmd;
     @gcc_cmd = grep ! /^-fp/, @gcc_cmd;
     @gcc_cmd = grep ! /^-EHsc$/, @gcc_cmd;
+    @gcc_cmd = grep ! /^-arm64EC$/, @gcc_cmd;
     @gcc_cmd = grep ! /^-O/, @gcc_cmd;
     @gcc_cmd = grep ! /^-FS/, @gcc_cmd;
     @gcc_cmd = grep ! /^-w/, @gcc_cmd;
-- 
2.43.0

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

[FFmpeg-devel] Re: [GASPP PATCH 1/2] Pass "-machine" options through to armasm

[Martin Storsjö via ffmpeg-devel]

On Fri, 3 Oct 2025, Martin Storsjö wrote:

> Filter them out from the preprocessor invocation, and don't remove
> them based on matching the "^-m" pattern.
>
> As an alternative, we could also have gas-preprocessor.pl implicitly
> add this option if the option "-arm64EC" is found, but requiring
> the user to pass "-machine arm64ec" explicitly is more transparent.
> ---
> gas-preprocessor.pl | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)

Ping Harish - does this look like a reasonable alternative to your patch? 
If you agree with this direction (and the other patch here), I'd go ahead 
and apply these, to have the gas-preprocessor aspect of arm64ec done.

// Martin
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

[FFmpeg-devel] Re: [GASPP PATCH 1/2] Pass "-machine" options through to armasm

[Harish Raja Selvan via ffmpeg-devel]

Hi Martin,
Thanks for the patch! I’ve tested it, and it works as expected. The static ARM64EC build of FFmpeg now builds successfully without any additional code changes. I’m now looking into the changes needed in the makedef script for the --enable-shared build.
Thanks,
Harish.
________________________________
From: Martin Storsjö <martin@martin.st>
Sent: 09 October 2025 17:41
To: ffmpeg-devel@ffmpeg.org <ffmpeg-devel@ffmpeg.org>
Cc: Harish Raja Selvan <harish.rajaselvan@multicorewareinc.com>
Subject: Re: [GASPP PATCH 1/2] Pass "-machine" options through to armasm

On Fri, 3 Oct 2025, Martin Storsjö wrote:

> Filter them out from the preprocessor invocation, and don't remove
> them based on matching the "^-m" pattern.
>
> As an alternative, we could also have gas-preprocessor.pl implicitly
> add this option if the option "-arm64EC" is found, but requiring
> the user to pass "-machine arm64ec" explicitly is more transparent.
> ---
> gas-preprocessor.pl | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)

Ping Harish - does this look like a reasonable alternative to your patch?
If you agree with this direction (and the other patch here), I'd go ahead
and apply these, to have the gas-preprocessor aspect of arm64ec done.

// Martin
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

[FFmpeg-devel] Re: [GASPP PATCH 1/2] Pass "-machine" options through to armasm

[Martin Storsjö via ffmpeg-devel]

On Fri, 10 Oct 2025, Harish Raja Selvan wrote:

> Hi Martin,
> Thanks for the patch! I’ve tested it, and it works as expected. The static
> ARM64EC build of FFmpeg now builds successfully without any additional code
> changes. I’m now looking into the changes needed in the makedef script for
> the --enable-shared build.

Thanks - then I'll go ahead and apply these two patches on 
gas-preprocessor.

// Martin
_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org