changeset in /hg/icedtea6: 2008-11-28 Gary Benson <gbenson at red...

[Andrew Haley]

Gary Benson wrote:
> 
>  The following patches are only applied for IcedTea builds using the zero-assembler:
>  
> 
> +--- openjdk/jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c	Mon Aug 25 08:11:08 2008 -0700
> ++++ openjdk/jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c	Tue Aug 26 09:23:12 2008 +0100
> +@@ -48,10 +48,18 @@ typedef union epoll_data {
> +     __uint64_t u64;
> + } epoll_data_t;
> + 
> ++
> ++/* x86-64 has same alignment as 32-bit */
> ++#ifdef __x86_64__
> ++#define EPOLL_PACKED __attribute__((packed))
> ++#else
> ++#define EPOLL_PACKED
> ++#endif
> ++
> + struct epoll_event {
> +     __uint32_t events;  /* Epoll events */
> +     epoll_data_t data;  /* User data variable */
> +-} __attribute__ ((__packed__));
> ++} EPOLL_PACKED;

This is a bug that will break other arches that use Zero.
We shouldn't be defining epoll_event and epoll_data.
Please #include <sys/epoll.h> instead.

Andrew.