ntoskrnl/ex/i386/interlck_asm.S fails to compile due to EFLAG_SELECT

[Alex Buell]

I thought that it was agreed that the minimum version of binutils would
be at least 2.15.90.0.2? The fix for this requires a newer version?

make[1]: Entering directory `/home/alex/src/OpSys/reactos'
[GAS]      ntoskrnl/ex/i386/interlck_asm.S
ntoskrnl/ex/i386/interlck_asm.S: Assembler messages:
ntoskrnl/ex/i386/interlck_asm.S:440: Error: Unrecognized token `|0x4000'
ntoskrnl/ex/i386/interlck_asm.S:459: Error: Unrecognized token `|
0x4000)' ntoskrnl/ex/i386/interlck_asm.S:459: Error: Unexpected token `'
ntoskrnl/ex/i386/interlck_asm.S:508: Error: Unrecognized token `|
0x4000)'

ntoskrnl/ex/i386/interlck_asm.S:508: Error: Unexpected token `'

ntoskrnl/ex/i386/interlck_asm.S:527: Error: Unrecognized token `|
0x4000)'

ntoskrnl/ex/i386/interlck_asm.S:527: Error: Unexpected token `'

make[1]: *** [obj-i386/ntoskrnl/ex/i386/interlck_asm.o] Error 1
-- 
http://www.munted.org.uk

Anyone that thinks an imaginary deity is going to protect them against 
earthquakes and hurricanes needs psychiatric help.

[Ge van Geldorp]

> From: Alex Buell
>
> I thought that it was agreed that the minimum version of 
> binutils would be at least 2.15.90.0.2? The fix for this 
> requires a newer version?
>
> make[1]: Entering directory `/home/alex/src/OpSys/reactos'
> [GAS]      ntoskrnl/ex/i386/interlck_asm.S
> ntoskrnl/ex/i386/interlck_asm.S: Assembler messages:
> ntoskrnl/ex/i386/interlck_asm.S:440: Error: Unrecognized token `|0x4000'

Patch below will probably fix this:

Index: include/ndk/asm.h
===================================================================
--- include/ndk/asm.h   (revision 20477)
+++ include/ndk/asm.h   (working copy)
@@ -291,7 +291,7 @@
 #define EFLAGS_VIP                              0x100000
 #define EFLAG_SIGN                              0x8000
 #define EFLAG_ZERO                              0x4000
-#define EFLAG_SELECT                            (EFLAG_SIGN | EFLAG_ZERO)
+#define EFLAG_SELECT                            (EFLAG_SIGN + EFLAG_ZERO)

//
 // CR0

[Alex Buell]

On Sat, 31 Dec 2005 19:09:37 +0100 "Ge van Geldorp" [e-mail]
waved a wand and this message magically appeared:
> Index: include/ndk/asm.h
>
> --- include/ndk/asm.h   (revision 20477)
> +++ include/ndk/asm.h   (working copy)
> @@ -291,7 +291,7 @@
>  #define EFLAGS_VIP                              0x100000
>  #define EFLAG_SIGN                              0x8000
>  #define EFLAG_ZERO                              0x4000
> -#define EFLAG_SELECT                            (EFLAG_SIGN | EFLAG_ZERO)
> +#define EFLAG_SELECT                            (EFLAG_SIGN + EFLAG_ZERO)

Nah, I tried that and it resulted in the following:

[PCH]      obj-i386/boot/freeldr/freeldr/include/freeldr.h.gch
In file included from include/ndk/ntndk.h:61,
                 from boot/freeldr/freeldr/include/freeldr.h:28:
include/ndk/asm.h:294:1: "EFLAG_SELECT" redefined
In file included from w32api/include/ddk/ntddk.h:72,
                 from boot/freeldr/freeldr/include/freeldr.h:27:
