Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4156c67dade21cf44251dc84b6019da018bc9abe
commit 4156c67dade21cf44251dc84b6019da018bc9abe Author: Miklos Vajna <[email protected]> Date: Thu Jul 23 20:21:11 2009 +0200 gcc-4.4.1-1-i686 - version bump - fix prefix - drop backported pr patches diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild index 42a75d9..a42d48c 100644 --- a/source/devel/gcc/FrugalBuild +++ b/source/devel/gcc/FrugalBuild @@ -15,8 +15,8 @@ Fuse $USE_JAVA && USE_CXX="y" Fuse $USE_OBJC && USE_CXX="y" pkgname=gcc -pkgver=4.4.0 -pkgrel=6 +pkgver=4.4.1 +pkgrel=1 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org"; depends=('binutils>=2.18.50.0.8-3' 'glibc>=2.8-2' 'mpfr>=2.3.1-2') @@ -28,11 +28,9 @@ archs=('i686' 'x86_64' 'ppc') options=('scriptlet') up2date="lynx -dump $url|grep Current|sed 's/.*GCC \(.*\) (.*/\1/'" source=(http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2 \ - README.Frugalware pr39543.patch pr40013.patch) -sha1sums=('9215af6beb900ca1eef1d6a40c3dabe990203b25' \ - '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca' \ - '5216c01948654fd2abaf5676b6798c91d58dadc7' \ - '4a812425adeedd3701e2a8aa19a016de40c6d7ea') + README.Frugalware) +sha1sums=('9156ddb7e4cc72288ec31760d6ddc7981123a8a2' \ + '9ff2a95f1336cfbf90a7852f34f1db0b31c82dca') if Fuse $USE_SHARED; then subpkgs=('libgcc' 'libssp' 'libgomp') @@ -146,6 +144,7 @@ build() CC="$FCC gcc" CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" XCFLAGS="$CFLAGS" \ TCFLAGS="$CFLAGS" GCJFLAGS="$CFLAGS" \ ../$pkgname-$pkgver/configure \ + --prefix=$Fprefix \ $Fconfopts \ --enable-languages=$langlist \ --enable-shared \ diff --git a/source/devel/gcc/pr39543.patch b/source/devel/gcc/pr39543.patch deleted file mode 100644 index 37d730b..0000000 --- a/source/devel/gcc/pr39543.patch +++ /dev/null @@ -1,128 +0,0 @@ ---- gcc-4_4-branch/gcc/fwprop.c 2009/03/27 20:40:26 145122 -+++ gcc-4_4-branch/gcc/fwprop.c 2009/04/26 18:58:04 146814 -@@ -1,5 +1,5 @@ - /* RTL-based forward propagation pass for GNU compiler. -- Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+ Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - Contributed by Paolo Bonzini and Steven Bosscher. - - This file is part of GCC. -@@ -852,6 +852,80 @@ - return false; - } - -+/* Try to replace USE with SRC (defined in DEF_INSN) in __asm. */ -+ -+static bool -+forward_propagate_asm (df_ref use, rtx def_insn, rtx def_set, rtx reg) -+{ -+ rtx use_insn = DF_REF_INSN (use), src, use_pat, asm_operands, new_rtx, *loc; -+ int speed_p, i; -+ df_ref *use_vec; -+ -+ gcc_assert ((DF_REF_FLAGS (use) & DF_REF_IN_NOTE) == 0); -+ -+ src = SET_SRC (def_set); -+ use_pat = PATTERN (use_insn); -+ -+ /* In __asm don't replace if src might need more registers than -+ reg, as that could increase register pressure on the __asm. */ -+ use_vec = DF_INSN_USES (def_insn); -+ if (use_vec[0] && use_vec[1]) -+ return false; -+ -+ speed_p = optimize_bb_for_speed_p (BLOCK_FOR_INSN (use_insn)); -+ asm_operands = NULL_RTX; -+ switch (GET_CODE (use_pat)) -+ { -+ case ASM_OPERANDS: -+ asm_operands = use_pat; -+ break; -+ case SET: -+ if (MEM_P (SET_DEST (use_pat))) -+ { -+ loc = &SET_DEST (use_pat); -+ new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p); -+ if (new_rtx) -+ validate_unshare_change (use_insn, loc, new_rtx, true); -+ } -+ asm_operands = SET_SRC (use_pat); -+ break; -+ case PARALLEL: -+ for (i = 0; i < XVECLEN (use_pat, 0); i++) -+ if (GET_CODE (XVECEXP (use_pat, 0, i)) == SET) -+ { -+ if (MEM_P (SET_DEST (XVECEXP (use_pat, 0, i)))) -+ { -+ loc = &SET_DEST (XVECEXP (use_pat, 0, i)); -+ new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, -+ src, speed_p); -+ if (new_rtx) -+ validate_unshare_change (use_insn, loc, new_rtx, true); -+ } -+ asm_operands = SET_SRC (XVECEXP (use_pat, 0, i)); -+ } -+ else if (GET_CODE (XVECEXP (use_pat, 0, i)) == ASM_OPERANDS) -+ asm_operands = XVECEXP (use_pat, 0, i); -+ break; -+ default: -+ gcc_unreachable (); -+ } -+ -+ gcc_assert (asm_operands && GET_CODE (asm_operands) == ASM_OPERANDS); -+ for (i = 0; i < ASM_OPERANDS_INPUT_LENGTH (asm_operands); i++) -+ { -+ loc = &ASM_OPERANDS_INPUT (asm_operands, i); -+ new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p); -+ if (new_rtx) -+ validate_unshare_change (use_insn, loc, new_rtx, true); -+ } -+ -+ if (num_changes_pending () == 0 || !apply_change_group ()) -+ return false; -+ -+ num_changes++; -+ return true; -+} -+ - /* Try to replace USE with SRC (defined in DEF_INSN) and simplify the - result. */ - -@@ -863,12 +937,16 @@ - rtx src, reg, new_rtx, *loc; - bool set_reg_equal; - enum machine_mode mode; -+ int asm_use = -1; -+ -+ if (INSN_CODE (use_insn) < 0) -+ asm_use = asm_noperands (PATTERN (use_insn)); - -- if (!use_set) -+ if (!use_set && asm_use < 0) - return false; - - /* Do not propagate into PC, CC0, etc. */ -- if (GET_MODE (SET_DEST (use_set)) == VOIDmode) -+ if (use_set && GET_MODE (SET_DEST (use_set)) == VOIDmode) - return false; - - /* If def and use are subreg, check if they match. */ -@@ -900,7 +978,7 @@ - if (MEM_P (src) && MEM_READONLY_P (src)) - { - rtx x = avoid_constant_pool_reference (src); -- if (x != src) -+ if (x != src && use_set) - { - rtx note = find_reg_note (use_insn, REG_EQUAL, NULL_RTX); - rtx old_rtx = note ? XEXP (note, 0) : SET_SRC (use_set); -@@ -911,6 +989,9 @@ - return false; - } - -+ if (asm_use >= 0) -+ return forward_propagate_asm (use, def_insn, def_set, reg); -+ - /* Else try simplifying. */ - - if (DF_REF_TYPE (use) == DF_REF_REG_MEM_STORE) diff --git a/source/devel/gcc/pr40013.patch b/source/devel/gcc/pr40013.patch deleted file mode 100644 index 94f2403..0000000 --- a/source/devel/gcc/pr40013.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- gcc-4_4-branch/gcc/cp/pt.c 2009/05/05 06:37:05 147119 -+++ gcc-4_4-branch/gcc/cp/pt.c 2009/05/05 06:41:33 147120 -@@ -9144,6 +9144,14 @@ - - max = tsubst_expr (omax, args, complain, in_decl, - /*integral_constant_expression_p=*/false); -+ -+ /* Fix up type of the magic NOP_EXPR with TREE_SIDE_EFFECTS if -+ needed. */ -+ if (TREE_CODE (max) == NOP_EXPR -+ && TREE_SIDE_EFFECTS (omax) -+ && !TREE_TYPE (max)) -+ TREE_TYPE (max) = TREE_TYPE (TREE_OPERAND (max, 0)); -+ - max = fold_decl_constant_value (max); - - /* If we're in a partial instantiation, preserve the magic NOP_EXPR _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
