4 files changed, 61 insertions, 30 deletions

diff --git a/devel/msp430-gcc/Makefile b/devel/msp430-gcc/Makefile
index 72e1230dd1cf..31490dbb6c18 100644
--- a/devel/msp430-gcc/Makefile
+++ b/devel/msp430-gcc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}.${LTSVERSION}
-PORTREVISION=	5
+PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
@@ -39,10 +39,10 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 
 CONFLICTS=	msp430-gcc-3.*
 
-GCCVERSION=	4.5.3
-LTSVERSION=	20110716
-PATCHVERSION=	20110706
-BUGS_FIXED=	3370978 3390964 3394176 3396639 3409864 3431602 3433730
+GCCVERSION=	4.6.3
+LTSVERSION=	20120406
+PATCHVERSION=	20120406
+BUGS_FIXED=	# For future use
 LTS_PATCHES!=	for bugid in ${BUGS_FIXED} ; do echo ${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}-${PATCHVERSION}-sf$${bugid}.patch ; done
 
 SRCDIR=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
@@ -60,6 +60,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=../${SRCDIR:S/${WRKDIR}\///}/configure
 CONFIGURE_ARGS+=--target=${PKGNAMEPREFIX:S/-$//} \
 		--enable-languages=c,c++ \
+		--enable-lto \
 		--with-gmp=${LOCALBASE} --with-mpfr=${LOCALBASE} \
 		--with-mpc=${LOCALBASE} --with-libiconv-prefix=${LOCALBASE} \
 		--with-system-zlib --disable-nls \
@@ -72,13 +73,19 @@ MAN1=		${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}g++.1 \
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} GCC_TARG=${PKGNAMEPREFIX:S/-$//} \
 		GCC_REV=${GCCVERSION}
 
-INFO=		cpp cppinternals gcc gccinstall gccint
+INFO=		cpp cppinternals gcc gccinstall gccint libquadmath
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info
 
 BINARIES=	gcc gcc-${GCCVERSION} c++ g++ gcov cpp
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "amd64"
+CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+.endif
+
 pre-patch:
 	@cd ${SRCDIR} && ${PATCH} -s -p1 < ../mspgcc-${LTSVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}-${PATCHVERSION}.patch
 
diff --git a/devel/msp430-gcc/distinfo b/devel/msp430-gcc/distinfo
index a421ca3122a4..4ea949db958d 100644
--- a/devel/msp430-gcc/distinfo
+++ b/devel/msp430-gcc/distinfo
@@ -1,20 +1,6 @@
-SHA256 (gcc-core-4.5.3.tar.bz2) = fef7ef1396d41f4af2dacbea8826a895060a8a72d9f05546c091085b036f1f87
-SIZE (gcc-core-4.5.3.tar.bz2) = 28252641
-SHA256 (gcc-g++-4.5.3.tar.bz2) = e088b9fe0016070da921f353ef8c0c2f81fd11d21e3aeb09210ab7bad080804b
-SIZE (gcc-g++-4.5.3.tar.bz2) = 6475820
-SHA256 (mspgcc-20110716.tar.bz2) = 6e28c2f4976933fc2663751192bc365c68705071908c1c92c03dad2667d74044
-SIZE (mspgcc-20110716.tar.bz2) = 371880
-SHA256 (msp430-gcc-4.5.3-20110706-sf3370978.patch) = d375b9f5c4497d6a8ec5548abdc0f51c2cf464791833668dd1cbf5bbe753c7a4
-SIZE (msp430-gcc-4.5.3-20110706-sf3370978.patch) = 884
-SHA256 (msp430-gcc-4.5.3-20110706-sf3390964.patch) = 24820a4931d2b0685730c128fc339f3c513f718d3e900eea32425f94f35d19f9
-SIZE (msp430-gcc-4.5.3-20110706-sf3390964.patch) = 6257
-SHA256 (msp430-gcc-4.5.3-20110706-sf3394176.patch) = 06f03f032382e497cce5678f35cf4b3d8e56272c435f0ca45d86fcd28e8c8067
-SIZE (msp430-gcc-4.5.3-20110706-sf3394176.patch) = 1296
-SHA256 (msp430-gcc-4.5.3-20110706-sf3396639.patch) = faabe1bdcbb5ff196d91c97e3e33ddc65efecf9a89099b67590c4a86cdb6b040
-SIZE (msp430-gcc-4.5.3-20110706-sf3396639.patch) = 819
-SHA256 (msp430-gcc-4.5.3-20110706-sf3409864.patch) = ea53a39b71018c674b7c1bcd3dddb213da26d242d5622a7d34ed5e8c022148a6
-SIZE (msp430-gcc-4.5.3-20110706-sf3409864.patch) = 2818
-SHA256 (msp430-gcc-4.5.3-20110706-sf3431602.patch) = 2d880cb5f7038397768dab9bd61a0eab3ce06d4b7e46fb31256d552e45f08152
-SIZE (msp430-gcc-4.5.3-20110706-sf3431602.patch) = 2280
-SHA256 (msp430-gcc-4.5.3-20110706-sf3433730.patch) = 5c9b4a992f80b56bb7f7be56eb9a3e7663b97a05bf4487208da7c9f9b20aa197
-SIZE (msp430-gcc-4.5.3-20110706-sf3433730.patch) = 2747
+SHA256 (gcc-core-4.6.3.tar.bz2) = 283e00881c0de258fafc5170843e4d9b14ee2a7dc4426f0d426e6be0400251c1
+SIZE (gcc-core-4.6.3.tar.bz2) = 30305971
+SHA256 (gcc-g++-4.6.3.tar.bz2) = b3e0c733e900e99096b0c5480f57e22e3e583ec3d83596cc2cb9986bd64b29e8
+SIZE (gcc-g++-4.6.3.tar.bz2) = 6928430
+SHA256 (mspgcc-20120406.tar.bz2) = 82ed21884b550942f8dcf102e57a5fc7d5acf146d7a93f21a2a52ecd5477ae79
+SIZE (mspgcc-20120406.tar.bz2) = 417633
diff --git a/devel/msp430-gcc/files/patch-libgcc-Makefile.in b/devel/msp430-gcc/files/patch-libgcc-Makefile.in
new file mode 100644
index 000000000000..16eed4be1f7d
--- /dev/null
+++ b/devel/msp430-gcc/files/patch-libgcc-Makefile.in
@@ -0,0 +1,26 @@
+--- libgcc/Makefile.in.orig	2011-01-26 07:19:58.000000000 +0300
++++ libgcc/Makefile.in	2012-04-08 17:22:26.000000000 +0400
+@@ -878,6 +878,7 @@
+ 	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
+ 	  case $$file in 					\
+ 	    *.a)						\
++	      chmod 644 $(gcc_objdir)$(MULTISUBDIR)/$$file ;  	\
+ 	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
+ 	  esac;							\
+ 	done
+@@ -915,6 +916,7 @@
+ 	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
+ 	  case $$file in 					\
+ 	    *.a)						\
++	      chmod 644 $(gcc_objdir)$(MULTISUBDIR)/$$file ;  	\
+ 	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
+ 	  esac;							\
+ 	done
+@@ -974,6 +976,7 @@
+ 	  $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/;	\
+ 	  case $$file in 					\
+ 	    *.a)						\
++	      chmod 644 $(gcc_objdir)$(MULTISUBDIR)/$$file ;  	\
+ 	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
+ 	  esac;							\
+ 	done
diff --git a/devel/msp430-gcc/pkg-plist b/devel/msp430-gcc/pkg-plist
index 1a72aff14639..3cb9cb598c96 100644
--- a/devel/msp430-gcc/pkg-plist
+++ b/devel/msp430-gcc/pkg-plist
@@ -9,7 +9,6 @@ bin/%%GCC_TARG%%-cpp
 bin/%%GCC_TARG%%-gcc
 bin/%%GCC_TARG%%-gcc-%%GCC_REV%%
 bin/%%GCC_TARG%%-g++