w32api/include/ddk/winddk.h:4958:1: this is the location of the
previous definition make[1]: ***
[obj-i386/boot/freeldr/freeldr/include/freeldr.h.gch] Error 1 make[1]:
Leaving directory `/home/alex/src/OpSys/reactos'
-- 
http://www.munted.org.uk

Anyone that thinks an imaginary deity is going to protect them against 
earthquakes and hurricanes needs psychiatric help.

[Ge van Geldorp]

> From: Alex Buell
>
> Nah, I tried that and it resulted in the following:
>
> w32api/include/ddk/winddk.h:4958:1: this is the location of 
> the previous definition make[1]: ***

Yes, sorry, you have to make the same change ("|" -> "+") in
w32api/include/ddk/winddk.h at line 4958.

GvG

[Alex Buell]

On Sat, 31 Dec 2005 20:29:14 +0100 "Ge van Geldorp" [e-mail]
waved a wand and this message magically appeared:
> > From: Alex Buell
> >
> > Nah, I tried that and it resulted in the following:
> >
> > w32api/include/ddk/winddk.h:4958:1: this is the location of 
> > the previous definition make[1]: ***
>
> Yes, sorry, you have to make the same change ("|" -> "+") in
> w32api/include/ddk/winddk.h at line 4958.

OK, that definitely compiles now. Thanks, it would be a good idea to
commit the change.
-- 
http://www.munted.org.uk

Anyone that thinks an imaginary deity is going to protect them against 
earthquakes and hurricanes needs psychiatric help.

[Alex Ionescu]

Ge van Geldorp wrote:
> > From: Alex Buell
> >
> > Nah, I tried that and it resulted in the following:
> >
> > w32api/include/ddk/winddk.h:4958:1: this is the location of 
> > the previous definition make[1]: ***
>
> Yes, sorry, you have to make the same change ("|" -> "+") in
> w32api/include/ddk/winddk.h at line 4958.
>
> GvG
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

Hi,

Doing this change would break compiling with the MS PSDK. Suggestions?

Best regards,
Alex Ionescu

[Ge van Geldorp]

> From: Alex Ionescu
>
> Doing this change would break compiling with the MS PSDK. Suggestions?

The patch below (no change needed to w32api/include/ddk/winddk.h anymore)
works OK on both "old" and "new" GNU toolchain. I assume it works with the
MS PSDK too, but haven't tested that.

GvG

Index: include/ndk/asm.h
===================================================================
--- include/ndk/asm.h   (revision 20528)
+++ include/ndk/asm.h   (working copy)
@@ -291,7 +291,9 @@
 #define EFLAGS_VIP                              0x100000
 #define EFLAG_SIGN                              0x8000
 #define EFLAG_ZERO                              0x4000
-#define EFLAG_SELECT                            (EFLAG_SIGN | EFLAG_ZERO)
+#ifndef EFLAG_SELECT
+#define EFLAG_SELECT                            (EFLAG_SIGN + EFLAG_ZERO)
+#endif

//
 // CR0

[Alex Buell]

On Mon, 2 Jan 2006 17:42:49 +0100 "Ge van Geldorp" [e-mail]
waved a wand and this message magically appeared:
> > From: Alex Ionescu
> >
> > Doing this change would break compiling with the MS PSDK. Suggestions?
>
> The patch below (no change needed to w32api/include/ddk/winddk.h anymore)
> works OK on both "old" and "new" GNU toolchain. I assume it works with the
> MS PSDK too, but haven't tested that.

I'm testing that right now (having reverted the changes to winddk.h)
-- 
http://www.munted.org.uk

Anyone that thinks an imaginary deity is going to protect them against 
earthquakes and hurricanes needs psychiatric help.

[Alex Buell]

On Mon, 2 Jan 2006 17:42:49 +0100 "Ge van Geldorp" [e-mail]
waved a wand and this message magically appeared:
> The patch below (no change needed to w32api/include/ddk/winddk.h anymore)
> works OK on both "old" and "new" GNU toolchain. I assume it works with the
> MS PSDK too, but haven't tested that.
>
> GvG
> Index: include/ndk/asm.h
>
> --- include/ndk/asm.h   (revision 20528)
> +++ include/ndk/asm.h   (working copy)
> @@ -291,7 +291,9 @@
>  #define EFLAGS_VIP                              0x100000
>  #define EFLAG_SIGN                              0x8000
>  #define EFLAG_ZERO                              0x4000
> -#define EFLAG_SELECT                            (EFLAG_SIGN | EFLAG_ZERO)
> +#ifndef EFLAG_SELECT
> +#define EFLAG_SELECT                            (EFLAG_SIGN + EFLAG_ZERO)
> +#endif

This works; but you also need to put a #ifndef guard around EFLAG_ZERO
as well.
-- 
http://www.munted.org.uk

Anyone that thinks an imaginary deity is going to protect them against 
earthquakes and hurricanes needs psychiatric help.