Update coreboot cross toolchain to gcc 4.6.1
- Tested on Mac OS X 10.7.1 - Tested on Ubuntu 10.04 LTS (Lucid Lynx) - Tested on Ubuntu 11.10 (Oneiric Ocelot) Please test on Windows and other Linux distributions Change-Id: I132c01293fc0cff0cfb84556a93c0b8de8e57230 Signed-off-by: Stefan Reinauer <reinauer@google.com> Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/250 Tested-by: build bot (Jenkins) Reviewed-by: Sven Schnelle <svens@stackframe.org>
This commit is contained in:
Stefan Reinauer
Sven Schnelle
parent
952b421c27
commit
9491b4d5f5
|
|
@ -20,8 +20,8 @@
|
|||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
#
|
||||
|
||||
CROSSGCC_DATE="August 8th, 2011"
|
||||
CROSSGCC_VERSION="1.04"
|
||||
CROSSGCC_DATE="October 10th, 2011"
|
||||
CROSSGCC_VERSION="1.05"
|
||||
|
||||
# default settings
|
||||
TARGETDIR=`pwd`/xgcc
|
||||
|
|
@ -29,17 +29,18 @@ TARGETARCH=i386-elf
|
|||
DESTDIR=
|
||||
|
||||
# version numbers
|
||||
GMP_VERSION=5.0.1
|
||||
MPFR_VERSION=3.0.0
|
||||
MPC_VERSION=0.8.2
|
||||
GMP_VERSION=5.0.2
|
||||
MPFR_VERSION=3.1.0
|
||||
MPC_VERSION=0.9
|
||||
LIBELF_VERSION=0.8.13
|
||||
GCC_VERSION=4.5.2
|
||||
BINUTILS_VERSION=2.20.1
|
||||
GCC_VERSION=4.6.1
|
||||
GCC_AUTOCONF_VERSION=2.64
|
||||
BINUTILS_VERSION=2.21.1
|
||||
GDB_VERSION=7.3.1
|
||||
W32API_VERSION=3.17-2
|
||||
W32API_VERSION_SHORT=3.17
|
||||
MINGWRT_VERSION=3.18
|
||||
IASL_VERSION=20110623
|
||||
IASL_VERSION=20110922
|
||||
|
||||
# archive locations
|
||||
GMP_ARCHIVE="ftp://ftp.gmplib.org/pub/gmp-${GMP_VERSION}/gmp-${GMP_VERSION}.tar.bz2"
|
||||
|
|
@ -146,7 +147,7 @@ GNU General Public License for more details.
|
|||
EOF
|
||||
}
|
||||
|
||||
printf "${blue}Welcome to the ${red}coresystems${blue} cross toolchain builder v$CROSSGCC_VERSION ($CROSSGCC_DATE)${NC}\n\n"
|
||||
printf "${blue}Welcome to the ${red}coreboot${blue} cross toolchain builder v$CROSSGCC_VERSION ($CROSSGCC_DATE)${NC}\n\n"
|
||||
|
||||
# Look if we have getopt. If not, build it.
|
||||
export PATH=$PATH:.
|
||||
|
|
@ -198,14 +199,12 @@ if [ "$TARGETARCH" = "i386-mingw32" ]; then
|
|||
MINGW_ARCHIVES="$W32API_ARCHIVE $MINGWRT_ARCHIVE"
|
||||
fi
|
||||
|
||||
if [ ${GCC_VERSION} = "4.5.0" -o ${GCC_VERSION} = "4.6.0" ]; then
|
||||
# coreboot does not like the GOLD linker
|
||||
# USE_GOLD="--enable-gold"
|
||||
USE_GOLD=""
|
||||
GCC_OPTIONS="--enable-lto"
|
||||
fi
|
||||
# coreboot does not like the GOLD linker
|
||||
# USE_GOLD="--enable-gold"
|
||||
USE_GOLD=""
|
||||
GCC_OPTIONS="--enable-lto"
|
||||
|
||||
if [ ${GCC_VERSION} = "4.6.0" ]; then
|
||||
if [ ${GCC_VERSION} = "4.6.2" ]; then
|
||||
if [ ! -r tarballs/gcc-core-${GCC_VERSION}.tar.bz2 ]; then
|
||||
printf "Pre-Release GCC ${GCC_VERSION}, checking out subversion trunk\n"
|
||||
mkdir -p tarballs/.tmp
|
||||
|
|
@ -273,6 +272,7 @@ if [ "$TARGETARCH" = "i386-mingw32" ]; then
|
|||
mv $MINGWRT_DIR/include/* $W32API_DIR/include/* $TARGETDIR/i386-mingw32/sys-include
|
||||
fi
|
||||
|
||||
CC=cc
|
||||
if [ `uname` = "Darwin" ]; then
|
||||
#GCC_OPTIONS="$GCC_OPTIONS --enable-threads=posix"
|
||||
|
||||
|
|
@ -286,13 +286,14 @@ if [ `uname` = "Darwin" ]; then
|
|||
else
|
||||
OPTIONS="ABI=32"
|
||||
fi
|
||||
# old check:
|
||||
#OPTIONS="ABI=32"
|
||||
#touch .architecture_check.c
|
||||
#gcc .architecture_check.c -c -o .architecture_check.o
|
||||
#ARCH=`file .architecture_check.o |cut -f5 -d\ `
|
||||
#test "$ARCH" = "x86_64" && OPTIONS="ABI=64"
|
||||
#rm .architecture_check.c .architecture_check.o
|
||||
|
||||
# In Xcode 4 the default compiler was switched to gcc-llvm.
|
||||
# However, this compiler fails to compile gcc 4.6.x. As a
|
||||
# workaround it's possible to compile gcc with gcc-4.2 or
|
||||
# clang.
|
||||
if $CC -v 2>&1 | grep -q LLVM; then
|
||||
CC=clang
|
||||
fi
|
||||
fi
|
||||
|
||||
mkdir -p build-gmp build-mpfr build-mpc build-libelf build-binutils build-gcc
|
||||
|
|
@ -321,8 +322,10 @@ fi
|
|||
# ln -s $DESTDIR$TARGETDIR $TARGETDIR
|
||||
#fi
|
||||
|
||||
# Now set CFLAGS to match GMP CFLAGS.
|
||||
HOSTCFLAGS=`grep __GMP_CFLAGS $DESTDIR$TARGETDIR/include/gmp.h |cut -d\" -f2`
|
||||
# Now set CFLAGS to match GMP CFLAGS but strip out -pedantic
|
||||
# as GCC 4.6.x fails if it's there.
|
||||
HOSTCFLAGS=`grep __GMP_CFLAGS $DESTDIR$TARGETDIR/include/gmp.h |cut -d\" -f2 |\
|
||||
sed s,-pedantic,,`
|
||||
|
||||
if [ -f build-mpfr/.success ]; then
|
||||
printf "Skipping MPFR as it is already built\n"
|
||||
|
|
@ -393,6 +396,12 @@ if [ -f build-binutils/.success ]; then
|
|||
else
|
||||
printf "Building binutils ${BINUTILS_VERSION} ... "
|
||||
(
|
||||
# What a pain: binutils don't come with configure
|
||||
# script anymore. Create it:
|
||||
cd binutils-${BINUTILS_VERSION}/
|
||||
autoconf
|
||||
cd ..
|
||||
# Now build binutils
|
||||
cd build-binutils
|
||||
rm -f .failed
|
||||
../binutils-${BINUTILS_VERSION}/configure --prefix=$TARGETDIR --target=${TARGETARCH} \
|
||||
|
|
@ -411,6 +420,19 @@ if [ -f build-gcc/.success ]; then
|
|||
else
|
||||
printf "Building GCC ${GCC_VERSION} ... "
|
||||
(
|
||||
# Even worse than binutils: GCC does not come with configure
|
||||
# script anymore, but also enforces an obsolete autoconf version
|
||||
# to create it. This is a poster child of how autotools help make
|
||||
# software portable.
|
||||
cd gcc-${GCC_VERSION}
|
||||
sed '/dnl Ensure exactly this Autoconf version is used/d' \
|
||||
config/override.m4 > config/override.m4.new
|
||||
autoconf_version=`autoconf -V | grep "autoconf" | tr ' ' '\n' | tail -1`
|
||||
sed "s/${GCC_AUTOCONF_VERSION}/${autoconf_version}/g" \
|
||||
config/override.m4.new > config/override.m4
|
||||
autoconf
|
||||
cd ..
|
||||
# Now, finally, we can build gcc:
|
||||
cd build-gcc
|
||||
export PATH=$PATH:$DESTDIR$TARGETDIR/bin
|
||||
rm -f .failed
|
||||
|
|
@ -419,10 +441,12 @@ printf "Building GCC ${GCC_VERSION} ... "
|
|||
# There's a work-around called CFLAGS_FOR_BUILD and CFLAGS_FOR_TARGET
|
||||
# but it does not seem to work properly. At least the host library
|
||||
# libiberty is not compiled with CFLAGS_FOR_BUILD.
|
||||
CFLAGS_FOR_TARGET="-O2" CFLAGS="$HOSTCFLAGS" CFLAGS_FOR_BUILD="$HOSTCFLAGS" `readlink -f ../gcc-${GCC_VERSION}/configure` \
|
||||
CC="$CC" CFLAGS_FOR_TARGET="-O2" CFLAGS="$HOSTCFLAGS" \
|
||||
CFLAGS_FOR_BUILD="$HOSTCFLAGS" ../gcc-${GCC_VERSION}/configure \
|
||||
--prefix=$TARGETDIR --libexecdir=$TARGETDIR/lib \
|
||||
--target=${TARGETARCH} --disable-werror --disable-shared \
|
||||
--disable-libssp --disable-bootstrap --disable-nls \
|
||||
--disable-libquadmath \
|
||||
$GCC_OPTIONS --enable-languages="c" $USE_GOLD \
|
||||
--with-gmp=$DESTDIR$TARGETDIR --with-mpfr=$DESTDIR$TARGETDIR \
|
||||
--with-mpc=$DESTDIR$TARGETDIR --with-libelf=$DESTDIR$TARGETDIR \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
diff -x '*.o' -ur acpica-unix-20110922.orig//compiler/aslcompiler.l acpica-unix-20110922/compiler/aslcompiler.l
|
||||
--- acpica-unix-20110922.orig//compiler/aslcompiler.l 2011-10-28 23:24:17.333274002 +0200
|
||||
+++ acpica-unix-20110922/compiler/aslcompiler.l 2011-10-28 23:24:56.669274001 +0200
|
||||
@@ -550,7 +550,6 @@
|
||||
void)
|
||||
{
|
||||
ASL_FILE_NODE *Fnode;
|
||||
- FILE *InputFile = NULL;
|
||||
|
||||
|
||||
Fnode = InputStack;
|
||||
@@ -569,7 +568,6 @@
|
||||
/* Update the top-of-stack */
|
||||
|
||||
InputStack = Fnode->Next;
|
||||
- InputFile = Fnode->File;
|
||||
|
||||
/* Reset global line counter and filename */
|
||||
|
||||
diff -x '*.o' -ur acpica-unix-20110922.orig//os_specific/service_layers/osunixxf.c acpica-unix-20110922/os_specific/service_layers/osunixxf.c
|
||||
--- acpica-unix-20110922.orig//os_specific/service_layers/osunixxf.c 2011-10-28 23:24:17.345274002 +0200
|
||||
+++ acpica-unix-20110922/os_specific/service_layers/osunixxf.c 2011-10-28 23:56:13.629274002 +0200
|
||||
@@ -349,7 +349,6 @@
|
||||
const char *Fmt,
|
||||
va_list Args)
|
||||
{
|
||||
- INT32 Count = 0;
|
||||
UINT8 Flags;
|
||||
|
||||
|
||||
@@ -362,7 +361,7 @@
|
||||
{
|
||||
/* Output file is open, send the output there */
|
||||
|
||||
- Count = vfprintf (AcpiGbl_DebugFile, Fmt, Args);
|
||||
+ vfprintf (AcpiGbl_DebugFile, Fmt, Args);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -374,7 +373,7 @@
|
||||
|
||||
if (Flags & ACPI_DB_CONSOLE_OUTPUT)
|
||||
{
|
||||
- Count = vfprintf (AcpiGbl_OutputFile, Fmt, Args);
|
||||
+ vfprintf (AcpiGbl_OutputFile, Fmt, Args);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
--- acpica-unix-20110922/compiler/Makefile 2011-09-22 08:59:34.000000000 -0700
|
||||
+++ acpica-unix-20110922/compiler/Makefile 2011-10-11 23:47:29.000000000 -0700
|
||||
@@ -245,15 +245,11 @@
|
||||
-Waggregate-return \
|
||||
-Wchar-subscripts \
|
||||
-Wempty-body \
|
||||
- -Wlogical-op \
|
||||
-Wmissing-declarations \
|
||||
-Wmissing-field-initializers \
|
||||
- -Wmissing-parameter-type \
|
||||
-Wnested-externs \
|
||||
- -Wold-style-declaration \
|
||||
-Wold-style-definition \
|
||||
- -Wredundant-decls \
|
||||
- -Wtype-limits
|
||||
+ -Wredundant-decls
|
||||
|
||||
#
|
||||
# Bison/Flex configuration
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- binutils-2.20/gas/config/tc-i386.c~ 2009-01-20 14:19:04.000000000 +0100
|
||||
+++ binutils-2.20/gas/config/tc-i386.c 2009-01-20 14:20:47.000000000 +0100
|
||||
@@ -318,6 +318,7 @@
|
||||
&& !defined (TE_GNU) \
|
||||
&& !defined (TE_LINUX) \
|
||||
&& !defined (TE_NETWARE) \
|
||||
+ && 0 \
|
||||
&& !defined (TE_FreeBSD) \
|
||||
&& !defined (TE_NetBSD)))
|
||||
/* This array holds the chars that always start a comment. If the
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- binutils-2.21.1/bfd/Makefile.in 2011-06-27 01:57:12.000000000 -0700
|
||||
+++ binutils-2.21.1/bfd/Makefile.in 2011-10-11 21:59:15.000000000 -0700
|
||||
@@ -323,7 +323,7 @@
|
||||
RELEASE = y
|
||||
INCDIR = $(srcdir)/../include
|
||||
CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
|
||||
-SUBDIRS = doc po
|
||||
+SUBDIRS = po
|
||||
bfddocdir = doc
|
||||
libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \
|
||||
@SHARED_LDFLAGS@ $(am__empty)
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
--- t/gcc-4.4.2/gcc/crtstuff.c Fr. Apr 10 01:23:07 2009
|
||||
+++ gcc-4.4.2/gcc/crtstuff.c Di. Jul 28 16:43:28 2009
|
||||
@@ -204,6 +204,7 @@
|
||||
= { (func_ptr) (-1) };
|
||||
#endif /* __DTOR_LIST__ alternatives */
|
||||
|
||||
+#if 0
|
||||
#ifdef USE_EH_FRAME_REGISTRY
|
||||
/* Stick a label at the beginning of the frame unwind info so we can register
|
||||
and deregister it with the exception handling library code. */
|
||||
@@ -219,6 +220,7 @@
|
||||
__attribute__ ((unused, section(JCR_SECTION_NAME), aligned(sizeof(void*))))
|
||||
= { };
|
||||
#endif /* JCR_SECTION_NAME */
|
||||
+#endif
|
||||
|
||||
#if defined(INIT_SECTION_ASM_OP) || defined(INIT_ARRAY_SECTION_ASM_OP)
|
||||
|
||||
@@ -309,6 +311,7 @@
|
||||
}
|
||||
#endif /* !defined(FINI_ARRAY_SECTION_ASM_OP) */
|
||||
|
||||
+#if 0
|
||||
#ifdef USE_EH_FRAME_REGISTRY
|
||||
#ifdef CRT_GET_RFIB_DATA
|
||||
/* If we used the new __register_frame_info_bases interface,
|
||||
@@ -320,6 +323,7 @@
|
||||
__deregister_frame_info (__EH_FRAME_BEGIN__);
|
||||
#endif
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
completed = 1;
|
||||
}
|
||||
@@ -333,6 +337,7 @@
|
||||
= { __do_global_dtors_aux };
|
||||
#endif /* !defined(FINI_SECTION_ASM_OP) */
|
||||
|
||||
+#if 0
|
||||
#if defined(USE_EH_FRAME_REGISTRY) || defined(JCR_SECTION_NAME)
|
||||
/* Stick a call to __register_frame_info into the .init section. For some
|
||||
reason calls with no arguments work more reliably in .init, so stick the
|
||||
@@ -364,6 +369,7 @@
|
||||
}
|
||||
#endif /* JCR_SECTION_NAME */
|
||||
}
|
||||
+#endif
|
||||
|
||||
#ifdef INIT_SECTION_ASM_OP
|
||||
CRT_CALL_STATIC_FUNCTION (INIT_SECTION_ASM_OP, frame_dummy)
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
diff -ur gcc-4.5.1.orig/gcc/config/i386/i386elf.h gcc-4.5.1/gcc/config/i386/i386elf.h
|
||||
--- gcc-4.5.1.orig/gcc/config/i386/i386elf.h 2010-11-17 19:48:16.184401200 -0700
|
||||
+++ gcc-4.5.1/gcc/config/i386/i386elf.h 2010-11-17 20:52:54.443969900 -0700
|
||||
@@ -123,3 +123,6 @@
|
||||
#undef ASM_OUTPUT_ALIGNED_BSS
|
||||
#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
|
||||
asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
|
||||
+
|
||||
+/* Enable parsing of #pragma pack(push,<n>) and #pragma pack(pop). */
|
||||
+#define HANDLE_PRAGMA_PACK_PUSH_POP 1
|
||||
|
|
@ -1,266 +0,0 @@
|
|||
diff -ur mpfr-2.4.2.orig/PATCHES mpfr-2.4.2/PATCHES
|
||||
--- mpfr-2.4.2.orig/PATCHES 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/PATCHES 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -0,0 +1,3 @@
|
||||
+gmp5
|
||||
+longlong.h
|
||||
+sin_cos_underflow
|
||||
diff -ur mpfr-2.4.2.orig/VERSION mpfr-2.4.2/VERSION
|
||||
--- mpfr-2.4.2.orig/VERSION 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/VERSION 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -1 +1 @@
|
||||
-2.4.2
|
||||
+2.4.2-p3
|
||||
diff -ur mpfr-2.4.2.orig/configure mpfr-2.4.2/configure
|
||||
--- mpfr-2.4.2.orig/configure 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/configure 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -20449,6 +20449,9 @@
|
||||
main ()
|
||||
{
|
||||
|
||||
+#ifndef BITS_PER_MP_LIMB
|
||||
+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
|
||||
+#endif
|
||||
return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
|
||||
&& sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
|
||||
|
||||
diff -ur mpfr-2.4.2.orig/configure.in mpfr-2.4.2/configure.in
|
||||
--- mpfr-2.4.2.orig/configure.in 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/configure.in 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -424,6 +424,9 @@
|
||||
#include "gmp.h"
|
||||
#include "gmp-impl.h"
|
||||
]], [[
|
||||
+#ifndef BITS_PER_MP_LIMB
|
||||
+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
|
||||
+#endif
|
||||
return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
|
||||
&& sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
|
||||
]])], [AC_MSG_RESULT(yes)], [
|
||||
diff -ur mpfr-2.4.2.orig/mpfr-impl.h mpfr-2.4.2/mpfr-impl.h
|
||||
--- mpfr-2.4.2.orig/mpfr-impl.h 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/mpfr-impl.h 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -65,6 +65,12 @@
|
||||
# ifndef __GMP_IMPL_H__
|
||||
# include "gmp-impl.h"
|
||||
# endif
|
||||
+# ifndef BITS_PER_MP_LIMB
|
||||
+# define BITS_PER_MP_LIMB GMP_LIMB_BITS
|
||||
+# endif
|
||||
+#ifndef mpn_sqr_n
|
||||
+# define mpn_sqr_n mpn_sqr
|
||||
+#endif
|
||||
# ifdef MPFR_NEED_LONGLONG_H
|
||||
# include "longlong.h"
|
||||
# endif
|
||||
diff -ur mpfr-2.4.2.orig/mpfr-longlong.h mpfr-2.4.2/mpfr-longlong.h
|
||||
--- mpfr-2.4.2.orig/mpfr-longlong.h 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/mpfr-longlong.h 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -1011,7 +1011,15 @@
|
||||
#endif /* __m88000__ */
|
||||
|
||||
#if defined (__mips) && W_TYPE_SIZE == 32
|
||||
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
|
||||
+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
|
||||
+#define umul_ppmm(w1, w0, u, v) \
|
||||
+ do { \
|
||||
+ UDItype _r; \
|
||||
+ _r = (UDItype) u * v; \
|
||||
+ (w1) = _r >> 32; \
|
||||
+ (w0) = (USItype) _r; \
|
||||
+ } while (0)
|
||||
+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
|
||||
#define umul_ppmm(w1, w0, u, v) \
|
||||
__asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
|
||||
#else
|
||||
@@ -1024,7 +1032,16 @@
|
||||
#endif /* __mips */
|
||||
|
||||
#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
|
||||
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
|
||||
+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
|
||||
+typedef unsigned int UTItype __attribute__ ((mode (TI)));
|
||||
+#define umul_ppmm(w1, w0, u, v) \
|
||||
+ do { \
|
||||
+ UTItype _r; \
|
||||
+ _r = (UTItype) u * v; \
|
||||
+ (w1) = _r >> 64; \
|
||||
+ (w0) = (UDItype) _r; \
|
||||
+ } while (0)
|
||||
+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
|
||||
#define umul_ppmm(w1, w0, u, v) \
|
||||
__asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
|
||||
#else
|
||||
diff -ur mpfr-2.4.2.orig/mpfr.h mpfr-2.4.2/mpfr.h
|
||||
--- mpfr-2.4.2.orig/mpfr.h 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/mpfr.h 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 2
|
||||
#define MPFR_VERSION_MINOR 4
|
||||
#define MPFR_VERSION_PATCHLEVEL 2
|
||||
-#define MPFR_VERSION_STRING "2.4.2"
|
||||
+#define MPFR_VERSION_STRING "2.4.2-p3"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -ur mpfr-2.4.2.orig/sin_cos.c mpfr-2.4.2/sin_cos.c
|
||||
--- mpfr-2.4.2.orig/sin_cos.c 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/sin_cos.c 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -82,17 +82,19 @@
|
||||
if (y != x)
|
||||
/* y and x differ, thus we can safely try to compute y first */
|
||||
{
|
||||
- MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0, rnd_mode,
|
||||
- { inexy = _inexact;
|
||||
- goto small_input; });
|
||||
+ MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
|
||||
+ y, x, -2 * expx, 2, 0, rnd_mode,
|
||||
+ { inexy = _inexact;
|
||||
+ goto small_input; });
|
||||
if (0)
|
||||
{
|
||||
small_input:
|
||||
/* we can go here only if we can round sin(x) */
|
||||
- MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
|
||||
- 1, 0, rnd_mode,
|
||||
- { inexz = _inexact;
|
||||
- goto end; });
|
||||
+ MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
|
||||
+ z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
|
||||
+ { inexz = _inexact;
|
||||
+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
|
||||
+ goto end; });
|
||||
}
|
||||
|
||||
/* if we go here, one of the two MPFR_FAST_COMPUTE_IF_SMALL_INPUT
|
||||
@@ -101,18 +103,19 @@
|
||||
else /* y and x are the same variable: try to compute z first, which
|
||||
necessarily differs */
|
||||
{
|
||||
- MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
|
||||
- 1, 0, rnd_mode,
|
||||
- { inexz = _inexact;
|
||||
- goto small_input2; });
|
||||
+ MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
|
||||
+ z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
|
||||
+ { inexz = _inexact;
|
||||
+ goto small_input2; });
|
||||
if (0)
|
||||
{
|
||||
small_input2:
|
||||
/* we can go here only if we can round cos(x) */
|
||||
- MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0,
|
||||
- rnd_mode,
|
||||
- { inexy = _inexact;
|
||||
- goto end; });
|
||||
+ MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
|
||||
+ y, x, -2 * expx, 2, 0, rnd_mode,
|
||||
+ { inexy = _inexact;
|
||||
+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
|
||||
+ goto end; });
|
||||
}
|
||||
}
|
||||
m += 2 * (-expx);
|
||||
@@ -207,7 +210,6 @@
|
||||
mpfr_clear (xr);
|
||||
|
||||
end:
|
||||
- /* FIXME: update the underflow flag if need be. */
|
||||
MPFR_SAVE_EXPO_FREE (expo);
|
||||
mpfr_check_range (y, inexy, rnd_mode);
|
||||
mpfr_check_range (z, inexz, rnd_mode);
|
||||
diff -ur mpfr-2.4.2.orig/tests/tsin_cos.c mpfr-2.4.2/tests/tsin_cos.c
|
||||
--- mpfr-2.4.2.orig/tests/tsin_cos.c 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/tests/tsin_cos.c 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -382,23 +382,56 @@
|
||||
consistency (void)
|
||||
{
|
||||
mpfr_t x, s1, s2, c1, c2;
|
||||
+ mp_exp_t emin, emax;
|
||||
mp_rnd_t rnd;
|
||||
+ unsigned int flags_sin, flags_cos, flags, flags_before, flags_ref;
|
||||
+ int inex_sin, inex_cos, inex, inex_ref;
|
||||
int i;
|
||||
|
||||
+ emin = mpfr_get_emin ();
|
||||
+ emax = mpfr_get_emax ();
|
||||
+
|
||||
for (i = 0; i <= 10000; i++)
|
||||
{
|
||||
mpfr_init2 (x, MPFR_PREC_MIN + (randlimb () % 8));
|
||||
mpfr_inits2 (MPFR_PREC_MIN + (randlimb () % 8), s1, s2, c1, c2,
|
||||
(mpfr_ptr) 0);
|
||||
- tests_default_random (x, 256, -5, 50);
|
||||
- rnd = RND_RAND ();
|
||||
- mpfr_sin (s1, x, rnd);
|
||||
- mpfr_cos (c1, x, rnd);
|
||||
- mpfr_sin_cos (s2, c2, x, rnd);
|
||||
- if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)))
|
||||
+ if (i < 8 * GMP_RND_MAX)
|
||||
+ {
|
||||
+ int j = i / GMP_RND_MAX;
|
||||
+ if (j & 1)
|
||||
+ mpfr_set_emin (MPFR_EMIN_MIN);
|
||||
+ mpfr_set_si (x, (j & 2) ? 1 : -1, GMP_RNDN);
|
||||
+ mpfr_set_exp (x, mpfr_get_emin ());
|
||||
+ rnd = (mpfr_rnd_t) (i % GMP_RND_MAX);
|
||||
+ flags_before = 0;
|
||||
+ if (j & 4)
|
||||
+ mpfr_set_emax (-17);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ tests_default_random (x, 256, -5, 50);
|
||||
+ rnd = RND_RAND ();
|
||||
+ flags_before = (randlimb () & 1) ?
|
||||
+ (unsigned int) (MPFR_FLAGS_ALL ^ MPFR_FLAGS_ERANGE) :
|
||||
+ (unsigned int) 0;
|
||||
+ }
|
||||
+ __gmpfr_flags = flags_before;
|
||||
+ inex_sin = mpfr_sin (s1, x, rnd);
|
||||
+ flags_sin = __gmpfr_flags;
|
||||
+ __gmpfr_flags = flags_before;
|
||||
+ inex_cos = mpfr_cos (c1, x, rnd);
|
||||
+ flags_cos = __gmpfr_flags;
|
||||
+ __gmpfr_flags = flags_before;
|
||||
+ inex = !!mpfr_sin_cos (s2, c2, x, rnd);
|
||||
+ flags = __gmpfr_flags;
|
||||
+ inex_ref = inex_sin || inex_cos;
|
||||
+ flags_ref = flags_sin | flags_cos;
|
||||
+ if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)) ||
|
||||
+ inex != inex_ref || flags != flags_ref)
|
||||
{
|
||||
- printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,\nx = ",
|
||||
- mpfr_print_rnd_mode (rnd));
|
||||
+ printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,"
|
||||
+ " i = %d\nx = ", mpfr_print_rnd_mode (rnd), i);
|
||||
mpfr_dump (x);
|
||||
printf ("s1 = ");
|
||||
mpfr_dump (s1);
|
||||
@@ -408,9 +441,16 @@
|
||||
mpfr_dump (c1);
|
||||
printf ("c2 = ");
|
||||
mpfr_dump (c2);
|
||||
+ printf ("inex_sin = %d, inex_cos = %d, inex = %d (expected %d)\n",
|
||||
+ inex_sin, inex_cos, inex, inex_ref);
|
||||
+ printf ("flags_sin = 0x%x, flags_cos = 0x%x, "
|
||||
+ "flags = 0x%x (expected 0x%x)\n",
|
||||
+ flags_sin, flags_cos, flags, flags_ref);
|
||||
exit (1);
|
||||
}
|
||||
mpfr_clears (x, s1, s2, c1, c2, (mpfr_ptr) 0);
|
||||
+ mpfr_set_emin (emin);
|
||||
+ mpfr_set_emax (emax);
|
||||
}
|
||||
}
|
||||
|
||||
diff -ur mpfr-2.4.2.orig/version.c mpfr-2.4.2/version.c
|
||||
--- mpfr-2.4.2.orig/version.c 2010-03-08 22:28:46.000000000 +0100
|
||||
+++ mpfr-2.4.2/version.c 2010-03-08 22:28:53.000000000 +0100
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "2.4.2";
|
||||
+ return "2.4.2-p3";
|
||||
}
|
||||
Loading…
Reference in New Issue