summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog6
-rw-r--r--debian/control30
-rw-r--r--debian/control.m436
-rw-r--r--debian/g++-BV-spu.overrides2
-rw-r--r--debian/gcc-BV-spu.overrides2
-rw-r--r--debian/gfortran-BV-spu.overrides2
-rwxr-xr-xdebian/rules6
-rw-r--r--debian/rules.conf15
-rw-r--r--debian/rules.d/binary-base.mk7
-rw-r--r--debian/rules.d/binary-snapshot.mk9
-rw-r--r--debian/rules.d/binary-spu.mk164
-rw-r--r--debian/rules.defs34
-rw-r--r--debian/rules.patch26
-rw-r--r--debian/rules2170
14 files changed, 10 insertions, 499 deletions
diff --git a/debian/changelog b/debian/changelog
index 029de95..17fb36e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-4.8 (4.8.0-5) UNRELEASED; urgency=low
+
+ * Stop building the spu cross compilers on powerpc and ppc64.
+
+ -- Matthias Klose <doko@debian.org> Fri, 26 Apr 2013 15:34:32 +0200
+
gcc-4.8 (4.8.0-4) experimental; urgency=low
* Update to SVN 20130421 (r198115) from the gcc-4_8-branch.
diff --git a/debian/control b/debian/control
index b5c76d0..84b653e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mi
binutils (>= 2.22) | binutils-multiarch (>= 2.22), binutils-hppa64 (>= 2.22) [hppa],
gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext,
texinfo (>= 4.3), locales, sharutils,
- procps, netbase, binutils-spu (>= 2.22) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64],
+ procps, netbase,
libcloog-isl-dev (>= 0.18), libmpc-dev, libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~),
dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, quilt
Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns,
@@ -269,34 +269,6 @@ Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3)
Description: GNU C compiler (cross compiler for hppa64)
This is the GNU C compiler, a fairly portable optimizing compiler for C.
-Package: gcc-4.8-spu
-Architecture: powerpc ppc64
-Section: devel
-Priority: optional
-Depends: gcc-4.8-base (= ${gcc:Version}), binutils-spu (>= 2.18.1~cvs20080103-3), newlib-spu, ${shlibs:Depends}, ${misc:Depends}
-Provides: spu-gcc
-Description: SPU cross-compiler (preprocessor and C compiler)
- GNU Compiler Collection for the Cell Broadband Engine SPU (preprocessor
- and C compiler).
-
-Package: g++-4.8-spu
-Architecture: powerpc ppc64
-Section: devel
-Priority: optional
-Depends: gcc-4.8-base (= ${gcc:Version}), gcc-4.8-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: spu-g++
-Description: SPU cross-compiler (C++ compiler)
- GNU Compiler Collection for the Cell Broadband Engine SPU (C++ compiler).
-
-Package: gfortran-4.8-spu
-Architecture: powerpc ppc64
-Section: devel
-Priority: optional
-Depends: gcc-4.8-base (= ${gcc:Version}), gcc-4.8-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: spu-gfortran
-Description: SPU cross-compiler (Fortran compiler)
- GNU Compiler Collection for the Cell Broadband Engine SPU (Fortran compiler).
-
Package: cpp-4.8
Architecture: any
Section: interpreters
diff --git a/debian/control.m4 b/debian/control.m4
index 00f5b65..1ed84bb 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -68,7 +68,7 @@ Build-Depends: debhelper (>= 5.0.62), GCC_MULTILIB_BUILD_DEP
BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa],
gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext,
texinfo (>= 4.3), locales, sharutils,
- procps, FORTRAN_BUILD_DEP JAVA_BUILD_DEP GNAT_BUILD_DEP GO_BUILD_DEP GDC_BUILD_DEP SPU_BUILD_DEP
+ procps, FORTRAN_BUILD_DEP JAVA_BUILD_DEP GNAT_BUILD_DEP GO_BUILD_DEP GDC_BUILD_DEP
CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP
CHECK_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, quilt
Build-Depends-Indep: LIBSTDCXX_BUILD_INDEP JAVA_BUILD_INDEP
@@ -745,40 +745,6 @@ Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3)
BUILT_USING`'dnl
Description: GNU C compiler (cross compiler for hppa64)
This is the GNU C compiler, a fairly portable optimizing compiler for C.
-
-ifdef(`TARGET', `', `
-Package: gcc`'PV-spu
-Architecture: powerpc ppc64
-Section: devel
-Priority: PRI(optional)
-Depends: BASEDEP, binutils-spu (>= 2.18.1~cvs20080103-3), newlib-spu, ${shlibs:Depends}, ${misc:Depends}
-Provides: spu-gcc
-BUILT_USING`'dnl
-Description: SPU cross-compiler (preprocessor and C compiler)
- GNU Compiler Collection for the Cell Broadband Engine SPU (preprocessor
- and C compiler).
-
-Package: g++`'PV-spu
-Architecture: powerpc ppc64
-Section: devel
-Priority: PRI(optional)
-Depends: BASEDEP, gcc`'PV-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: spu-g++
-BUILT_USING`'dnl
-Description: SPU cross-compiler (C++ compiler)
- GNU Compiler Collection for the Cell Broadband Engine SPU (C++ compiler).
-
-Package: gfortran`'PV-spu
-Architecture: powerpc ppc64
-Section: devel
-Priority: PRI(optional)
-Depends: BASEDEP, gcc`'PV-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: spu-gfortran
-BUILT_USING`'dnl
-Description: SPU cross-compiler (Fortran compiler)
- GNU Compiler Collection for the Cell Broadband Engine SPU (Fortran compiler).
-
-')`'dnl native
')`'dnl cdev
ifenabled(`cdev',`
diff --git a/debian/g++-BV-spu.overrides b/debian/g++-BV-spu.overrides
deleted file mode 100644
index ae54d18..0000000
--- a/debian/g++-BV-spu.overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-g++-@BV@-spu binary: non-standard-dir-in-usr usr/spu/
-g++-@BV@-spu binary: file-in-unusual-dir
diff --git a/debian/gcc-BV-spu.overrides b/debian/gcc-BV-spu.overrides
deleted file mode 100644
index 7db6cac..0000000
--- a/debian/gcc-BV-spu.overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc-@BV@-spu binary: non-standard-dir-in-usr usr/spu/
-gcc-@BV@-spu binary: file-in-unusual-dir
diff --git a/debian/gfortran-BV-spu.overrides b/debian/gfortran-BV-spu.overrides
deleted file mode 100644
index 0acb4c0..0000000
--- a/debian/gfortran-BV-spu.overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-gfortran-@BV@-spu binary: non-standard-dir-in-usr usr/spu/
-gfortran-@BV@-spu binary: file-in-unusual-dir
diff --git a/debian/rules b/debian/rules
index 93204a2..1636c6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,6 @@ $(configure_hppa64_stamp): $(build_stamp)
$(MAKE) -f debian/rules2 $@
$(configure_neon_stamp): $(build_stamp)
$(MAKE) -f debian/rules2 $@
-$(configure_spu_stamp): $(build_stamp)
- $(MAKE) -f debian/rules2 $@
pre-build:
#ifneq (,$(filter $(distrelease),squeeze sid))
@@ -58,8 +56,6 @@ $(build_hppa64_stamp): $(configure_hppa64_stamp)
$(MAKE) -f debian/rules2 $@
$(build_neon_stamp): $(configure_neon_stamp)
$(MAKE) -f debian/rules2 $@
-$(build_spu_stamp): $(configure_spu_stamp)
- $(MAKE) -f debian/rules2 $@
check: $(check_stamp)
$(check_stamp): $(build_stamp)
@@ -90,8 +86,6 @@ $(install_hppa64_stamp): $(build_hppa64_stamp)
$(MAKE) -f debian/rules2 $@
$(install_neon_stamp): $(build_neon_stamp)
$(MAKE) -f debian/rules2 $@
-$(install_spu_stamp): $(build_spu_stamp)
- $(MAKE) -f debian/rules2 $@
html-docs doxygen-docs update-doxygen-docs update-ada-files xxx:
$(MAKE) -f debian/rules2 $@
diff --git a/debian/rules.conf b/debian/rules.conf
index 6a9c8f4..bb9e76c 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -416,9 +416,6 @@ ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
JAVA_BUILD_INDEP :=, $(JAVA_BUILD_INDEP)
endif
-SPU_BUILD_DEP := binutils-spu (>= $(BINUTILSV)) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], gcc-$(BASE_VERSION)-base [powerpc ppc64],
-SPU_BUILD_DEP := binutils-spu (>= $(BINUTILSV)) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64],
-
# FIXME: needs zlib?
GO_BUILD_DEP := g++-4.6,
GO_BUILD_DEP := netbase,
@@ -443,14 +440,11 @@ else ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
JAVA_BUILD_DEP :=
JAVA_BUILD_INDEP :=
GDC_BUILD_DEP :=
- # gnat on spu should work ...
- SPU_BUILD_DEP :=
GO_BUILD_DEP :=
else ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION))
# Special source package just for gcj.
GNAT_BUILD_DEP :=
GDC_BUILD_DEP :=
- SPU_BUILD_DEP :=
GO_BUILD_DEP :=
else ifeq ($(PKGSOURCE),gdc-$(BASE_VERSION))
# Special source package just for gdc.
@@ -458,7 +452,6 @@ else ifeq ($(PKGSOURCE),gdc-$(BASE_VERSION))
JAVA_BUILD_DEP :=
JAVA_BUILD_INDEP :=
GDC_BUILD_DEP := $(SOURCE_BUILD_DEP)
- SPU_BUILD_DEP :=
GO_BUILD_DEP :=
else ifeq ($(PKGSOURCE),gccgo-$(BASE_VERSION))
# Special source package just for gccgo.
@@ -466,7 +459,6 @@ else ifeq ($(PKGSOURCE),gccgo-$(BASE_VERSION))
JAVA_BUILD_DEP :=
JAVA_BUILD_INDEP :=
GDC_BUILD_DEP := $(SOURCE_BUILD_DEP)
- SPU_BUILD_DEP :=
endif
else
@@ -484,9 +476,6 @@ endif
endif
JAVA_BUILD_INDEP :=
GNAT_BUILD_DEP :=
- ifeq (,$(findstring spu,$(DEB_TARGET_GNU_CPU)))
- SPU_BUILD_DEP :=
- endif
endif # cross compiler
# The numeric part of the gcc version number (x.yy.zz)
@@ -555,7 +544,6 @@ ctrl_flags += \
-DJAVA_BUILD_INDEP="$(JAVA_BUILD_INDEP)" \
-DLIBSTDCXX_BUILD_INDEP="$(LIBSTDCXX_BUILD_INDEP)" \
-DGDC_BUILD_DEP="$(GDC_BUILD_DEP)" \
- -DSPU_BUILD_DEP="$(SPU_BUILD_DEP)" \
-DBINUTILS_BUILD_DEP="$(BINUTILS_BUILD_DEP)" \
-DLIBC_BUILD_DEP="$(LIBC_BUILD_DEP)" \
-DCHECK_BUILD_DEP="$(CHECK_BUILD_DEP)" \
@@ -1026,9 +1014,6 @@ endif
ifeq ($(DEB_HOST_ARCH),hppa)
echo 'dep:prctl=prctl' >> debian/substvars.local.tmp
endif
-ifneq (,$(filter $(DEB_TARGET_ARCH), powerpc ppc64))
- echo 'base:Replaces=gcc-$(BASE_VERSION)-spu (<< 4.4.0-1)' >> debian/substvars.local.tmp
-endif
ifeq ($(distribution)-$(DEB_HOST_ARCH),Debian-amd64)
echo 'confl:lib32=libc6-i386 (<< 2.9-22)' >> debian/substvars.local.tmp
endif
diff --git a/debian/rules.d/binary-base.mk b/debian/rules.d/binary-base.mk
index fb539e7..391cf6b 100644
--- a/debian/rules.d/binary-base.mk
+++ b/debian/rules.d/binary-base.mk
@@ -33,13 +33,6 @@ ifneq ($(gcc_lib_dir),$(gcc_lexec_dir))
done
endif
-ifeq ($(with_spu),yes)
- mkdir -p $(d_base)/$(gcc_spu_lexec_dir)
- mkdir -p $(d_base)/$(gcc_spu_lib_dir)
- ln -sf $(BASE_VERSION) $(d_base)/$(spulibexecdir)/$(gcc_spu_subdir_name)/spu/$(GCC_VERSION)
- ln -sf $(BASE_VERSION) $(d_base)/usr/spu/lib/$(gcc_spu_subdir_name)/spu/$(GCC_VERSION)
-endif
-
dh_installdocs -p$(p_base) debian/README.Debian.$(DEB_TARGET_ARCH)
rm -f $(d_base)/usr/share/doc/$(p_base)/README.Debian
dh_installchangelogs -p$(p_base)
diff --git a/debian/rules.d/binary-snapshot.mk b/debian/rules.d/binary-snapshot.mk
index 6681157..29527c6 100644
--- a/debian/rules.d/binary-snapshot.mk
+++ b/debian/rules.d/binary-snapshot.mk
@@ -17,10 +17,6 @@ dirs_snap = \
$(docdir)/$(p_snap) \
usr/lib
-ifeq ($(with_spu),yes)
- snapshot_depends = binutils-spu
- snapshot_recommends = newlib-spu
-endif
ifeq ($(with_hppa64),yes)
snapshot_depends = binutils-hppa64
endif
@@ -155,11 +151,6 @@ ifeq ($(with_hppa64),yes)
/$(PF)/libexec/gcc/hppa64-linux-gnu/$(GCC_VERSION)/ld
endif
-# don't do this; would create a b-d on gcc-snapshot
-#ifeq ($(with_spu),yes)
-# dh_link -p $(p_snap) /usr/spu /$(PF)/spu
-#endif
-
ifeq ($(with_check),yes)
dh_installdocs -p$(p_snap) test-summary
ifeq ($(with_pascal),yes)
diff --git a/debian/rules.d/binary-spu.mk b/debian/rules.d/binary-spu.mk
deleted file mode 100644
index c155789..0000000
--- a/debian/rules.d/binary-spu.mk
+++ /dev/null
@@ -1,164 +0,0 @@
-arch_binaries := $(arch_binaries) spu spu-cxx spu-fortran
-
-p_spugcc = gcc$(pkg_ver)-spu
-p_spucxx = g++$(pkg_ver)-spu
-p_spuf95 = gfortran$(pkg_ver)-spu
-
-d_spugcc = debian/$(p_spugcc)
-d_spucxx = debian/$(p_spucxx)
-d_spuf95 = debian/$(p_spuf95)
-
-dirs_spugcc = \
- $(PF)/bin \
- $(gcc_spu_lexec_dir) \
- $(gcc_spu_lib_dir) \
-
-files_spugcc = \
- $(PF)/bin/spu-{cpp,gcc}$(pkg_ver) \
- $(PF)/bin/spu-{gcc-ar,gcc-ranlib,gcc-nm}$(pkg_ver) \
- $(gcc_spu_lexec_dir)/{cc1,collect2,lto1,lto-wrapper} \
- $(gcc_spu_lexec_dir)/liblto_plugin.so{,.0,.0.0.0} \
- $(gcc_spu_lib_dir)/{include,include-fixed} \
- $(gcc_spu_lib_dir)/{libgcc.a,libgcov.a,crtbegin.o,crtend.o} \
-
-ifeq ($(with_spucache),yes)
- files_spugcc += \
- $(gcc_spu_lib_dir)/libgcc_cache*.a
- ifeq ($(with_spumea64),yes)
- files_spugcc += \
- $(gcc_spu_lib_dir)/mea64/libgcc_cache*.a
- endif
-endif
-ifeq ($(with_spumea64),yes)
- files_spugcc += \
- $(gcc_spu_lib_dir)/mea64/{libgcc.a,libgcov.a,crtbegin.o,crtend.o}
-endif
-
-ifneq ($(GFDL_INVARIANT_FREE),yes)
- files_spugcc += \
- $(PF)/share/man/man1/spu-{cpp,gcc}$(pkg_ver).1
-endif
-
-dirs_spucxx = \
- $(PF)/bin \
- $(gcc_spu_lexec_dir) \
- $(gcc_spu_lib_dir) \
-
-files_spucxx = \
- $(PF)/bin/spu-g++$(pkg_ver) \
- $(gcc_spu_lexec_dir)/cc1plus \
- $(PF)/spu/include/c++ \
- $(gcc_spu_lib_dir)/lib{sup,std}c++.a
-
-ifeq ($(with_spumea64),yes)
- files_spucxx += \
- $(gcc_spu_lib_dir)/mea64/lib{sup,std}c++.a
-endif
-
-ifneq ($(GFDL_INVARIANT_FREE),yes)
- files_spucxx += \
- $(PF)/share/man/man1/spu-g++$(pkg_ver).1
-endif
-
-dirs_spuf95 = \
- $(PF)/bin \
- $(gcc_spu_lexec_dir) \
- $(gcc_spu_lib_dir) \
-
-files_spuf95 = \
- $(PF)/bin/spu-gfortran$(pkg_ver) \
- $(gcc_spu_lexec_dir)/f951 \
- $(gcc_spu_lib_dir)/finclude \
- $(gcc_spu_lib_dir)/libcaf_single.a \
- $(gcc_spu_lib_dir)/libgfortran.spec \
- $(gcc_spu_lib_dir)/libgfortran{,begin}.a
-
-ifeq ($(with_spumea64),yes)
- files_spuf95 += \
- $(gcc_spu_lib_dir)/mea64/libcaf_single.a \
- $(gcc_spu_lib_dir)/mea64/libgfortranbegin.a \
- $(gcc_spu_lib_dir)/mea64/libgfortran{,begin}.a
-endif
-
-ifneq ($(GFDL_INVARIANT_FREE),yes)
- files_spuf95 += \
- $(PF)/share/man/man1/spu-gfortran$(pkg_ver).1
-endif
-
-# ----------------------------------------------------------------------
-$(binary_stamp)-spu: $(install_spu_stamp)
- dh_testdir
- dh_testroot
-
- mv $(install_spu_stamp) $(install_spu_stamp)-tmp
-
- dh_installdirs -p$(p_spugcc) $(dirs_spugcc)
- DH_COMPAT=2 dh_movefiles --sourcedir=$(d_spu) -p$(p_spugcc) $(files_spugcc)
-
- debian/dh_doclink -p$(p_spugcc) $(p_xbase)
- debian/dh_rmemptydirs -p$(p_spugcc)
-
- -dh_strip -p$(p_spugcc) -X.o -Xlibgcc.a -Xlibgcov.a
- dh_compress -p$(p_spugcc)
- dh_fixperms -p$(p_spugcc)
- dh_shlibdeps -p$(p_spugcc)
- dh_gencontrol -p$(p_spugcc) -- -v$(DEB_VERSION) $(common_substvars)
- dh_installdeb -p$(p_spugcc)
- dh_md5sums -p$(p_spugcc)
- dh_builddeb -p$(p_spugcc)
-
- trap '' 1 2 3 15; touch $@; mv $(install_spu_stamp)-tmp $(install_spu_stamp)
-
-$(binary_stamp)-spu-cxx: $(install_spu_stamp)
- dh_testdir
- dh_testroot
-
- mv $(install_spu_stamp) $(install_spu_stamp)-tmp
-
- dh_installdirs -p$(p_spucxx) $(dirs_spucxx)
- DH_COMPAT=2 dh_movefiles --sourcedir=$(d_spu) -p$(p_spucxx) $(files_spucxx)
-
- ln -sf $(BASE_VERSION) $(d_spucxx)/usr/spu/include/c++/$(GCC_VERSION)
-
- debian/dh_doclink -p$(p_spucxx) $(p_xbase)
- debian/dh_rmemptydirs -p$(p_spucxx)
-
- -dh_strip -p$(p_spucxx)
- dh_compress -p$(p_spucxx)
- dh_fixperms -p$(p_spucxx)
- dh_shlibdeps -p$(p_spucxx)
- dh_gencontrol -p$(p_spucxx) -- -v$(DEB_VERSION) $(common_substvars)
- dh_installdeb -p$(p_spucxx)
- dh_md5sums -p$(p_spucxx)
- dh_builddeb -p$(p_spucxx)
-
- trap '' 1 2 3 15; touch $@; mv $(install_spu_stamp)-tmp $(install_spu_stamp)
-
-$(binary_stamp)-spu-fortran: $(install_spu_stamp)
- dh_testdir
- dh_testroot
-
- mv $(install_spu_stamp) $(install_spu_stamp)-tmp
-
- dh_installdirs -p$(p_spuf95) $(dirs_spuf95)
- mv $(d_spu)/$(PF)/spu/lib/libgfortran.spec $(d_spu)/$(gcc_spu_lib_dir)/
-
- DH_COMPAT=2 dh_movefiles --sourcedir=$(d_spu) -p$(p_spuf95) $(files_spuf95)
-
- debian/dh_doclink -p$(p_spuf95) $(p_xbase)
- debian/dh_rmemptydirs -p$(p_spuf95)
-
- -dh_strip -p$(p_spuf95)
- dh_compress -p$(p_spuf95)
- dh_fixperms -p$(p_spuf95)
- dh_shlibdeps -p$(p_spuf95)
- dh_gencontrol -p$(p_spuf95) -- -v$(DEB_VERSION) $(common_substvars)
- dh_installdeb -p$(p_spuf95)
- dh_md5sums -p$(p_spuf95)
- dh_builddeb -p$(p_spuf95)
-
- @echo "Listing installed files not included in any package:"
- -find $(d_spu) ! -type d
-
- trap '' 1 2 3 15; touch $@; mv $(install_spu_stamp)-tmp $(install_spu_stamp)
- touch $@
diff --git a/debian/rules.defs b/debian/rules.defs
index 8449e84..1bfdc7a 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -19,8 +19,8 @@ endif
on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd ] && echo yes)
-# creates {srcdir,builddir}_{hppa64,neon,spu}
-$(foreach x,srcdir builddir,$(foreach target,hppa64 spu neon,$(eval \
+# creates {srcdir,builddir}_{hppa64,neon}
+$(foreach x,srcdir builddir,$(foreach target,hppa64 neon,$(eval \
$(x)_$(target) := $($(x))-$(target))))
# for architecture dependent variables and changelog vars
@@ -1118,23 +1118,6 @@ else
endif
with_hppa64 := $(call envfilt, hppa64, , , $(with_hppa64))
- # spu build -------------------
- spu_no_snap := no
- ifneq (,$(findstring $(DEB_TARGET_ARCH),powerpc ppc64))
- ifneq ($(DEB_CROSS),yes)
- with_spu := yes
- endif
- endif
- ifeq ($(spu_no_snap)-$(trunk_build),yes-yes)
- with_spu := disabled for snapshot build
- endif
- with_spu := $(call envfilt, spu, , , $(with_spu))
-
- ifeq ($(with_spu),yes)
- with_spucache := yes
- with_spumea64 := yes
- endif
-
# neon build -------------------
# FIXME: build as a cross compiler to build on armv4 as well
ifneq (,$(findstring gcc-4, $(PKGSOURCE)))
@@ -1559,7 +1542,6 @@ ecj_jar := $(firstword $(wildcard ecj.jar /usr/share/java/eclipse-ecj.jar /usr/s
unpack_stamp := $(stampdir)/01-unpack-stamp
pre_patch_stamp := $(stampdir)/02-pre-patch-stamp
patch_stamp := $(stampdir)/02-patch-stamp
-src_spu_stamp := $(stampdir)/02-src-spu-stamp
control_stamp := $(stampdir)/03-control-stamp
configure_stamp := $(stampdir)/04-configure-stamp
build_stamp := $(stampdir)/05-build-stamp
@@ -1586,10 +1568,6 @@ configure_neon_stamp := $(stampdir)/04-configure-neon-stamp
build_neon_stamp := $(stampdir)/05-build-neon-stamp
install_neon_stamp := $(stampdir)/07-install-neon-stamp
-configure_spu_stamp := $(stampdir)/04-configure-spu-stamp
-build_spu_stamp := $(stampdir)/05-build-spu-stamp
-install_spu_stamp := $(stampdir)/07-install-spu-stamp
-
control_dependencies := $(patch_stamp)
ifeq ($(single_package),yes)
@@ -1634,14 +1612,6 @@ ifeq ($(with_hppa64),yes)
endif
endif
-ifeq ($(with_spu),yes)
- control_dependencies += $(src_spu_stamp)
- build_dependencies += $(build_spu_stamp)
- ifneq ($(trunk_build),yes)
- install_dependencies += $(install_spu_stamp)
- endif
-endif
-
build_dependencies += $(check_dependencies)
stamp-dir:
diff --git a/debian/rules.patch b/debian/rules.patch
index 1e99720..fa1d5fb 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -200,14 +200,11 @@ ifeq ($(DEB_TARGET_ARCH),ppc64)
endif
endif
-spu_patches = cross-install-location
-
#debian_patches += link-libs
# all patches below this line are applied for gcc-snapshot builds as well
ifeq ($(single_package),yes)
- spu_patches =
debian_patches =
endif
@@ -232,7 +229,6 @@ ifeq ($(DEB_CROSS),yes)
debian_patches += cross-ma-install-location
else
debian_patches += cross-install-location
- spu_patches := $(filter-out cross-install-location,$(spu_patches))
endif
endif
@@ -372,28 +368,6 @@ unpatch:
rm -f $$(echo $$f | sed -r 's/\.(ac|am|in)$$//'); \
done
-$(src_spu_stamp): $(patch_stamp)
- rm -rf src-spu
-ifeq (,$(strip $(hardening_patches)$(spu_patches)))
- ln -s src src-spu
-else
- cp -a src src-spu
-endif
- set -e; \
- for p in $(hardening_patches); do \
- list="$$p $$list"; \
- done; \
- for p in $$list; do \
- echo "Revert for spu build: $$p"; \
- patch -d src-spu -p2 -R < debian/patches/$$p.diff; \
- done
- set -e; \
- for p in $(spu_patches); do \
- echo "Apply for spu build: $$p"; \
- patch -d src-spu -p2 < debian/patches/$$p.diff; \
- done
- touch $@
-
update-patches: $(series_stamp)
export QUILT_PATCHES=$(patchdir); \
export QUILT_REFRESH_ARGS="--no-timestamps --no-index -pab"; \
diff --git a/debian/rules2 b/debian/rules2
index 864d302..45281f8 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -700,7 +700,6 @@ else
endif
configured_libdir = lib
-spulibexecdir = $(PF)/lib
hppa64libexecdir= $(PF)/lib
# /usr/libexec doesn't follow the FHS
@@ -716,9 +715,7 @@ buildlibdir = $(builddir)/$(TARGET_ALIAS)
# install cross compilers in /usr/lib/gcc-cross, native ones in /usr/lib/gcc
gcc_subdir_name = gcc
-gcc_spu_subdir_name = gcc
ifneq ($(single_package),yes)
- gcc_spu_subdir_name = gcc-cross
ifeq ($(DEB_CROSS),yes)
ifneq ($(with_deps_on_target_arch_pkgs),yes)
gcc_subdir_name = gcc-cross
@@ -728,8 +725,6 @@ endif
gcc_lib_dir = $(PF)/$(configured_libdir)/$(gcc_subdir_name)/$(TARGET_ALIAS)/$(versiondir)
gcc_lexec_dir = $(libexecdir)/$(gcc_subdir_name)/$(TARGET_ALIAS)/$(versiondir)
-gcc_spu_lib_dir = $(PF)/spu/lib/$(gcc_spu_subdir_name)/spu/$(versiondir)
-gcc_spu_lexec_dir = $(spulibexecdir)/$(gcc_spu_subdir_name)/spu/$(versiondir)
lib32 = $(PF)/lib32
lib64 = lib64
@@ -1190,65 +1185,6 @@ $(build_neon_stamp): $(configure_neon_stamp)
$(LDFLAGS_TO_PASS)
touch $(build_neon_stamp)
-spu_configure_args = \
- --enable-languages=c,c++,fortran \
- --prefix=/$(PF) \
- --libexecdir=/$(spulibexecdir) \
- --disable-shared \
- --disable-nls \
- --disable-threads \
- --enable-checking=release \
- --disable-libssp \
- --with-system-zlib \
- --with-newlib \
- --enable-plugin \
- --program-prefix=spu- \
- --with-as=/usr/bin/spu-as \
- --with-ar=/usr/bin/spu-ar \
- --with-ld=/usr/bin/spu-ld
-
-ifeq ($(versioned_packages),yes)
- spu_configure_args += --program-suffix=-$(BASE_VERSION)
-endif
-
-# FIXME: --with-sysroot=/usr/spu breaks libgfortran build
-#ifeq ($(single_package),yes)
-# spu_configure_args += \
-# --with-sysroot=/usr/spu
-#else
- spu_configure_args += \
- --includedir=/usr/spu/include \
- --libdir=/usr/spu/lib
-#endif
-
-spu_configure_args += \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --target=spu
-
-$(configure_spu_stamp): $(src_spu_stamp) $(build_stamp)
- dh_testdir
- rm -f $(configure_spu_stamp) $(build_spu_stamp)
- rm -rf $(builddir_spu)
- mkdir $(builddir_spu)
- : # configure
- cd $(builddir_spu) && \
- $(SET_PATH) \
- $(SET_SHELL) \
- CC="$(builddir)/gcc/xgcc -B$(builddir)/gcc/" \
- ../src-spu/configure $(spu_configure_args)
- touch $(configure_spu_stamp)
-
-$(build_spu_stamp): $(configure_spu_stamp)
- $(SET_PATH) \
- $(SET_SHELL) \
- $(SET_LOCPATH) \
- $(MAKE) -C $(builddir_spu) $(NJOBS) \
- CC="$(builddir)/gcc/xgcc -B$(builddir)/gcc/" \
- $(CFLAGS_TO_PASS) \
- $(LDFLAGS_TO_PASS)
- touch $(build_spu_stamp)
-
MANUALS = \
$(srcdir)/gcc/doc/cpp.texi \
@@ -1673,7 +1609,6 @@ d_doc = debian/$(p_doc)
d_lgcc = debian/$(p_lgcc)
d_hppa64= debian/$(p_hppa64)
-d_spu = debian/tmp-spu
d_neon = debian/tmp-neon
common_substvars = \
@@ -1821,9 +1756,6 @@ ifeq ($(with_neon),yes)
include debian/rules.d/binary-neon.mk
endif
-ifeq ($(with_spu),yes)
- include debian/rules.d/binary-spu.mk
-endif
endif
endif # ($(single_package),yes)
@@ -1884,59 +1816,6 @@ ifeq ($(with_hppa64),yes)
done
endif
-ifeq ($(with_spu),yes)
- : # Install spu
- $(SET_PATH) \
- $(MAKE) -C $(builddir_spu) \
- CC="$(CC)" \
- $(CFLAGS_TO_PASS) \
- $(LDFLAGS_TO_PASS) \
- DESTDIR=$(PWD)/$(d) \
- install
-
- ls -l $(d)/$(PF)/bin
- if [ ! -x $(d)/$(PF)/bin/spu-gcc ]; then \
- mv $(d)/$(PF)/bin/spu-gcc-4* $(d)/$(PF)/bin/spu-gcc; \
- else \
- rm -f $(d)/$(PF)/bin/spu-gcc-4*; \
- fi
- if [ ! -x $(d)/$(PF)/bin/spu-g++ ]; then \
- mv $(d)/$(PF)/bin/spu-g++-4* $(d)/$(PF)/bin/spu-g++; \
- else \
- rm -f $(d)/$(PF)/bin/spu-g++-4*; \
- fi
-
-ifneq (,$(findstring fortran, $(spu_configure_args)))
- if [ ! -x $(d)/$(PF)/bin/spu-gfortran ]; then \
- mv $(d)/$(PF)/bin/spu-gfortran-4* $(d)/$(PF)/bin/spu-gfortran; \
- else \
- rm -f $(d)/$(PF)/bin/spu-gfortran-4*; \
- fi
-endif
- rm -f $(d)/$(PF)/bin/spu-c++*
-
- : # remove files not needed from the spu build
- rm -rf $(d)/$(PF)/info $(d)/$(PF)/share/info
- rm -rf $(d)/$(PF)/man $(d)/$(PF)/share/man
- rm -rf $(d)/$(PF)/$(libdir)/gcc/spu/$(GCC_VERSION)/plugin
- rm -f $(d)/$(PF)/$(libdir)/libiberty.a
- rm -f $(d)/$(PF)/bin/*{gcov,gccbug,gcc}
-
-# FIXME
-# rm -rf $(d)/$(PF)/spu/include
-# rm -rf $(d)/$(PF)/spu/lib
- -set -e; \
- cd $(d)/$(PF)/$(libdir)/gcc/spu/$(versiondir)/include-fixed; \
- for i in *; do \
- case "$$i" in \
- README|features.h|syslimits.h|limits.h) ;; \
- linux|$(TARGET_ALIAS)) ;; \
- $(subst $(DEB_TARGET_GNU_CPU),$(biarch_cpu),$(TARGET_ALIAS))) ;; \
- *) echo "remove include-fixed/$$i"; rm -rf $$i; \
- esac; \
- done
-endif
-
: # Work around PR lto/41569
ln -sf gcc $(builddir)/prev-gcc
@@ -2012,16 +1891,10 @@ $(install_stamp): $(build_stamp)
if [ -f $(binary_stamp)-hppa64 ]; then \
mv $(binary_stamp)-hppa64 saved-stamp-hppa64; \
fi
- if [ -f $(binary_stamp)-spu ]; then \
- mv $(binary_stamp)-spu saved-stamp-spu; \
- fi
rm -f $(binary_stamp)*
if [ -f saved-stamp-hppa64 ]; then \
mv saved-stamp-hppa64 $(binary_stamp)-hppa64; \
fi
- if [ -f saved-stamp-spu ]; then \
- mv saved-stamp-spu $(binary_stamp)-spu; \
- fi
: # Install directories
rm -rf $(d)
@@ -2227,49 +2100,6 @@ $(install_neon_stamp): $(build_neon_stamp)
install
touch $(install_neon_stamp)
-$(install_spu_stamp): $(build_spu_stamp)
- dh_testdir
- dh_testroot
- rm -rf $(d_spu)
- mkdir -p $(d_spu)/$(PF)
-
- $(SET_PATH) \
- $(MAKE) -C $(builddir_spu) \
- CC="$(CC)" \
- $(CFLAGS_TO_PASS) \
- $(LDFLAGS_TO_PASS) \
- DESTDIR=$(PWD)/$(d_spu) \
- install
-ifneq (,$(findstring c++, $(spu_configure_args)))
- mv $(d_spu)/usr/spu/lib/lib{std,sup}c++.a \
- $(d_spu)/$(gcc_spu_lib_dir)/.
- ifeq ($(with_spumea64),yes)
- mv $(d_spu)/usr/spu/lib/mea64/lib{std,sup}c++.a \
- $(d_spu)/$(gcc_spu_lib_dir)/mea64/.
- endif
-endif
-ifneq (,$(findstring fortran, $(spu_configure_args)))
- mv $(d_spu)/usr/spu/lib/libgfortran.a \
- $(d_spu)/$(gcc_spu_lib_dir)/.
- ifeq ($(with_spumea64),yes)
- mv $(d_spu)/usr/spu/lib/mea64/libgfortran.a \
- $(d_spu)/$(gcc_spu_lib_dir)/mea64/.
- endif
-endif
-
-ifneq ($(single_package),yes)
- : # remove files not needed
- rm -rf $(d_spu)/$(PF)/info
-# rm -rf $(d_spu)/$(PF)/man
- rm -f $(d_spu)/$(PF)/$(libdir)/libiberty.a
- rm -f $(d_spu)/$(PF)/bin/*{gcov,gccbug,gcc}
-
-# rm -rf $(d_spu)/$(PF)/spu/include
-# rm -rf $(d_spu)/$(PF)/spu/lib
-endif
-
- touch $(install_spu_stamp)
-
# ----------------------------------------------------------------------
# Build architecture-dependent files here.
#binary-arch: build install $(foreach i,$(arch_binaries),$(binary_stamp)-$(i))
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 19:10:19 +0000