On Mar 9 2007 23:23, Sam Ravnborg wrote:

quoted text
>Date: Fri, 9 Mar 2007 23:23:32 +0100
>From: Sam Ravnborg <sam@ravnborg.org>
>To: Jan Engelhardt <jengelh@linux01.gwdg.de>,
>    Paulo Marques <pmarques@grupopie.com>
>Cc: dmitry.torokhov@gmail.com, Christoph Hellwig <hch@infradead.org>,
>    Deepak Saxena <dsaxena@plexity.net>,
>    Andrew Morton <akpm@linux-foundation.org>, linux-kernel@vger.kernel.org
>Subject: Re: [PATCH] Fix building kernel under Solaris 11_snv
>

Reference: http://lkml.org/lkml/2007/3/8/368
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

Happy cherrypicking.
More comments below.

quoted text
>> >> Index: linux-2.6.21-rc3/scripts/kallsyms.c
>> >> ===================================================================
>> >> --- linux-2.6.21-rc3.orig/scripts/kallsyms.c	2007-03-07 05:41:20.000000000 +0100
>> >> +++ linux-2.6.21-rc3/scripts/kallsyms.c	2007-03-07 23:46:46.249005000 +0100
>> >> @@ -378,6 +378,40 @@
>> >>  	table_cnt = pos;
>> >>  }
>> >>  
>> >> +#ifdef __sun__
>> >> +/* Return the first occurrence of NEEDLE in HAYSTACK.  */
>> >> +void *
>> >> +memmem (haystack, haystack_len, needle, needle_len)
>> >> +     const void *haystack;
>> >> +      return (void *) begin;
>> >> +
>> >> +  return NULL;
>> >> +}
>> >> +#endif
>> >> +
>> >>  /* replace a given token in all the valid symbols. Use the sampled symbols
>> >>   * to update the counts */
>> >>  static void compress_symbols(unsigned char *str, int idx)
>> 
>> This one, I am just waiting for someone to object to the extra #if-#endif.
>
>I was planning to ask Paulo if strstr could not be used - Paulo?

I am not sure, but I would tend to say "no".

kallsyms.c:
	p1 = table[i].sym;                                              
                                                                                
	/* find the token on the symbol */                              
	p2 = memmem(p1, len, str, 2);                                   
	if (!p2) continue;                                              

My first impression would be that 'p1' is a multi-nul-terminated string
array ("foo\0bar\0next\0symbol\0..."), much like the entire .strtab
section (I have not actually bothered to check, so it is a raw guess), and
I do not think strstr would replace memmem here if that was the case.

quoted text
>> >> Index: linux-2.6.21-rc3/scripts/kconfig/Makefile
>> >> ===================================================================
>> >> --- linux-2.6.21-rc3.orig/scripts/kconfig/Makefile	2007-03-07 05:41:20.000000000 +0100
>> >> +++ linux-2.6.21-rc3/scripts/kconfig/Makefile	2007-03-07 23:21:19.730679000 +0100
>> >> @@ -88,7 +88,7 @@
>> >>  HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
>> >>  HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
>> >>  
>> >> -HOST_EXTRACFLAGS += -DLOCALE
>> >> +HOST_EXTRACFLAGS += -DLOCALE -std=c99 -D__EXTENSIONS__
>> >>  
>> >>  PHONY += $(obj)/dochecklxdialog
>> >>  $(obj)/dochecklxdialog:
>> 
>> The error message for this one was: <stdbool.h> only valid in C99 mode.
>> Linux GCC 4.1.2 does not print that, Solaris GCC 3.4.3 does. I do not
>> know offhand who is right.
>
>The -std= looks safe. The __EXTENSIONS__ part seems safe and needed after a
>bit googling.

Humm humm. Linux's /usr/include does not have any (glibc) file with the
string __EXTENSIONS__ in it. Though, the linux manpage for fileno() does
not mention fileno() conforming to anything. Under Linux, fileno() is
wrapped inside __USE_POSIX, and the comments in Solaris's headers also
indicate it is something posixy.

Perhaps have something like

#ifdef __sun__
#	define __EXTENSIONS__ 1
#endif

quoted text
>> >> Index: linux-2.6.21-rc3/scripts/mod/file2alias.c
>> >> ===================================================================
>> >> --- linux-2.6.21-rc3.orig/scripts/mod/file2alias.c	2007-03-07 05:41:20.000000000 +0100
>> >> +++ linux-2.6.21-rc3/scripts/mod/file2alias.c	2007-03-07 23:41:23.772026000 +0100
>> >> @@ -32,6 +32,8 @@
>> >>  typedef uint32_t	__u32;
>> >>  typedef uint16_t	__u16;
>> >>  typedef unsigned char	__u8;
>> >> +typedef int32_t		__s32;
>> >> +typedef int16_t		__s16;
>> >>  
>> >>  /* Big exception to the "don't include kernel headers into userspace, which
>> >>   * even potentially has different endianness and word sizes, since
>> 
>> HAX.
>
>This goes away when we do not include input.h I think.

Exactly.

quoted text
>> >> Index: linux-2.6.21-rc3/scripts/mod/modpost.h
>> >> ===================================================================
>> >> --- linux-2.6.21-rc3.orig/scripts/mod/modpost.h	2007-03-07 05:41:20.000000000 +0100
>> >> +++ linux-2.6.21-rc3/scripts/mod/modpost.h	2007-03-07 23:37:01.315290000 +0100
>> >> @@ -41,6 +41,11 @@
>> >>  #define ELF_R_TYPE  ELF64_R_TYPE
>> >>  #endif
>> >>  
>> >> +#ifdef __sun__
>> >> +typedef uint16_t Elf32_Section;
>> >> +typedef uint16_t Elf64_Section;
>> >> +#endif
>> >> +
>> >>  /* The 64-bit MIPS ELF ABI uses an unusual reloc format. */
>> >>  typedef struct
>> >>  {
>> 
>> More HAX because Sol does not have them >:-(
>
>Yup - but needed.

How much do we want to support Solaris anyway? It's like trying to make
ICC a thoroughly supported compiler. Hey, do we want to support GCC
compilation under BSD too? What about CYGWIN - there have been efforts
before! :p  Seriously, what build platforms do we want to support in
the near future?



Thanks,
Jan
-- 
-
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/