summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-05-22 07:36:59 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-05-22 07:36:59 +0000
commitfddaebdaf2c94ddab1ad87053740450388e070e7 (patch)
tree39313b02e663e658e797c923d3be29f24fd9d55b
parentf07d7ec99a10f02ce897d5a0b26e01cbcab4be52 (diff)
downloadgcc-48-fddaebdaf2c94ddab1ad87053740450388e070e7.tar.gz
* Drop the libstdc++-arm-wno-abi patch, not needed anymore in 4.8.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7399 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/libstdc++-arm-wno-abi.diff18
-rw-r--r--debian/rules.patch1
3 files changed, 1 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index 6719c29..303f23e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
gcc-4.8 (4.8.2-24) UNRELEASED; urgency=medium
* Build libitm on AArch64, patch taken from the trunk.
+ * Drop the libstdc++-arm-wno-abi patch, not needed anymore in 4.8.
-- Matthias Klose <doko@debian.org> Tue, 20 May 2014 00:27:51 +0200
diff --git a/debian/patches/libstdc++-arm-wno-abi.diff b/debian/patches/libstdc++-arm-wno-abi.diff
deleted file mode 100644
index c46c900..0000000
--- a/debian/patches/libstdc++-arm-wno-abi.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-# DP: Temporary work around:
-# DP: On arm-linux-gnueabi run the libstdc++v3 testsuite with -Wno-abi
-
-Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
-===================================================================
---- a/src/libstdc++-v3/testsuite/lib/libstdc++.exp
-+++ b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
-@@ -288,6 +288,10 @@
- }
- append cxxflags " "
- append cxxflags [getenv CXXFLAGS]
-+ # ARM C++ emits an ABI warning for varargs.
-+ if [istarget "arm*"] {
-+ append cxxflags " -Wno-abi"
-+ }
- v3track cxxflags 2
-
- # Always use MO files built by this test harness.
diff --git a/debian/rules.patch b/debian/rules.patch
index d76324b..340d3ec 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -273,7 +273,6 @@ debian_patches += gcc-ice-hack gcc-ice-apport
#debian_patches += gold-and-ld
debian_patches += libjava-fixed-symlinks
-debian_patches += libstdc++-arm-wno-abi
ifneq (,$(filter $(DEB_TARGET_ARCH), mips mipsel))
# timeouts on the buildd's, Debian