Index: head/lang/gcc6-aux/Makefile.version =================================================================== --- head/lang/gcc6-aux/Makefile.version (revision 410771) +++ head/lang/gcc6-aux/Makefile.version (revision 410772) @@ -1,22 +1,22 @@ # $FreeBSD$ GCC_BRANCH= 6 GCC_POINT= 0.0 GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT} -SNAPSHOT= 20160214 +SNAPSHOT= 20160306 BUILD_RELEASE= no MAIN_PR= 0 UTIL_PR= 0 ARMV7_PR= 0 .if ${BUILD_RELEASE:Mno} # 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 Index: head/lang/gcc6-aux/distinfo =================================================================== --- head/lang/gcc6-aux/distinfo (revision 410771) +++ head/lang/gcc6-aux/distinfo (revision 410772) @@ -1,8 +1,8 @@ -SHA256 (gcc-6-20160214.tar.bz2) = 83998f49b1ece032da40d086a9ccc7642ed4ef783b75bccba0cbbde538d4eff3 -SIZE (gcc-6-20160214.tar.bz2) = 95206916 +SHA256 (gcc-6-20160306.tar.bz2) = fec1c83edcaa3e51a92b76af8e1f91b683304172a9abd7b08379f1213cc58b6a +SIZE (gcc-6-20160306.tar.bz2) = 95156434 SHA256 (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 7231209f2600275f554f788ad1d036cf633c4339ebd25bd479a5bb1ddcddedf3 SIZE (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 41229192 SHA256 (ada-bootstrap.x86_64.dragonfly.41.tar.bz2) = eb7785d8b842aee2bb04b43adfb1346b178ee4e83d8775b4e6705fd23f1586f0 SIZE (ada-bootstrap.x86_64.dragonfly.41.tar.bz2) = 44956630 SHA256 (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 1066d7c5e71d78b4416de3b73348227678ca07db52488409e270db7b00467f55 SIZE (ada-bootstrap.x86_64.freebsd.100B.tar.bz2) = 42163803 Index: head/lang/gcc6-aux/files/diff-core =================================================================== --- head/lang/gcc6-aux/files/diff-core (revision 410771) +++ head/lang/gcc6-aux/files/diff-core (revision 410772) @@ -1,103 +1,103 @@ --- gcc/config/dragonfly.h.orig +++ gcc/config/dragonfly.h @@ -84,7 +84,7 @@ } \ %{static:-Bstatic} \ } \ - %{!static:--hash-style=gnu} \ + %{!static:--hash-style=gnu -rpath @PREFIX@/@GCCAUX@/lib} \ %{symbolic:-Bsymbolic}" #undef LINK_SPEC --- gcc/config/i386/freebsd.h.orig +++ gcc/config/i386/freebsd.h @@ -77,6 +77,12 @@ When the -shared link option is used a final link is not being done. */ +#if FBSD_MAJOR < 10 +#define ELF_HASH_STYLE "--hash-style=both " +#else +#define ELF_HASH_STYLE "--hash-style=gnu " +#endif + #undef LINK_SPEC #define LINK_SPEC "\ %{p:%nconsider using '-pg' instead of '-p' with gprof(1)} \ @@ -88,6 +94,7 @@ %{rdynamic:-export-dynamic} \ -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}} \ + %{!static:" ELF_HASH_STYLE "-rpath @PREFIX@/@GCCAUX@/lib} \ %{symbolic:-Bsymbolic}" /* A C statement to output to the stdio stream FILE an assembler --- gcc/config/i386/freebsd64.h.orig +++ gcc/config/i386/freebsd64.h @@ -41,4 +41,5 @@ %{rdynamic:-export-dynamic} \ -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}} \ + %{!static:" ELF_HASH_STYLE "-rpath @PREFIX@/@GCCAUX@/lib} \ %{symbolic:-Bsymbolic}" --- gcc/Makefile.in.orig +++ gcc/Makefile.in @@ -1185,7 +1185,6 @@ insn-emit.o \ insn-extract.o \ insn-latencytab.o \ - insn-modes.o \ insn-opinit.o \ insn-output.o \ insn-peep.o \ -@@ -1549,6 +1548,7 @@ +@@ -1556,6 +1555,7 @@ $(OBJS-libcommon-target) 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 \ + insn-modes.o insn-modes-ada.o \ lto-wrapper.o collect-utils.o # This lists all host object files, whether they are included in this -@@ -1556,6 +1556,11 @@ +@@ -1563,6 +1563,11 @@ ALL_HOST_OBJS = $(ALL_HOST_FRONTEND_OBJS) $(ALL_HOST_BACKEND_OBJS) BACKEND = libbackend.a main.o libcommon-target.a libcommon.a \ + insn-modes.o \ + $(CPPLIB) $(LIBDECNUMBER) + +BACKEND2 = libbackend.a main.o libcommon-target.a libcommon.a \ + insn-modes-ada.o \ $(CPPLIB) $(LIBDECNUMBER) # This is defined to "yes" if Tree checking is enabled, which roughly means -@@ -2210,6 +2215,7 @@ +@@ -2217,6 +2222,7 @@ insn-modes.c: s-modes; @true insn-modes.h: s-modes-h; @true +insn-modes-ada.c: s-modes-ada; @true min-insn-modes.c: s-modes-m; @true s-modes: build/genmodes$(build_exeext) -@@ -2227,6 +2233,12 @@ +@@ -2234,6 +2240,12 @@ $(SHELL) $(srcdir)/../move-if-change tmp-min-modes.c min-insn-modes.c $(STAMP) s-modes-m +s-modes-ada: s-modes + $(shell sed -e 's/: TARGET_96_ROUND_53_LONG_DOUBLE \? &ieee_extended_intel_96_round_53_format //' \ + < insn-modes.c > tmp-modes-ada.c) + $(SHELL) $(srcdir)/../move-if-change tmp-modes-ada.c insn-modes-ada.c + $(STAMP) s-modes-ada + insn-preds.c: s-preds; @true tm-preds.h: s-preds-h; @true tm-constrs.h: s-constrs-h; @true -@@ -3410,6 +3422,9 @@ +@@ -3419,6 +3431,9 @@ ( cd $(DESTDIR)$(bindir) && \ $(LN) $(GCC_INSTALL_NAME)$(exeext) $(FULL_DRIVER_NAME) ); \ fi; \ + if [ -f gnat1$(exeext) ] ; then \ + ( cd $(DESTDIR)$(bindir) && $(LN) $(GCC_INSTALL_NAME)$(exeext) ada$(exeext) ) \ + fi; \ if [ ! -f gcc-cross$(exeext) ] \ && [ "$(GCC_INSTALL_NAME)" != "$(GCC_TARGET_INSTALL_NAME)" ]; then \ rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-tmp$(exeext); \