[PATCH] build: normalize arm targets

[PATCH] build: normalize arm targets

[Julian Wundrak]

Linux distributions use different dumpmachine outputs for the ARM
architecture. arm, armv6l, armv7l.
For the syscall annotation, these variants are standardized to “arm”.

Signed-off-by: Julian Wundrak <julian@wundrak.net>
---
Hey everyone,

This resolves bug #117. 
I hope I did everything correctly, because this is the first time I have
had to submit a patch via git send emails.

Julian


 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 31cbac3..1b83234 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ $(if $(TARGET),,$(error Failed to get target architecture))
 # Get 'uname -m'-like architecture description for target
 TARGET_ARCH := $(firstword $(subst -, ,$(TARGET)))
 TARGET_ARCH := $(patsubst [:upper:],[:lower:],$(TARGET_ARCH))
+TARGET_ARCH := $(patsubst arm%,arm,$(TARGET))
 TARGET_ARCH := $(subst powerpc,ppc,$(TARGET_ARCH))
 
 # On some systems enabling optimization also enables source fortification,
-- 
@@ -20,6 +20,7 @@ $(if $(TARGET),,$(error Failed to get target architecture))
 # Get 'uname -m'-like architecture description for target
 TARGET_ARCH := $(firstword $(subst -, ,$(TARGET)))
 TARGET_ARCH := $(patsubst [:upper:],[:lower:],$(TARGET_ARCH))
+TARGET_ARCH := $(patsubst arm%,arm,$(TARGET))
 TARGET_ARCH := $(subst powerpc,ppc,$(TARGET_ARCH))
 
 # On some systems enabling optimization also enables source fortification,
-- 
2.49.0

Re: [PATCH] build: normalize arm targets

[Stefano Brivio]

Hi Julian,

On Wed, 26 Mar 2025 20:14:31 +0000
Julian Wundrak <julian@wundrak.net> wrote:

> Linux distributions use different dumpmachine outputs for the ARM
> architecture. arm, armv6l, armv7l.
> For the syscall annotation, these variants are standardized to “arm”.
> 
> Signed-off-by: Julian Wundrak <julian@wundrak.net>
> ---
> Hey everyone,
> 
> This resolves bug #117. 
> I hope I did everything correctly, because this is the first time I have
> had to submit a patch via git send emails.

Then you got it right on the first attempt! I'll just add a tag in the
commit message:

Link: https://bugs.passt.top/show_bug.cgi?id=117

...and I'll run tests, then apply it.

-- 
Stefano

Re: [PATCH] build: normalize arm targets

[Stefano Brivio]

On Wed, 26 Mar 2025 21:29:02 +0100
Stefano Brivio <sbrivio@redhat.com> wrote:

> Hi Julian,
> 
> On Wed, 26 Mar 2025 20:14:31 +0000
> Julian Wundrak <julian@wundrak.net> wrote:
> 
> > Linux distributions use different dumpmachine outputs for the ARM
> > architecture. arm, armv6l, armv7l.
> > For the syscall annotation, these variants are standardized to “arm”.
> > 
> > Signed-off-by: Julian Wundrak <julian@wundrak.net>
> > ---
> > Hey everyone,
> > 
> > This resolves bug #117. 
> > I hope I did everything correctly, because this is the first time I have
> > had to submit a patch via git send emails.  
> 
> Then you got it right on the first attempt! I'll just add a tag in the
> commit message:
> 
> Link: https://bugs.passt.top/show_bug.cgi?id=117
> 
> ...and I'll run tests, then apply it.

...almost: you forgot to fix this as you mentioned in:

  https://bugs.passt.top/show_bug.cgi?id=117#c3

I'm fixing it up on merge as it's a trivial typo.

-- 
Stefano

RE: [PATCH] build: normalize arm targets

[Julian Wundrak]

Thanks Stefano,

Sorry for this stupid error and the overhead.

---
 
Von: "Stefano Brivio" <sbrivio@redhat.com> 
 An: "Julian Wundrak" <julian@wundrak.net> 
Cc: "undefined" <passt-dev@passt.top>
Gesendet: Mittwoch, 26. März 2025 21:45 
 Betreff: Re: [PATCH] build: normalize arm targets 

On Wed, 26 Mar 2025 21:29:02 +0100
Stefano Brivio  wrote:

> Hi Julian,
> 
> On Wed, 26 Mar 2025 20:14:31 +0000
> Julian Wundrak  wrote:
> 
> > Linux distributions use different dumpmachine outputs for the ARM
> > architecture. arm, armv6l, armv7l.
> > For the syscall annotation, these variants are standardized to “arm”.
> > 
> > Signed-off-by: Julian Wundrak 
> > ---
> > Hey everyone,
> > 
> > This resolves bug #117. 
> > I hope I did everything correctly, because this is the first time I have
> > had to submit a patch via git send emails.  
> 
> Then you got it right on the first attempt! I'll just add a tag in the
> commit message:
> 
> Link: https://bugs.passt.top/show_bug.cgi?id=117
> 
> ...and I'll run tests, then apply it.

...almost: you forgot to fix this as you mentioned in:

  https://bugs.passt.top/show_bug.cgi?id=117#c3

I'm fixing it up on merge as it's a trivial typo.

-- 
Stefano

Re: [PATCH] build: normalize arm targets

[Stefano Brivio]

On Wed, 26 Mar 2025 21:18:57 +0000 (UTC)
Julian Wundrak <julian@wundrak.net> wrote:

> Thanks Stefano,
> 
> Sorry for this stupid error and the overhead.

No worries, thanks for the fix, patch applied, welcome to the git log!

-- 
Stefano

[PATCH] build: normalize arm targets

[Julian Wundrak]

Linux distributions use different dumpmachine outputs for the ARM
architecture. arm, armv6l, armv7l.
For the syscall annotation, these variants are standardized to “arm”.

Signed-off-by: Julian Wundrak <julian@wundrak.net>
---
Argh, same problem with target instead of target_arch as in comment.
I squashed it, but I'm not sure, how this works with the mails.

Sorry for the overhead!
Julian

 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 31cbac3..3328f83 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ $(if $(TARGET),,$(error Failed to get target architecture))
 # Get 'uname -m'-like architecture description for target
 TARGET_ARCH := $(firstword $(subst -, ,$(TARGET)))
 TARGET_ARCH := $(patsubst [:upper:],[:lower:],$(TARGET_ARCH))
+TARGET_ARCH := $(patsubst arm%,arm,$(TARGET_ARCH))
 TARGET_ARCH := $(subst powerpc,ppc,$(TARGET_ARCH))
 
 # On some systems enabling optimization also enables source fortification,
-- 
@@ -20,6 +20,7 @@ $(if $(TARGET),,$(error Failed to get target architecture))
 # Get 'uname -m'-like architecture description for target
 TARGET_ARCH := $(firstword $(subst -, ,$(TARGET)))
 TARGET_ARCH := $(patsubst [:upper:],[:lower:],$(TARGET_ARCH))
+TARGET_ARCH := $(patsubst arm%,arm,$(TARGET_ARCH))
 TARGET_ARCH := $(subst powerpc,ppc,$(TARGET_ARCH))
 
 # On some systems enabling optimization also enables source fortification,
-- 
2.49.0