From 52ff96e5f61833598d61821972b9f8cb4fd03dee Mon Sep 17 00:00:00 2001 From: shannonjr Date: Wed, 28 Jul 2004 07:37:19 +0000 Subject: 1) Removed two patches because the problem, corrected by the patches, has been corrected in 3.4.1 source 2) Incremented PKGREVISION 3) Corrected attempt to elimiate hardcoded GCC_PLATFORM=${MACHINE_GNU_ARCH}--netbsdelf2.0 --- lang/gcc34/Makefile | 13 +++++++++---- lang/gcc34/buildlink3.mk | 6 +++--- lang/gcc34/distinfo | 6 +----- lang/gcc34/patches/patch-function_c | 36 ------------------------------------ lang/gcc34/patches/patch-varasm | 13 ------------- 5 files changed, 13 insertions(+), 61 deletions(-) delete mode 100644 lang/gcc34/patches/patch-function_c delete mode 100644 lang/gcc34/patches/patch-varasm (limited to 'lang') diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index 2888682cda5..a3bcc328dfc 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2004/07/26 21:55:37 shannonjr Exp $ +# $NetBSD: Makefile,v 1.7 2004/07/28 07:37:19 shannonjr Exp $ # DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc34-${GCC_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} EXTRACT_SUFX= .tar.bz2 @@ -19,11 +19,11 @@ GCC_VERSION= 3.4.1 # Determine whether to use binutils .if ${OPSYS} == "NetBSD" . if !defined(USE_BINUTILS) -AS_PATH:= ${AS} +AS_PATH:= ${AS} . for _dir_ in ${PATH:C/\:/ /g} . if empty(AS_PATH:M/*) . if exists(${_dir_}/${AS}) -AS_PATH:= ${_dir_}/${AS} +AS_PATH:= ${_dir_}/${AS} . endif . endif . endfor @@ -132,6 +132,11 @@ MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} CPPFLAGS+= -I${BUILDLINK_DIR}/include CFLAGS+= -I${BUILDLINK_DIR}/include +LOWER_OPSYS_VERSUFFIX!= echo ${LOWER_OS_VERSION} | ${CUT} -d _ -f 1 +GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} +CONFIGURE_ARGS+= --host=${GCC_PLATFORM} +GCC_ARCHSUBDIR= ${GCC_SUBPREFIX}/lib/gcc/${GCC_PLATFORM}/${GCC_VERSION} +GCC_ARCHDIR= ${PREFIX}/${GCC_ARCHSUBDIR} post-patch: .if (${MACHINE_GNU_ARCH} == "x86_64") diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk index 278deaab2ca..2461cc7149a 100644 --- a/lang/gcc34/buildlink3.mk +++ b/lang/gcc34/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/07/01 08:18:07 shannonjr Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2004/07/28 07:37:19 shannonjr Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC34_BUILDLINK3_MK:= ${GCC34_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34} BUILDLINK_PACKAGES+= gcc34 .if !empty(GCC34_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.gcc34+= gcc34>=3.4.1 +BUILDLINK_DEPENDS.gcc34+= gcc34>=3.4.1nb2 BUILDLINK_PKGSRCDIR.gcc34?= ../../lang/gcc34 . if exists(${BUILDLINK_PREFIX.gcc34}/bin/gcc) _GNAT1!=${BUILDLINK_PREFIX.gcc34}/bin/gcc -print-prog-name=gnat1 @@ -39,6 +39,6 @@ BUILDLINK_TRANSFORM.gcc34= -e s:\buildlink:buildlink/gcc34: BUILDLINK_DEPMETHOD.gcc34?= full .include "../../mk/pthread.buildlink3.mk" -.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo index 1a51c89dc70..d301438e3dc 100644 --- a/lang/gcc34/distinfo +++ b/lang/gcc34/distinfo @@ -1,15 +1,11 @@ -$NetBSD: distinfo,v 1.4 2004/07/26 21:55:37 shannonjr Exp $ +$NetBSD: distinfo,v 1.5 2004/07/28 07:37:19 shannonjr Exp $ SHA1 (gcc-3.4.1.tar.bz2) = 04de377eff57e614b089b8946a520de0dac7248e Size (gcc-3.4.1.tar.bz2) = 27182385 bytes -SHA1 (patch-function_c) = 64398f40f62ad4c8b9c8f861b802403a4f5aa3be -SHA1 (patch-libstdc++-v3_configure_host) = f680066ac285cd9cd3fea6713ce3e8a6d0e1c14c SHA1 (patch-ae) = 9b9e4ec15815626c81936460ce834303381f001c SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715 SHA1 (patch-ba) = 6fc03fc155f630329f7dc831eece6b6464b453a6 SHA1 (patch-bb) = aa088194fb073fcde8d2f558ed55ec36106d60d0 SHA1 (patch-ca) = 771c14ce8cdd9e631694cd19108419f4003a6c08 -SHA1 (patch-function_c) = 64398f40f62ad4c8b9c8f861b802403a4f5aa3be SHA1 (patch-libstdc++-v3_configure_host) = f680066ac285cd9cd3fea6713ce3e8a6d0e1c14c -SHA1 (patch-varasm) = 3dfe9a56ebd464d573104511e63dc3599ab5c834 diff --git a/lang/gcc34/patches/patch-function_c b/lang/gcc34/patches/patch-function_c deleted file mode 100644 index 394ab8de943..00000000000 --- a/lang/gcc34/patches/patch-function_c +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-function_c,v 1.1.1.1 2004/06/29 18:01:25 shannonjr Exp $ - ---- ./gcc/function.c.orig 2004-03-15 16:22:47.000000000 -0700 -+++ ./gcc/function.c -@@ -2844,6 +2844,7 @@ gen_mem_addressof (rtx reg, tree decl, i - RTX_UNCHANGING_P (XEXP (r, 0)) = RTX_UNCHANGING_P (reg); - - PUT_CODE (reg, MEM); -+ MEM_VOLATILE_P (reg) = 0; - MEM_ATTRS (reg) = 0; - XEXP (reg, 0) = r; - -@@ -2876,11 +2877,9 @@ gen_mem_addressof (rtx reg, tree decl, i - { - /* This can only happen during reload. Clear the same flag bits as - reload. */ -- MEM_VOLATILE_P (reg) = 0; - RTX_UNCHANGING_P (reg) = 0; - MEM_IN_STRUCT_P (reg) = 0; - MEM_SCALAR_P (reg) = 0; -- MEM_ATTRS (reg) = 0; - - fixup_var_refs (reg, GET_MODE (reg), 0, reg, 0); - } -@@ -5256,6 +5255,11 @@ assign_parms (tree fndecl) - { - SET_DECL_RTL (parm, DECL_RTL (fnargs)); - DECL_INCOMING_RTL (parm) = DECL_INCOMING_RTL (fnargs); -+ /* Set MEM_EXPR to the original decl, i.e. to PARM, -+ instead of the copy of decl, i.e. FNARGS. */ -+ if (DECL_INCOMING_RTL (parm) -+ && GET_CODE (DECL_INCOMING_RTL (parm)) == MEM) -+ set_mem_expr (DECL_INCOMING_RTL (parm), parm); - } - fnargs = TREE_CHAIN (fnargs); - } diff --git a/lang/gcc34/patches/patch-varasm b/lang/gcc34/patches/patch-varasm deleted file mode 100644 index 69722f20717..00000000000 --- a/lang/gcc34/patches/patch-varasm +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-varasm,v 1.1.1.1 2004/06/29 18:01:25 shannonjr Exp $ - ---- gcc/varasm.c.orig 2004-04-14 15:14:08.000000000 -0600 -+++ gcc/varasm.c -@@ -2331,6 +2331,7 @@ compare_constant (const tree t1, const t - case NOP_EXPR: - case CONVERT_EXPR: - case NON_LVALUE_EXPR: -+ case VIEW_CONVERT_EXPR: - return compare_constant (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0)); - - default: - -- cgit v1.2.3