[PATCH] HiPE fix for glibc-2.4 / Fedora Core 5

[Mikael Pettersson]

On Mon, 30 Jan 2006 11:38:10 -0500, Serge Aleynikov wrote:
>We ran into the hipe compilation issue (R10B-9) on Linux Fedora related 
>to the newer GLIBC version.
>
>$ uname -a
>Linux stardev1.corp.idt.net 2.6.15-1.1881_FC5.idtsmp #1 SMP PREEMPT Mon 
>Jan 30 02:16:35 EST 2006 i686 i686 i386 GNU/Linux
>
>Installed Packages
>glibc.i686   2.3.90-30
>
>$ make
>...
>/home/serge/tmp/otp_src_R10B-9/erts/obj.hybrid.beam/i686-pc-linux-gnu/hipe_x86_signal.o: 
>In function `my_sigaction':hipe/hipe_x86_signal.c:182: undefined 
>reference to `INIT'
>:hipe/hipe_x86_signal.c:192: undefined reference to `__next_sigaction'
>/home/serge/tmp/otp_src_R10B-9/erts/obj.hybrid.beam/i686-pc-linux-gnu/hipe_x86_signal.o: 
>In function `hipe_signal_init':hipe/hipe_x86_signal.c:225: undefined 
>reference to `INIT'
>/home/serge/tmp/otp_src_R10B-9/erts/obj.hybrid.beam/i686-pc-linux-gnu/hipe_x86_signal.o: 
>In function `my_sigaction':hipe/hipe_x86_signal.c:182: undefined 
>reference to `INIT'
>:hipe/hipe_x86_signal.c:192: undefined reference to `__next_sigaction'
>:hipe/hipe_x86_signal.c:182: undefined reference to `INIT'
>:hipe/hipe_x86_signal.c:192: undefined reference to `__next_sigaction'
>collect2: ld returned 1 exit status

I've tested things on FC5 final which was released a week ago, and
I can confirm that the code for glibc-2.3 in hipe_x86_signal.c does
work fine for glibc-2.4. The patch that's been committed to the R11
development branch is included below; it should also be applied to R10B-10.

/Mikael
The HiPE team

--- otp-0317/erts/emulator/hipe/hipe_x86_signal.c.~1~	2005-10-21 14:02:57.000000000 +0200
+++ otp-0317/erts/emulator/hipe/hipe_x86_signal.c	2006-03-27 12:30:08.000000000 +0200
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include "hipe_signal.h"
 
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3
+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4)
 /* See comment below for glibc 2.2. */
 #ifndef __USE_GNU
 #define __USE_GNU		/* to un-hide RTLD_NEXT */