[RFC] alpha: hack objstrip.c to make it compile.

[RFC] alpha: hack objstrip.c to make it compile.

[Matt Turner]

I don't think this is the appropriate fix. What should I do to fix this?
---
 arch/alpha/boot/tools/objstrip.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c
index 367d53d..54fa1ef 100644
--- a/arch/alpha/boot/tools/objstrip.c
+++ b/arch/alpha/boot/tools/objstrip.c
@@ -27,6 +27,9 @@
 #include <linux/param.h>
 #ifdef __ELF__
 # include <linux/elf.h>
+# define elfhdr	elf64_hdr
+# define elf_phdr	elf64_phdr
+# define elf_check_arch(x) ((x)->e_machine == EM_ALPHA)
 #endif
 
 /* bootfile size must be multiple of BLOCK_SIZE: */
-- 
1.6.4.4

Re: [RFC] alpha: hack objstrip.c to make it compile.

[Richard Henderson]

On 03/29/2010 06:49 PM, Matt Turner wrote:
> I don't think this is the appropriate fix. What should I do to fix this?
> ---
>  arch/alpha/boot/tools/objstrip.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c
> index 367d53d..54fa1ef 100644
> --- a/arch/alpha/boot/tools/objstrip.c
> +++ b/arch/alpha/boot/tools/objstrip.c
> @@ -27,6 +27,9 @@
>  #include <linux/param.h>
>  #ifdef __ELF__
>  # include <linux/elf.h>
> +# define elfhdr	elf64_hdr
> +# define elf_phdr	elf64_phdr
> +# define elf_check_arch(x) ((x)->e_machine == EM_ALPHA)
>  #endif
>  

Hum.  Is it so bad to just #define __KERNEL__ here before
that one include?  Similar games are played in tools/perf/,
and with a suitible comment I think that should be all right.


r~

Re: [RFC] alpha: hack objstrip.c to make it compile.

[Matt Turner]

On Tue, Mar 30, 2010 at 10:28 AM, Richard Henderson <rth@twiddle.net> wrote:
> On 03/29/2010 06:49 PM, Matt Turner wrote:
>> I don't think this is the appropriate fix. What should I do to fix this?
>> ---
>>  arch/alpha/boot/tools/objstrip.c |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c
>> index 367d53d..54fa1ef 100644
>> --- a/arch/alpha/boot/tools/objstrip.c
>> +++ b/arch/alpha/boot/tools/objstrip.c
>> @@ -27,6 +27,9 @@
>>  #include <linux/param.h>
>>  #ifdef __ELF__
>>  # include <linux/elf.h>
>> +# define elfhdr      elf64_hdr
>> +# define elf_phdr    elf64_phdr
>> +# define elf_check_arch(x) ((x)->e_machine == EM_ALPHA)
>>  #endif
>>
>
> Hum.  Is it so bad to just #define __KERNEL__ here before
> that one include?  Similar games are played in tools/perf/,
> and with a suitible comment I think that should be all right.
>
>
> r~

The problem is that, at least with my distribution, probably others
too, the headers installed into /usr/include/linux/ are stripped of
anything inside #ifdef __KERNEL__.

Matt
--
To unsubscribe from this list: send the line "unsubscribe linux-alpha" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RFC] alpha: hack objstrip.c to make it compile.

[Richard Henderson]

On 03/30/2010 07:49 AM, Matt Turner wrote:
> The problem is that, at least with my distribution, probably others
> too, the headers installed into /usr/include/linux/ are stripped of
> anything inside #ifdef __KERNEL__.

I thought this was built with kernel header files?  It used to be.

If it's built with system header files now, you might as well convert
the thing to use <elf.h> instead.  Which shouldn't be too much different
from what you've done already.  Although I wouldn't bother with the
#defines... just propagate the name changes into the source proper.


r~