[LinuxBIOS] [patch] LINUXBIOS_ASSEMBLER & GCC_INC_DIR definitions

[magicfox]

Hi,

1. If assembler version string contain parentheses like 
(i686-pc-linux-gnu), it breaks bash on Makefile.

2. No gcc message language depend of GCC_INC_DIR definition.

src_config.patch corrects items 1-2 vs last svn revision 2009 .

I have also a problem with udelay in ibm/e325 make

...
/LinuxBIOSv2/src/mainboard/ibm/e325/auto.c -o auto.inc
delay.c:9.1:
udelay already defined
make[1]: *** [auto.inc] Error 1

Please, can somebody help ?

Best regards

[Li-Ta Lo]

On Sun, 2005-08-28 at 18:41 +0200, magicfox wrote:
> Hi,
> If assembler version string contain parentheses like
>
> (i686-pc-linux-gnu), it breaks bash on Makefile.
> No gcc message language depend of GCC_INC_DIR definition.
>
> src_config.patch corrects items 1-2 vs last svn revision 2009 .
>
> I have also a problem with udelay in ibm/e325 make
>
> ...
> /LinuxBIOSv2/src/mainboard/ibm/e325/auto.c -o auto.inc
> delay.c:9.1:
> udelay already defined
> make[1]: *** [auto.inc] Error 1

??? Somebody "fixed" the problem in the wrong way?
> Please, can somebody help ?
>
> Best regards

[magicfox]

Li-Ta Lo wrote :
> ??? Somebody "fixed" the problem in the wrong way?

Of course me ! ;-)

I have to define udelay for emulation/qemu-i386,
else i get:
mainboard/emulation/qemu-i386/auto.c -o auto.inc
delay.c:6.23:
udelay undeclared
make[1]: *** [auto.inc] Error 1

ibm/e325 compile fine with original svn version 2009
What is the good way to correct problem with udelay ?

My last patch wasn't correct string version containing "'" who is 
breaking make process.
This new one do that. Please test it and apply.

Best regards

--- LinuxBIOSv2/src/config/Config.lb.orig	Tue Aug  2 18:28:38 2005
+++ LinuxBIOSv2/src/config/Config.lb	Sun Aug 28 23:15:50 2005
@@ -4,7 +4,7 @@

makedefine CPP:= $(CC) -x assembler-with-cpp -DASSEMBLY -E
  makedefine LIBGCC_FILE_NAME := $(shell $(CC) -print-libgcc-file-name)
-makedefine GCC_INC_DIR := $(shell $(CC) -print-search-dirs | sed -ne 
"s/install: (.*)/\1include/gp")
+makedefine GCC_INC_DIR := $(shell $(CC) -print-search-dirs | sed -ne 
'1s/.* (.*)/\1include/p')

makedefine CPPFLAGS := -I$(TOP)/src/include 
-I$(TOP)/src/arch/$(ARCH)/include -I$(GCC_INC_DIR) $(CPUFLAGS)
  makedefine CFLAGS := $(CPU_OPT) $(CPPFLAGS) -Os -nostdinc -nostdlib 
-fno-builtin  -Wall
--- LinuxBIOSv2/src/config/Options.lb.orig	Wed Aug 24 11:59:46 2005
+++ LinuxBIOSv2/src/config/Options.lb	Sun Aug 28 23:55:59 2005
@@ -152,7 +152,7 @@
    comment "Build linker"
  end
  define LINUXBIOS_ASSEMBLER
-	default "$(shell  touch dummy.s ; $(CC) -c -Wa,-v dummy.s 2>&1; rm -f 
dummy.s dummy.o )"
+	default "$(shell  touch dummy.s ; $(CC) -c -Wa,-v dummy.s 2>&1 | sed 
-e 's/(.*)//g' -e "s/'//g"; rm -f dummy.s dummy.o )"
    export always
    format ""%s""
    comment "Build assembler"

[Li-Ta Lo]

On Mon, 2005-08-29 at 09:45 +0200, magicfox wrote:
> Li-Ta Lo wrote :
> > ??? Somebody "fixed" the problem in the wrong way?
>
> Of course me ! ;-)
>
> I have to define udelay for emulation/qemu-i386,
> else i get:
> mainboard/emulation/qemu-i386/auto.c -o auto.inc
> delay.c:6.23:
> udelay undeclared
> make[1]: *** [auto.inc] Error 1
>
> ibm/e325 compile fine with original svn version 2009
> What is the good way to correct problem with udelay ?
>
> My last patch wasn't correct string version containing "'" who is 
> breaking make process.
> This new one do that. Please test it and apply.
>
> Best regards

I am no expert in seg/regex, are you sure your fix works for some other
language environment too? Someone in some Taiwanese mainboard company
met the same problem a few days ago.
> --- LinuxBIOSv2/src/config/Config.lb.orig	Tue Aug  2 18:28:38 2005
> +++ LinuxBIOSv2/src/config/Config.lb	Sun Aug 28 23:15:50 2005
> @@ -4,7 +4,7 @@
>
> makedefine CPP:= $(CC) -x assembler-with-cpp -DASSEMBLY -E
>   makedefine LIBGCC_FILE_NAME := $(shell $(CC) -print-libgcc-file-name)
> -makedefine GCC_INC_DIR := $(shell $(CC) -print-search-dirs | sed -ne 
> "s/install: (.*)/\1include/gp")
> +makedefine GCC_INC_DIR := $(shell $(CC) -print-search-dirs | sed -ne 
> '1s/.* (.*)/\1include/p')
>
> makedefine CPPFLAGS := -I$(TOP)/src/include 
> -I$(TOP)/src/arch/$(ARCH)/include -I$(GCC_INC_DIR) $(CPUFLAGS)
>   makedefine CFLAGS := $(CPU_OPT) $(CPPFLAGS) -Os -nostdinc -nostdlib 
> -fno-builtin  -Wall
> --- LinuxBIOSv2/src/config/Options.lb.orig	Wed Aug 24 11:59:46 2005
> +++ LinuxBIOSv2/src/config/Options.lb	Sun Aug 28 23:55:59 2005
> @@ -152,7 +152,7 @@
>    comment "Build linker"
>   end
>   define LINUXBIOS_ASSEMBLER
> default "$(shell  touch dummy.s ; $(CC) -c -Wa,-v dummy.s 2>&1; rm -f
>
> dummy.s dummy.o )"
> default "$(shell  touch dummy.s ; $(CC) -c -Wa,-v dummy.s 2>&1 | sed
>
> -e 's/(.*)//g' -e "s/'//g"; rm -f dummy.s dummy.o )"
>    export always
>    format ""%s""
>    comment "Build assembler"

[LinuxBIOS] [patch] LINUXBIOS_ASSEMBLER & GCC_INC_DIR definitions

[magicfox]

Li-Ta Lo wrote :
> I am no expert in seg/regex, are you sure your fix works for some other
> language environment too? Someone in some Taiwanese mainboard company
> met the same problem a few days ago.

Hi,

I quite sure because,

- for GCC_INC_DIR definition, i get the include path on the first line 
of "$(CC) -print-search-dirs" without any language reference string.

- for LINUXBIOS_ASSEMBLER, i strip any "(...)" and any "'" in string 
version causing a problem in my case of french version.
May be other string versions may be affected but not in my case.

Best regards
Thierry