From 2d54aeb1c88cdafca6290030074289fd2e5be7ec Mon Sep 17 00:00:00 2001 From: Arwed von Merkatz Date: Thu, 15 May 2008 19:13:27 +0200 Subject: Revert "gcc: Updated to 4.3.0" This reverts commit 09cc37fe6bb5518c607074492a5bcc8e86ffe0eb. --- gnu/gcc/DEPENDS | 10 +++----- gnu/gcc/DETAILS | 2 +- gnu/gcc/HISTORY | 6 ----- gnu/gcc/PRE_BUILD | 2 +- gnu/gcc/gcc-4.2.3-ffast-math.patch | 50 ++++++++++++++++++++++++++++++++++++++ gnu/gcc/gcc-4.3.0-ffast-math.patch | 50 -------------------------------------- 6 files changed, 56 insertions(+), 64 deletions(-) create mode 100644 gnu/gcc/gcc-4.2.3-ffast-math.patch delete mode 100644 gnu/gcc/gcc-4.3.0-ffast-math.patch diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS index 2573dfbd19..50874434e8 100755 --- a/gnu/gcc/DEPENDS +++ b/gnu/gcc/DEPENDS @@ -1,6 +1,4 @@ -depends diffutils && -depends gmp && -depends gnupg && -depends mpfr && -depends smgl-fhs && -depends smgl-archspecs +depends diffutils && +depends gnupg && +depends smgl-fhs && +depends smgl-archspecs diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS index a7413e89d4..bf101a54a9 100755 --- a/gnu/gcc/DETAILS +++ b/gnu/gcc/DETAILS @@ -1,5 +1,5 @@ SPELL=gcc - VERSION=4.3.0 + VERSION=4.2.3 SOURCE=gcc-core-$VERSION.tar.bz2 SOURCE2=$SOURCE.sig SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY index e7a4a91ed0..151884d5da 100644 --- a/gnu/gcc/HISTORY +++ b/gnu/gcc/HISTORY @@ -1,9 +1,3 @@ -2008-03-15 Eric Sandall - * DETAILS: Updated to 4.3.0 - * DEPENDS: Depends on gmp and mpfr - * PRE_BUILD: Use gcc-$VERSION-ffast-math.patch to keep up. :) - * gcc-4.3.0-ffast-math.patch: Updated gcc-4.2.3-ffast-math.patch - 2008-02-05 Eric Sandall * DETAILS: Updated to 4.2.3 * PRE_BUILD: gcc-4.1.1-ffast-math.patch -> gcc-4.2.3-ffast-math.patch diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD index ba4613e300..be70a58b7c 100755 --- a/gnu/gcc/PRE_BUILD +++ b/gnu/gcc/PRE_BUILD @@ -6,4 +6,4 @@ cd $SOURCE_DIRECTORY && sedit 's/^-include/#\0/' libcpp/Makefile.in && #apply the GCC 4.1.1 fast-math fix -patch -p1 < $SPELL_DIRECTORY/gcc-$VERSION-ffast-math.patch +patch -p1 < $SPELL_DIRECTORY/gcc-4.2.3-ffast-math.patch diff --git a/gnu/gcc/gcc-4.2.3-ffast-math.patch b/gnu/gcc/gcc-4.2.3-ffast-math.patch new file mode 100644 index 0000000000..c6601f6978 --- /dev/null +++ b/gnu/gcc/gcc-4.2.3-ffast-math.patch @@ -0,0 +1,50 @@ +diff -Naur gcc-4.2.3.orig/gcc/config/i386/crtfastmath.c gcc-4.2.3/gcc/config/i386/crtfastmath.c +--- gcc-4.2.3.orig/gcc/config/i386/crtfastmath.c 2008-02-05 11:26:52.724719808 -0800 ++++ gcc-4.2.3/gcc/config/i386/crtfastmath.c 2008-02-05 11:27:16.337719080 -0800 +@@ -37,6 +37,23 @@ + #define FXSAVE (1 << 24) + #define SSE (1 << 25) + ++struct ++{ ++ unsigned short int cwd; ++ unsigned short int swd; ++ unsigned short int twd; ++ unsigned short int fop; ++ long int fip; ++ long int fcs; ++ long int foo; ++ long int fos; ++ long int mxcsr; ++ long int mxcsr_mask; ++ long int st_space[32]; ++ long int xmm_space[32]; ++ long int padding[56]; ++} __attribute__ ((aligned (16))) fxsave; ++ + static void __attribute__((constructor)) + #ifndef __x86_64__ + /* The i386 ABI only requires 4-byte stack alignment, so this is necessary +@@ -81,22 +98,6 @@ + if (edx & FXSAVE) + { + /* Check if DAZ is available. */ +- struct +- { +- unsigned short int cwd; +- unsigned short int swd; +- unsigned short int twd; +- unsigned short int fop; +- long int fip; +- long int fcs; +- long int foo; +- long int fos; +- long int mxcsr; +- long int mxcsr_mask; +- long int st_space[32]; +- long int xmm_space[32]; +- long int padding[56]; +- } __attribute__ ((aligned (16))) fxsave; + + __builtin_memset (&fxsave, 0, sizeof (fxsave)); + diff --git a/gnu/gcc/gcc-4.3.0-ffast-math.patch b/gnu/gcc/gcc-4.3.0-ffast-math.patch deleted file mode 100644 index 747787e793..0000000000 --- a/gnu/gcc/gcc-4.3.0-ffast-math.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur gcc-4.3.0.orig/gcc/config/i386/crtfastmath.c gcc-4.3.0/gcc/config/i386/crtfastmath.c ---- gcc-4.3.0.orig/gcc/config/i386/crtfastmath.c 2008-03-15 19:59:26.925738030 -0700 -+++ gcc-4.3.0/gcc/config/i386/crtfastmath.c 2008-03-15 19:59:32.823482534 -0700 -@@ -40,6 +40,23 @@ - #include "cpuid.h" - #endif - -+struct -+{ -+ unsigned short int cwd; -+ unsigned short int swd; -+ unsigned short int twd; -+ unsigned short int fop; -+ long int fip; -+ long int fcs; -+ long int foo; -+ long int fos; -+ long int mxcsr; -+ long int mxcsr_mask; -+ long int st_space[32]; -+ long int xmm_space[32]; -+ long int padding[56]; -+} __attribute__ ((aligned (16))) fxsave; -+ - static void __attribute__((constructor)) - #ifndef __x86_64__ - /* The i386 ABI only requires 4-byte stack alignment, so this is necessary -@@ -64,22 +81,6 @@ - if (edx & bit_FXSAVE) - { - /* Check if DAZ is available. */ -- struct -- { -- unsigned short int cwd; -- unsigned short int swd; -- unsigned short int twd; -- unsigned short int fop; -- long int fip; -- long int fcs; -- long int foo; -- long int fos; -- long int mxcsr; -- long int mxcsr_mask; -- long int st_space[32]; -- long int xmm_space[32]; -- long int padding[56]; -- } __attribute__ ((aligned (16))) fxsave; - - __builtin_memset (&fxsave, 0, sizeof (fxsave)); - -- cgit v1.2.3