-bin/%%GCC_TARG%%-gccbug
 bin/%%GCC_TARG%%-gcov
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/crt0ivtbl16.o
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/crt0ivtbl32.o
@@ -66,8 +65,9 @@ lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/basic-block.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/bitmap.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/builtins.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/bversion.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-common.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-common.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-family/c-common.def
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-objc.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-pragma.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-pretty-print.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cfghooks.h
@@ -90,12 +90,14 @@ lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/debug.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/defaults.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/diagnostic.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/diagnostic.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/diagnostic-core.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/double-int.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/emit-rtl.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/except.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/filenames.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/fixed-value.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/flags.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/flag-types.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/function.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/gcc-plugin.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/genrtl.h
@@ -116,6 +118,8 @@ lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/insn-modes.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/insn-notes.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/intl.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ipa-prop.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ipa-ref-inline.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ipa-ref.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ipa-reference.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/ipa-utils.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/langhooks.h
@@ -131,10 +135,10 @@ lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/opts.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/output.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/params.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/params.h
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/partition.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/plugin-version.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/plugin.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/plugin.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/plugin-api.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/pointer-set.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/predict.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/predict.h
@@ -151,6 +155,7 @@ lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/statistics.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/symtab.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/sync-builtins.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/system.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/target.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/target.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/timevar.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/timevar.h
@@ -171,13 +176,16 @@ lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree-ssa-sccvn.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree.def
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/tree.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/treestruct.def
-lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/varray.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/vec.h
+lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/vecir.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/vecprim.h
 lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/version.h
 libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/cc1
 libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/cc1plus
 libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/collect2
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/liblto_plugin.la
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/liblto_plugin.so
+libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/liblto_plugin.so.0
 libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/lto-wrapper
 libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/lto1
 libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders
@@ -191,6 +199,7 @@ libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkinstalldirs
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x/mmpy-16
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mcpu-430x
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/mmpy-16
+@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/c-family
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/config/%%GCC_TARG%%
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/config
 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/plugin/include/cp
@@ -205,3 +214,6 @@ libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkinstalldirs
 @dirrmtry libexec/gcc
 @dirrmtry %%GCC_TARG%%/bin
 @dirrmtry %%GCC_TARG%%/info
+@dirrmtry %%GCC_TARG%%/lib/mcpu-430x/mmpy-16
+@dirrmtry %%GCC_TARG%%/lib/mcpu-430x
+@dirrmtry %%GCC_TARG%%/lib/mmpy-16