Date: Mon, 15 Jun 2015 15:47:57 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389737 - in head/lang/gcc5-aux: . files Message-ID: <201506151547.t5FFlvFC014916@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Jun 15 15:47:56 2015 New Revision: 389737 URL: https://svnweb.freebsd.org/changeset/ports/389737 Log: lang/gcc5-aux: Upgrade from Release 5.1.0 to 5.1.1 snapshot (20150609) This captures some gcc fixes in the 2 months since the release. The version info with --version option has also been restored. Modified: head/lang/gcc5-aux/Makefile head/lang/gcc5-aux/Makefile.version head/lang/gcc5-aux/distinfo head/lang/gcc5-aux/files/diff-ada head/lang/gcc5-aux/files/diff-core head/lang/gcc5-aux/files/diff-cxx head/lang/gcc5-aux/files/diff-cxx-testsuite Modified: head/lang/gcc5-aux/Makefile ============================================================================== --- head/lang/gcc5-aux/Makefile Mon Jun 15 15:02:34 2015 (r389736) +++ head/lang/gcc5-aux/Makefile Mon Jun 15 15:47:56 2015 (r389737) @@ -79,6 +79,7 @@ BUILDDIR= ${WRKDIR}/build NEWBSDIR= ${WRKDIR}/newbs/bootstrap CFG_SCRIPT= ${WRKSRC}/configure REVFILE= ${WRKSRC}/gcc/REVISION +PHASEFILE= ${WRKSRC}/gcc/DEV-PHASE BOOTSTRAP_PREFIX= ${WRKDIR}/bootstrap PKG_PREFIX= ${PREFIX}/${PORTNAME} MANPREFIX= ${PREFIX}/${PORTNAME}/share @@ -194,6 +195,7 @@ ADA_CONFIG_ARGS+= ${EXTRA_CONFIG} post-extract: # Personalize GNAT for each different machine @${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE} + @${ECHO} ${PHASE} > ${PHASEFILE} # Apply required composite diff files .for suffix in ${APPLY_DIFFS} @@ -278,6 +280,7 @@ do-install: ${MV} ${STAGEDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share # Don't activate until this port builds gnatdroid # Otherwise it will conflict with lang/gcc-aux +# Add "share" after {PORTNAME} on 3rd line of post-stage target # ${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \ # ${STAGEDIR}${PREFIX}/share/dejagnu/config # ${INSTALL_DATA} ${FILESDIR}/android.exp \ @@ -288,7 +291,7 @@ do-install: post-stage: (cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \ ${SORT} -dr | ${XARGS} ${RMDIR}) - (cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} share \ + (cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} \ \( -type f -or -type l \) | ${SORT} | ${SED} \ -e 's/\/man\/man[1578]\/.*[1578]$$/&.gz/' >> ${TMPPLIST}) .if ${PORT_OPTIONS:MBOOTSTRAP} Modified: head/lang/gcc5-aux/Makefile.version ============================================================================== --- head/lang/gcc5-aux/Makefile.version Mon Jun 15 15:02:34 2015 (r389736) +++ head/lang/gcc5-aux/Makefile.version Mon Jun 15 15:47:56 2015 (r389737) @@ -1,11 +1,11 @@ # $FreeBSD$ GCC_BRANCH= 5 -GCC_POINT= 1.0 +GCC_POINT= 1.1 GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT} -SNAPSHOT= 20150422 -BUILD_RELEASE= yes -MAIN_PR= 2 +SNAPSHOT= 20150609 +BUILD_RELEASE= no +MAIN_PR= 0 UTIL_PR= 0 ARMV7_PR= 0 @@ -13,8 +13,10 @@ ARMV7_PR= 0 # Snapshot naming pattern IDENTIFICATION= gcc-${GCC_BRANCH}-${SNAPSHOT} MS_SUBDIR= snapshots/${GCC_BRANCH}-${SNAPSHOT} +PHASE= snapshot .else # Release naming pattern IDENTIFICATION= gcc-${GCC_VERSION} MS_SUBDIR= releases/gcc-${GCC_VERSION} +PHASE= release .endif Modified: head/lang/gcc5-aux/distinfo ============================================================================== --- head/lang/gcc5-aux/distinfo Mon Jun 15 15:02:34 2015 (r389736) +++ head/lang/gcc5-aux/distinfo Mon Jun 15 15:47:56 2015 (r389737) @@ -1,5 +1,5 @@ -SHA256 (gcc-5.1.0.tar.bz2) = b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad -SIZE (gcc-5.1.0.tar.bz2) = 94954411 +SHA256 (gcc-5-20150609.tar.bz2) = 9154f0b0c4950cfb6dc802da8a35d02478029923a0c44f8ca963cd7ca9107885 +SIZE (gcc-5-20150609.tar.bz2) = 90768076 SHA256 (ada-bootstrap.i386.freebsd.84.tar.bz2) = b410336cb0e71c8a29dd5f831a17b4b7282e7d590f452475a94c6a625cfc8846 SIZE (ada-bootstrap.i386.freebsd.84.tar.bz2) = 39727003 SHA256 (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 7231209f2600275f554f788ad1d036cf633c4339ebd25bd479a5bb1ddcddedf3 Modified: head/lang/gcc5-aux/files/diff-ada ============================================================================== --- head/lang/gcc5-aux/files/diff-ada Mon Jun 15 15:02:34 2015 (r389736) +++ head/lang/gcc5-aux/files/diff-ada Mon Jun 15 15:47:56 2015 (r389737) @@ -739,21 +739,16 @@ --- gcc/ada/gsocket.h.orig +++ gcc/ada/gsocket.h -@@ -208,7 +208,13 @@ - #include <sys/select.h> +@@ -209,6 +209,8 @@ #endif -+#ifdef __NetBSD__ -+#include <sys/select.h> -+#endif -+ #if defined (_AIX) || defined (__FreeBSD__) || defined (__hpux__) || \ + defined (__DragonFly__) || \ + defined (__NetBSD__) || defined (__OpenBSD__) || \ defined (_WIN32) || defined (__APPLE__) || defined (__ANDROID__) # define HAVE_THREAD_SAFE_GETxxxBYyyy 1 -@@ -241,7 +247,13 @@ +@@ -241,7 +243,13 @@ # endif #endif @@ -788,26 +783,7 @@ { struct sigaction act; -@@ -2070,6 +2070,18 @@ - - #include <signal.h> - #include <unistd.h> -+#include <time.h> -+ -+#define netbsd_sigaction sigaction -+#define netbsd_sigaddset sigaddset -+#define netbsd_sigdelset sigdelset -+#define netbsd_sigemptyset sigemptyset -+#define netbsd_sigfillset sigfillset -+#define netbsd_sigismember sigismember -+#define netbsd_sigaltstack sigaltstack -+#define netbsd_nanosleep nanosleep -+#define netbsd_clock_gettime clock_gettime -+#define netbsd_gettimeofday gettimeofday - - static void - __gnat_error_handler (int sig) -@@ -2496,9 +2508,13 @@ +@@ -2496,9 +2496,13 @@ initialization of the FP processor. This version is used under INTERIX and WIN32. */ @@ -2413,7 +2389,7 @@ s-osinte.adb<s-osinte-freebsd.adb \ s-osinte.ads<s-osinte-freebsd.ads \ s-osprim.adb<s-osprim-posix.adb \ -@@ -1465,7 +1477,113 @@ +@@ -1465,6 +1477,110 @@ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb GNATLIB_SHARED = gnatlib-shared-dual @@ -2465,8 +2441,6 @@ +# x86 NetBSD +ifeq ($(strip $(filter-out %86 netbsd%,$(target_cpu) $(target_os))),) + LIBGNAT_TARGET_PAIRS = \ -+ a-exetim.adb<a-exetim-posix.adb \ -+ a-exetim.ads<a-exetim-default.ads \ + a-intnam.ads<a-intnam-netbsd.ads \ + g-socthi.adb<g-socthi-bsd.adb \ + s-trasym.adb<s-trasym-bsd.adb \ @@ -2483,12 +2457,13 @@ + $(X86_TARGET_PAIRS) \ + system.ads<system-netbsd-x86.ads + ++ TOOLS_TARGET_PAIRS = \ ++ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb + GNATLIB_SHARED = gnatlib-shared-dual + + EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c + EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o + EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o -+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o + + EH_MECHANISM=-gcc + THREADSLIB= -lpthread @@ -2500,8 +2475,6 @@ +# x86_64 NetBSD +ifeq ($(strip $(filter-out x86_64 netbsd%,$(target_cpu) $(target_os))),) + LIBGNAT_TARGET_PAIRS = \ -+ a-exetim.adb<a-exetim-posix.adb \ -+ a-exetim.ads<a-exetim-default.ads \ + a-intnam.ads<a-intnam-netbsd.ads \ + g-socthi.adb<g-socthi-bsd.adb \ + s-trasym.adb<s-trasym-bsd.adb \ @@ -2518,15 +2491,15 @@ + $(X86_64_TARGET_PAIRS) \ + system.ads<system-netbsd-x86_64.ads + ++ TOOLS_TARGET_PAIRS = \ ++ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb + GNATLIB_SHARED = gnatlib-shared-dual + + EXTRA_LIBGNAT_SRCS+= traceback_symbolic.c + EXTRA_LIBGNAT_OBJS+= traceback_symbolic.o EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o -+ EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o EH_MECHANISM=-gcc - THREADSLIB= -lpthread --- gnattools/configure.ac.orig +++ gnattools/configure.ac @@ -79,11 +79,27 @@ Modified: head/lang/gcc5-aux/files/diff-core ============================================================================== --- head/lang/gcc5-aux/files/diff-core Mon Jun 15 15:02:34 2015 (r389736) +++ head/lang/gcc5-aux/files/diff-core Mon Jun 15 15:47:56 2015 (r389737) @@ -249,7 +249,7 @@ } --- gcc/Makefile.in.orig +++ gcc/Makefile.in -@@ -1156,7 +1156,6 @@ +@@ -1163,7 +1163,6 @@ insn-emit.o \ insn-extract.o \ insn-latencytab.o \ @@ -257,7 +257,7 @@ insn-opinit.o \ insn-output.o \ insn-peep.o \ -@@ -1511,6 +1510,7 @@ +@@ -1518,6 +1517,7 @@ $(OBJS-libcommon-target) @TREEBROWSER@ main.o c-family/cppspec.o \ $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \ $(GCOV_TOOL_OBJS) $(GENGTYPE_OBJS) gcc-ar.o gcc-nm.o gcc-ranlib.o \ @@ -265,7 +265,7 @@ lto-wrapper.o collect-utils.o # This lists all host object files, whether they are included in this -@@ -1518,6 +1518,11 @@ +@@ -1525,6 +1525,11 @@ ALL_HOST_OBJS = $(ALL_HOST_FRONTEND_OBJS) $(ALL_HOST_BACKEND_OBJS) BACKEND = libbackend.a main.o @TREEBROWSER@ libcommon-target.a libcommon.a \ @@ -277,7 +277,7 @@ $(CPPLIB) $(LIBDECNUMBER) # This is defined to "yes" if Tree checking is enabled, which roughly means -@@ -2164,6 +2169,7 @@ +@@ -2171,6 +2176,7 @@ insn-modes.c: s-modes; @true insn-modes.h: s-modes-h; @true @@ -285,7 +285,7 @@ min-insn-modes.c: s-modes-m; @true s-modes: build/genmodes$(build_exeext) -@@ -2181,6 +2187,12 @@ +@@ -2188,6 +2194,12 @@ $(SHELL) $(srcdir)/../move-if-change tmp-min-modes.c min-insn-modes.c $(STAMP) s-modes-m @@ -298,7 +298,7 @@ insn-preds.c: s-preds; @true tm-preds.h: s-preds-h; @true tm-constrs.h: s-constrs-h; @true -@@ -3326,6 +3338,9 @@ +@@ -3333,6 +3345,9 @@ ( cd $(DESTDIR)$(bindir) && \ $(LN) $(GCC_INSTALL_NAME)$(exeext) $(FULL_DRIVER_NAME) ); \ fi; \ Modified: head/lang/gcc5-aux/files/diff-cxx ============================================================================== --- head/lang/gcc5-aux/files/diff-cxx Mon Jun 15 15:02:34 2015 (r389736) +++ head/lang/gcc5-aux/files/diff-cxx Mon Jun 15 15:47:56 2015 (r389737) @@ -1,6 +1,6 @@ --- libstdc++-v3/configure.host.orig +++ libstdc++-v3/configure.host -@@ -268,6 +268,9 @@ +@@ -267,6 +267,9 @@ dragonfly*) os_include_dir="os/bsd/dragonfly" ;; Modified: head/lang/gcc5-aux/files/diff-cxx-testsuite ============================================================================== --- head/lang/gcc5-aux/files/diff-cxx-testsuite Mon Jun 15 15:02:34 2015 (r389736) +++ head/lang/gcc5-aux/files/diff-cxx-testsuite Mon Jun 15 15:47:56 2015 (r389737) @@ -1,6 +1,6 @@ --- libstdc++-v3/testsuite/lib/libstdc++.exp.orig +++ libstdc++-v3/testsuite/lib/libstdc++.exp -@@ -898,17 +898,18 @@ +@@ -902,17 +902,18 @@ set f [open $src "w"] puts $f "#include <locale>" puts $f "#include <cstdio>"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506151547.t5FFlvFC014916>