View | Details | Raw Unified | Return to bug 196712 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/bsd.default-versions.mk (-2 / +2 lines)
Lines 20-26 Link Here
20
20
21
APACHE_DEFAULT?=	2.4
21
APACHE_DEFAULT?=	2.4
22
FPC_DEFAULT?=		2.6.4
22
FPC_DEFAULT?=		2.6.4
23
GCC_DEFAULT?=		4.8
23
GCC_DEFAULT?=		4.9
24
LUA_DEFAULT?=		5.2
24
LUA_DEFAULT?=		5.2
25
MYSQL_DEFAULT?=		5.6
25
MYSQL_DEFAULT?=		5.6
26
PERL5_DEFAULT?=		5.18
26
PERL5_DEFAULT?=		5.18
Lines 34-39 Link Here
34
FIREBIRD_DEFAULT?=	2.5
34
FIREBIRD_DEFAULT?=	2.5
35
35
36
# Version of lang/gcc.  Do not override!
36
# Version of lang/gcc.  Do not override!
37
LANG_GCC_IS=		4.8
37
LANG_GCC_IS=		4.9
38
38
39
.endif
39
.endif
(-)lang/gcc/Makefile (-3 / +3 lines)
Lines 2-14 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	gcc
4
PORTNAME=	gcc
5
PORTVERSION=	4.8.4
5
PORTVERSION=	4.9.2
6
CATEGORIES=	lang java
6
CATEGORIES=	lang java
7
MASTER_SITES=	${MASTER_SITE_GCC}
7
MASTER_SITES=	${MASTER_SITE_GCC}
8
MASTER_SITE_SUBDIR=	releases/gcc-${DISTVERSION}
8
MASTER_SITE_SUBDIR=	releases/gcc-${DISTVERSION}
9
9
10
MAINTAINER=	gerald@FreeBSD.org
10
MAINTAINER=	gerald@FreeBSD.org
11
COMMENT=	GNU Compiler Collection 4.8
11
COMMENT=	GNU Compiler Collection 4.9
12
12
13
LICENSE=	GPLv3 GPLv3RLE
13
LICENSE=	GPLv3 GPLv3RLE
14
LICENSE_COMB=	multi
14
LICENSE_COMB=	multi
Lines 23-29 Link Here
23
BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
23
BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
24
.endif
24
.endif
25
25
26
CONFLICTS=	gcc48*
26
CONFLICTS=	gcc49*
27
27
28
# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
28
# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
29
# of executables and directories once installed.
29
# of executables and directories once installed.
(-)lang/gcc/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gcc-4.8.4.tar.bz2) = 4a80aa23798b8e9b5793494b8c976b39b8d9aa2e53cd5ed5534aff662a7f8695
1
SHA256 (gcc-4.9.2.tar.bz2) = 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
2
SIZE (gcc-4.8.4.tar.bz2) = 86220648
2
SIZE (gcc-4.9.2.tar.bz2) = 89939747
(-)lang/gcc/files/java-patch-hier (-10 / +8 lines)
Lines 1-13 Link Here
1
Index: libjava/Makefile.in
1
--- libjava/Makefile.in	2013-05-26 22:33:07.000000000 +0000
2
===================================================================
2
+++ libjava/Makefile.in	2013-05-31 21:19:23.000000000 +0000
3
--- libjava/Makefile.in	(revision 117734)
3
@@ -941,7 +941,7 @@
4
+++ libjava/Makefile.in	(working copy)
4
 @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
5
@@ -712,7 +712,7 @@
5
 @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
6
 	$(am__append_2) $(am__append_3)
7
 toolexecmainlib_DATA = libgcj.spec
8
 dbexec_LTLIBRARIES = libjvm.la
6
 dbexec_LTLIBRARIES = libjvm.la
9
-pkgconfigdir = $(libdir)/pkgconfig
7
-pkgconfigdir = $(toolexeclibdir)/pkgconfig
10
+pkgconfigdir = $(prefix)/libdata/pkgconfig
8
+pkgconfigdir = $(prefix)/libdata/pkgconfig
11
 jardir = $(datadir)/java
