Index: external/lgpl3/gmp/lib/libgmp/arch/m68k/config.h =================================================================== RCS file: /cvsroot/src/external/lgpl3/gmp/lib/libgmp/arch/m68k/config.h,v retrieving revision 1.1 diff -p -r1.1 config.h *** external/lgpl3/gmp/lib/libgmp/arch/m68k/config.h 2 Jul 2011 13:43:05 -0000 1.1 --- external/lgpl3/gmp/lib/libgmp/arch/m68k/config.h 4 Jul 2011 21:38:27 -0000 *************** along with the GNU MP Library. If not, *** 144,150 **** /* #undef HAVE_HOST_CPU_alphaev67 */ /* #undef HAVE_HOST_CPU_alphaev68 */ /* #undef HAVE_HOST_CPU_alphaev7 */ ! /* #undef HAVE_HOST_CPU_m68020 */ /* #undef HAVE_HOST_CPU_m68030 */ /* #undef HAVE_HOST_CPU_m68040 */ /* #undef HAVE_HOST_CPU_m68060 */ --- 144,150 ---- /* #undef HAVE_HOST_CPU_alphaev67 */ /* #undef HAVE_HOST_CPU_alphaev68 */ /* #undef HAVE_HOST_CPU_alphaev7 */ ! #define HAVE_HOST_CPU_m68020 1 /* #undef HAVE_HOST_CPU_m68030 */ /* #undef HAVE_HOST_CPU_m68040 */ /* #undef HAVE_HOST_CPU_m68060 */ Index: external/lgpl3/mpfr/dist/set_ld.c =================================================================== RCS file: /cvsroot/src/external/lgpl3/mpfr/dist/set_ld.c,v retrieving revision 1.1.1.1 diff -p -r1.1.1.1 set_ld.c *** external/lgpl3/mpfr/dist/set_ld.c 20 Jun 2011 05:53:02 -0000 1.1.1.1 --- external/lgpl3/mpfr/dist/set_ld.c 4 Jul 2011 21:38:27 -0000 *************** along with the GNU MPFR Library; see the *** 21,26 **** --- 21,27 ---- http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ + #include #include #define MPFR_NEED_LONGLONG_H *************** mpfr_set_ld (mpfr_ptr r, long double d, *** 60,73 **** LONGDOUBLE_NAN_ACTION (d, goto nan); /* Check for INF */ ! if (d > MPFR_LDBL_MAX) { ! mpfr_set_inf (r, 1); ! return 0; ! } ! else if (d < -MPFR_LDBL_MAX) ! { ! mpfr_set_inf (r, -1); return 0; } /* Check for ZERO */ --- 61,72 ---- LONGDOUBLE_NAN_ACTION (d, goto nan); /* Check for INF */ ! if (isinf(d)) { ! if (d > 0) ! mpfr_set_inf (r, 1); ! else ! mpfr_set_inf (r, -1); return 0; } /* Check for ZERO */ Index: sys/sys/cdefs.h =================================================================== RCS file: /cvsroot/src/sys/sys/cdefs.h,v retrieving revision 1.86 diff -p -r1.86 cdefs.h *** sys/sys/cdefs.h 23 Jun 2011 12:16:03 -0000 1.86 --- sys/sys/cdefs.h 4 Jul 2011 21:39:06 -0000 *************** *** 135,140 **** --- 135,146 ---- /* * Compile Time Assertion. */ + #if __GNUC_PREREQ__(4, 5) + /* XXX */ + #define __CTASSERT(x) + #define __CTASSERT0(x, y, z) + #define __CTASSERT1(x, y, z) + #else #ifdef __COUNTER__ #define __CTASSERT(x) __CTASSERT0(x, __ctassert, __COUNTER__) #else *************** *** 142,147 **** --- 148,154 ---- #endif #define __CTASSERT0(x, y, z) __CTASSERT1(x, y, z) #define __CTASSERT1(x, y, z) typedef char y ## z[(x) ? 1 : -1]; + #endif /* * The following macro is used to remove const cast-away warnings Index: sys/sys/mbuf.h =================================================================== RCS file: /cvsroot/src/sys/sys/mbuf.h,v retrieving revision 1.144 diff -p -r1.144 mbuf.h *** sys/sys/mbuf.h 24 Oct 2008 22:31:40 -0000 1.144 --- sys/sys/mbuf.h 4 Jul 2011 21:39:06 -0000 *************** struct _m_ext { *** 274,293 **** * Definition of "struct mbuf". * Don't change this without understanding how MHLEN/MLEN are defined. */ ! #define MBUF_DEFINE(name, mhlen, mlen) \ ! struct name { \ ! struct m_hdr m_hdr; \ ! union { \ ! struct { \ ! struct pkthdr MH_pkthdr; \ ! union { \ ! struct _m_ext MH_ext; \ ! char MH_databuf[(mhlen)]; \ ! } MH_dat; \ ! } MH; \ ! char M_databuf[(mlen)]; \ ! } M_dat; \ ! } #define m_next m_hdr.mh_next #define m_len m_hdr.mh_len #define m_data m_hdr.mh_data --- 274,304 ---- * Definition of "struct mbuf". * Don't change this without understanding how MHLEN/MLEN are defined. */ ! ! /* normal data len */ ! #define MLEN (MSIZE - sizeof(struct m_hdr)) ! /* data len w/pkthdr */ ! #define MHLEN (MLEN - sizeof(struct pkthdr)) ! ! __CTASSERT(sizeof(struct _m_ext) <= MHLEN); ! ! struct mbuf { ! struct m_hdr m_hdr; ! union { ! struct _mhdat { ! struct pkthdr MH_pkthdr; ! union { ! struct _m_ext MH_ext; ! char MH_databuf[MHLEN]; ! } MH_dat; ! } MH; ! char M_databuf[MLEN]; ! } M_dat; ! }; ! ! __CTASSERT(sizeof(struct mbuf) == MSIZE); ! __CTASSERT(sizeof(struct _mhdat) == MLEN); ! #define m_next m_hdr.mh_next #define m_len m_hdr.mh_len #define m_data m_hdr.mh_data *************** struct _m_ext { *** 303,327 **** #define m_pktdat M_dat.MH.MH_dat.MH_databuf #define m_dat M_dat.M_databuf - /* - * Dummy mbuf structure to calculate the right values for MLEN/MHLEN, taking - * into account inter-structure padding. - */ - MBUF_DEFINE(_mbuf_dummy, 1, 1); - - /* normal data len */ - #define MLEN (MSIZE - offsetof(struct _mbuf_dummy, m_dat)) - /* data len w/pkthdr */ - #define MHLEN (MSIZE - offsetof(struct _mbuf_dummy, m_pktdat)) - #define MINCLSIZE (MHLEN+MLEN+1) /* smallest amount to put in cluster */ #define M_MAXCOMPRESS (MHLEN / 2) /* max amount to copy for compression */ - /* - * The *real* struct mbuf - */ - MBUF_DEFINE(mbuf, MHLEN, MLEN); - /* mbuf flags */ #define M_EXT 0x00001 /* has associated external storage */ #define M_PKTHDR 0x00002 /* start of record */ --- 314,322 ---- Index: tests/include/sys/t_bitops.c =================================================================== RCS file: /cvsroot/src/tests/include/sys/t_bitops.c,v retrieving revision 1.7 diff -p -r1.7 t_bitops.c *** tests/include/sys/t_bitops.c 30 Mar 2011 08:34:20 -0000 1.7 --- tests/include/sys/t_bitops.c 4 Jul 2011 21:39:06 -0000 *************** ATF_TC_HEAD(ilog2_2, tc) *** 163,168 **** --- 163,169 ---- ATF_TC_BODY(ilog2_2, tc) { + #ifndef __vax__ double x, y; uint64_t i; *************** ATF_TC_BODY(ilog2_2, tc) *** 180,185 **** --- 181,187 ---- ATF_REQUIRE(ceil(x) >= y); ATF_REQUIRE(fabs(floor(x) - y) < 1.0e-40); } + #endif } ATF_TP_ADD_TCS(tp)