| Message ID | 1414832179.11706.6.camel@mehome |
|---|---|
| State | Superseded |
| Commit | f7db1709ab9785302b00e9671f9c652f4fac6851 |
| Headers | show |
On 1 November 2014 09:56, Sergei Poselenov <sposelenov@emcraft.com> wrote: > commit 1ca3444a4df22ecf6257eb40aa79b69c6f153283 > Author: Sergei Poselenov <sposelenov@emcraft.com> > Date: Sun Oct 26 14:52:40 2014 +0400 > > Fixed build error for Cortex-M3. I applied exactly this in January as f7db1709ab9785302b00e9671f9c652f4fac6851 ? thanks, > > Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com> > > diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h > index 921c9a3..27d22bb 100644 > --- a/libc/sysdeps/linux/arm/bits/arm_asm.h > +++ b/libc/sysdeps/linux/arm/bits/arm_asm.h > @@ -3,9 +3,11 @@ > #define _ARM_ASM_H > > #ifdef __thumb2__ > +#ifdef __ASSEMBLER__ > .thumb > .syntax unified > #define IT(t, cond) i##t cond > +#endif /* __ASSEMBLER__ */ > #else > /* XXX: This can be removed if/when we require an assembler that supports > unified assembly syntax. */ > >
diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h index 921c9a3..27d22bb 100644 --- a/libc/sysdeps/linux/arm/bits/arm_asm.h +++ b/libc/sysdeps/linux/arm/bits/arm_asm.h @@ -3,9 +3,11 @@ #define _ARM_ASM_H #ifdef __thumb2__ +#ifdef __ASSEMBLER__ .thumb .syntax unified #define IT(t, cond) i##t cond +#endif /* __ASSEMBLER__ */ #else /* XXX: This can be removed if/when we require an assembler that supports unified assembly syntax. */
commit 1ca3444a4df22ecf6257eb40aa79b69c6f153283 Author: Sergei Poselenov <sposelenov@emcraft.com> Date: Sun Oct 26 14:52:40 2014 +0400 Fixed build error for Cortex-M3. Signed-off-by: Sergei Poselenov <sposelenov@emcraft.com>