9
 jardir = $(datadir)/java
12
 jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
10
 jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
13
 @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
11
 	$(am__append_5)
(-)lang/gcc/files/patch-arm-libcpp (-24 lines)
Lines 1-24 Link Here
1
Index: libcpp/configure
2
===================================================================
3
--- libcpp/configure	(revision 218760)
4
+++ libcpp/configure	(working copy)
5
@@ -7153,6 +7153,7 @@
6
 	aarch64*-*-* | \
7
 	alpha*-*-* | \
8
 	arm*-*-*eabi* | \
9
+	arm*-*-freebsd* | \
10
 	arm*-*-rtems* | \
11
 	arm*-*-symbianelf* | \
12
 	x86_64-*-* | \
13
Index: libcpp/configure.ac
14
===================================================================
15
--- libcpp/configure.ac	(revision 218760)
16
+++ libcpp/configure.ac	(working copy)
17
@@ -185,6 +185,7 @@
18
 	aarch64*-*-* | \
19
 	alpha*-*-* | \
20
 	arm*-*-*eabi* | \
21
+	arm*-*-freebsd* | \
22
 	arm*-*-rtems* | \
23
 	arm*-*-symbianelf* | \
24
 	x86_64-*-* | \
(-)lang/gcc/files/patch-pr63740-arm (+14 lines)
Line 0 Link Here
1
--- gcc/lra-lives.c	2014/06/16 09:25:26	211700
2
+++ gcc/lra-lives.c	2014/06/16 09:58:34	211701
3
@@ -558,7 +558,11 @@
4
 	      /* It might be 'inheritance pseudo <- reload pseudo'.  */
5
 	      || (src_regno >= lra_constraint_new_regno_start
6
 		  && ((int) REGNO (SET_DEST (set))
7
-		      >= lra_constraint_new_regno_start))))
8
+		      >= lra_constraint_new_regno_start)
9
+		  /* Remember to skip special cases where src/dest regnos are
10
+		     the same, e.g. insn SET pattern has matching constraints
11
+		     like =r,0.  */
12
+		  && src_regno != (int) REGNO (SET_DEST (set)))))
13
 	{
14
 	  int hard_regno = -1, regno = -1;
(-)lang/gcc/pkg-descr (-4 / +4 lines)
Lines 1-11 Link Here
1
GCC, the GNU Compiler Collection, supports a number of languages.  This
1
GCC, the GNU Compiler Collection, supports a number of languages.  This
2
port installs the C, C++, Fortran and Java front ends as gcc48, g++48,
2
port installs the C, C++, Fortran and Java front ends as gcc49, g++49,
3
gfortran48, and gcj48, respectively.
3
gfortran49, and gcj49, respectively.
4
4
5
It can be used interchangibly with the lang/gcc48 port which tracks
5
It can be used interchangibly with the lang/gcc49 port which tracks
6
weekly upstream snapshots whereas this port will be updated less
6
weekly upstream snapshots whereas this port will be updated less
7
frequently, mostly in sync with upstream releases, and will move to
7
frequently, mostly in sync with upstream releases, and will move to
8
lang/gcc49 and later over time.
8
lang/gcc5 and later over time.
9
9
10
WWW: http://gcc.gnu.org/
10
WWW: http://gcc.gnu.org/
11
11
(-)lang/gcc/pkg-plist (-1 / +1 lines)
Lines 47-53 Link Here
47
%%JAVA%%bin/gtnameserv%%SUFFIX%%
47
%%JAVA%%bin/gtnameserv%%SUFFIX%%
48
%%JAVA%%bin/jcf-dump%%SUFFIX%%
48
%%JAVA%%bin/jcf-dump%%SUFFIX%%
49
%%JAVA%%bin/jv-convert%%SUFFIX%%
49
%%JAVA%%bin/jv-convert%%SUFFIX%%
50
%%JAVA%%libdata/pkgconfig/libgcj-4.8.pc
50
%%JAVA%%libdata/pkgconfig/libgcj-4.9.pc
51
%%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz
51
%%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz
52
%%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz
52
%%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz
53
%%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz
53
%%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz

Return to bug 196712