- GCC 5

git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7784 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

4 files changed, 133 insertions, 7 deletions

diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index 14aaf6a..a8fbbc0 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -5,7 +5,7 @@ ifeq ($(with_plugins),yes)
   arch_binaries  := $(arch_binaries) gcc-plugindev
 endif
 
-arch_binaries  := $(arch_binaries) gcc
+arch_binaries  := $(arch_binaries) libcc1 gcc
 
 ifneq ($(DEB_CROSS),yes)
   ifneq ($(GFDL_INVARIANT_FREE),yes)
@@ -29,7 +29,7 @@ dirs_gcc = \
 
 # XXX: what about triarch mapping?
 files_gcc = \
-	$(PF)/bin/$(cmd_prefix){gcc,gcov}$(pkg_ver) \
+	$(PF)/bin/$(cmd_prefix){gcc,gcov,gcov-tool}$(pkg_ver) \
 	$(PF)/bin/$(cmd_prefix)gcc-{ar,ranlib,nm}$(pkg_ver) \
 	$(PF)/share/man/man1/$(cmd_prefix)gcc-{ar,nm,ranlib}$(pkg_ver).1 \
 	$(gcc_lexec_dir)/{collect2,lto1,lto-wrapper} \
@@ -65,6 +65,9 @@ d_gcc_m	= debian/$(p_gcc_m)
 p_pld	= gcc$(pkg_ver)-plugin-dev$(cross_bin_arch)
 d_pld	= debian/$(p_pld)
 
+p_cc1	= libcc1-$(CC1_SONAME)
+d_cc1	= debian/$(p_cc1)
+
 # ----------------------------------------------------------------------
 $(binary_stamp)-gcc: $(install_dependencies)
 	dh_testdir
@@ -113,8 +116,12 @@ endif
 
 	DH_COMPAT=2 dh_movefiles -p$(p_gcc) $(files_gcc)
 
+	rm -f $(d)/$(usr_lib)/libcc1.so
+	dh_link -p$(p_gcc) \
+		/$(usr_lib)/libcc1.so.$(CC1_SO) /$(gcc_lib_dir)/libcc1.so
+
 ifneq ($(DEB_CROSS),yes)
-	for i in gcc gcov gcc-ar gcc-nm gcc-ranlib; do \
+	for i in gcc gcov gcov-tool gcc-ar gcc-nm gcc-ranlib; do \
 	  ln -sf $$i$(pkg_ver) \
 	    $(d_gcc)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver); \
 	  ln -sf $$i$(pkg_ver) \
@@ -197,6 +204,34 @@ $(binary_stamp)-gcc-multi: $(install_dependencies)
 	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
 
 # ----------------------------------------------------------------------
+$(binary_stamp)-libcc1: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_cc1)
+	dh_installdirs -p$(p_cc1) \
+		$(docdir) \
+		$(usr_lib)
+	DH_COMPAT=2 dh_movefiles -p$(p_cc1) \
+		$(usr_lib)/libcc1.so.*
+
+	debian/dh_doclink -p$(p_cc1) $(p_xbase)
+	debian/dh_rmemptydirs -p$(p_cc1)
+
+	dh_strip -p$(p_cc1)
+	dh_compress -p$(p_cc1)
+	dh_makeshlibs -p$(p_cc1)
+	dh_shlibdeps -p$(p_cc1)
+	dh_fixperms -p$(p_cc1)
+	dh_installdeb -p$(p_cc1)
+	dh_gencontrol -p$(p_cc1) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_md5sums -p$(p_cc1)
+	dh_builddeb -p$(p_cc1)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
 $(binary_stamp)-gcc-plugindev: $(install_dependencies)
 	dh_testdir
 	dh_testroot
diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk
index 6226ccb..6b210fa 100644
--- a/debian/rules.d/binary-go.mk
+++ b/debian/rules.d/binary-go.mk
@@ -42,7 +42,8 @@ dirs_go = \
 	$(PF)/include \
 	$(PF)/share/man/man1
 files_go = \
-	$(PF)/bin/$(cmd_prefix)gccgo$(pkg_ver) \
+	$(PF)/bin/$(cmd_prefix){gccgo,go,gofmt}$(pkg_ver) \
+	$(gcc_lexec_dir)/cgo \
 	$(gcc_lexec_dir)/go1
 
 ifneq ($(GFDL_INVARIANT_FREE),yes)
@@ -203,11 +204,14 @@ $(binary_stamp)-gccgo: $(install_stamp)
 
 	$(call do_go_dev,,$(p_go))
 
+	mv $(d)/$(gcc_lexec_dir)/cgo$(pkg_ver) $(d)/$(gcc_lexec_dir)/cgo
+
 	DH_COMPAT=2 dh_movefiles -p$(p_go) $(files_go)
 
 ifneq (,$(findstring gccgo,$(PKGSOURCE)))
 	rm -rf $(d_go)/$(gcc_lib_dir)/include/cilk
 	rm -rf $(d_go)/$(gcc_lib_dir)/include/omp.h
+	rm -rf $(d_go)/$(gcc_lib_dir)/include/openacc.h
 endif
 
 ifneq ($(DEB_CROSS),yes)
@@ -248,7 +252,7 @@ endif
 #		$(d_go)/$(docdir)/$(p_base)/go/changelog
 	debian/dh_rmemptydirs -p$(p_go)
 
-	dh_strip -p$(p_go)
+	dh_strip -p$(p_go) -X/cgo -Xgo$(pkg_ver) -Xgofmt$(pkg_ver)
 	dh_compress -p$(p_go)
 	dh_fixperms -p$(p_go)
 	dh_shlibdeps -p$(p_go)
diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk
index 44a4aad..a2c78bb 100644
--- a/debian/rules.d/binary-libgcc.mk
+++ b/debian/rules.d/binary-libgcc.mk
@@ -51,7 +51,9 @@ header_files = \
 		    {,a,b,e,i,n,p,s,t,w,x}mmintrin.h mmintrin-common.h \
 		    {abm,adx,avx,avx2,bmi,bmi2,f16c,fma,fma4,fxsr,ia32,}intrin.h \
 		    {lwp,lzcnt,popcnt,prfchw,rdseed,rtm,tbm,x86,xop,xsave{,opt},xtest,}intrin.h \
-		    {htm,htmxl,sha}intrin.h avx512{er,cd,f,pf}intrin.h \
+		    {htm,htmxl,sha}intrin.h \
+		    avx512{bw,er,cd,dq,f,ifma,ifmavl,pf,vlbw,vbmi,vldq,vbmivl,vl}intrin.h \
+		    {clflushopt,clwb,pcommit,xsavec,xsaves}intrin.h \
 		    {arm_acle,unwind-arm-common,s390intrin}.h \
 		    {cross-stdarg,syslimits,unwind,varargs}.h; \
 		do \
@@ -74,7 +76,7 @@ ifeq ($(with_libssp),yes)
     header_files += $(gcc_lib_dir)/include/ssp
 endif
 ifeq ($(with_gomp),yes)
-    header_files += $(gcc_lib_dir)/include/omp.h
+    header_files += $(gcc_lib_dir)/include/{omp,openacc}.h
 endif
 ifeq ($(with_qmath),yes)
     header_files += $(gcc_lib_dir)/include/quadmath{,_weak}.h
diff --git a/debian/rules.d/binary-libgccjit.mk b/debian/rules.d/binary-libgccjit.mk
new file mode 100644
index 0000000..fbedb1e
--- /dev/null
+++ b/debian/rules.d/binary-libgccjit.mk
@@ -0,0 +1,85 @@
+$(lib_binaries)  += libgccjit
+
+ifneq ($(DEB_CROSS),yes)
+  indep_binaries := $(indep_binaries) libgccjitdoc
+endif
+
+p_jitlib	= libgccjit$(GCCJIT_SONAME)
+p_jitdev	= libgccjit$(pkg_ver)-dev
+p_jitdbg	= libgccjit$(pkg_ver)-dbg
+p_jitdoc	= libgccjit$(pkg_ver)-doc
+
+d_jitlib	= debian/$(p_jitlib)
+d_jitdev	= debian/$(p_jitdev)
+d_jitdbg	= debian/$(p_jitdbg)
+d_jitdoc	= debian/$(p_jitdoc)
+
+$(binary_stamp)-libgccjit: $(install_jit_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_jitlib) $(d_jitdev) $(d_jitdbg)
+	dh_installdirs -p$(p_jitlib) \
+		$(usr_lib)
+
+	dh_installdirs -p$(p_jitdev) \
+		$(usr_lib) \
+		$(gcc_lib_dir)/include
+
+	dh_installdirs -p$(p_jitdbg)
+
+	DH_COMPAT=2 dh_movefiles -p$(p_jitlib) \
+		$(usr_lib)/libgccjit.so.*
+	rm -f $(d)/$(usr_lib)/libgccjit.so
+
+	DH_COMPAT=2 dh_movefiles -p$(p_jitdev) \
+		$(gcc_lib_dir)/include/libgccjit*.h
+	dh_link -p$(p_jitdev) \
+		$(usr_lib)/libgccjit.so $(gcc_lib_dir)/libgccjit.so
+
+	debian/dh_doclink -p$(p_jitlib) $(p_base)
+	debian/dh_doclink -p$(p_jitdev) $(p_base)
+	debian/dh_doclink -p$(p_jitdbg) $(p_base)
+
+	dh_strip -p$(p_jitlib) --dbg-package=$(p_jitdbg)
+	dh_compress -p$(p_jitlib) -p$(p_jitdev) -p$(p_jitdbg)
+	dh_fixperms -p$(p_jitlib) -p$(p_jitdev) -p$(p_jitdbg)
+	$(cross_makeshlibs) dh_makeshlibs -p$(p_jitlib)
+	$(call cross_mangle_shlibs,$(p_jitlib))
+	$(ignshld)$(cross_shlibdeps) dh_shlibdeps -p$(p_jitlib)
+	$(call cross_mangle_substvars,$(p_jitlib))
+	$(cross_gencontrol) dh_gencontrol -p$(p_jitlib) -p$(p_jitdev) -p$(p_jitdbg) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+	$(call cross_mangle_control,$(p_jitlib))
+	dh_installdeb -p$(p_jitlib) -p$(p_jitdev) -p$(p_jitdbg)
+	dh_md5sums -p$(p_jitlib) -p$(p_jitdev) -p$(p_jitdbg)
+	dh_builddeb -p$(p_jitlib) -p$(p_jitdev) -p$(p_jitdbg)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+	touch $@
+
+$(binary_stamp)-libgccjitdoc: $(install_jit_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_jitdoc)
+	dh_installdirs -p$(p_jitdoc) \
+		$(PF)/share/info
+
+	DH_COMPAT=2 dh_movefiles -p$(p_jitdoc) \
+		$(PF)/share/info/libgccjit*
+
+	debian/dh_doclink -p$(p_jitdoc) $(p_base)
+
+	dh_compress -p$(p_jitdoc)
+	dh_fixperms -p$(p_jitdoc)
+	dh_gencontrol -p$(p_jitdoc) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_jitdoc)
+	dh_md5sums -p$(p_jitdoc)
+	dh_builddeb -p$(p_jitdoc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+	touch $@