gnu: make-propeller-gcc-4: Build with GCC 5.

* gnu/packages/patches/gcc-4.6-gnu-inline.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/embedded.scm (make-propeller-gcc-4)[source]: Remove patch.
[arguments]: Remove 'pre-x86-configure phase.
[native-inputs]: Replace gcc-4.9 with gcc-5.

Change-Id: Ifb4b00952edc9053e7496ffe33f8beacd34e11ca

3 files changed, 2 insertions, 68 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index 6696ee44ee8..59de6a1649f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1382,7 +1382,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gcc-libvtv-runpath.patch                 \
   %D%/packages/patches/gcc-strmov-store-file-names.patch        \
   %D%/packages/patches/gcc-4-compile-with-gcc-5.patch            \
-  %D%/packages/patches/gcc-4.6-gnu-inline.patch                 \
   %D%/packages/patches/gcc-4.9.3-mingw-gthr-default.patch       \
   %D%/packages/patches/gcc-5-hurd.patch                         \
   %D%/packages/patches/gcc-5.0-libvtv-runpath.patch             \
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index f5fa70c75df..3ec68e78d03 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1147,17 +1147,17 @@ with a layered architecture of JTAG interface and TAP support.")
                    (append
                     (origin-patches (package-source gcc-base))
                     (search-patches
-                     "gcc-4.6-gnu-inline.patch"
                      "gcc-cross-environment-variables.patch")))))
         (arguments
          (substitute-keyword-arguments (package-arguments xgcc)
            ((#:phases phases)
             #~(modify-phases #$phases
+                (delete 'pre-x86-configure)
                 (add-after 'unpack 'chdir
                   (lambda _ (chdir "gcc")))))))
         (native-inputs
          (modify-inputs (package-native-inputs xgcc)
-           (prepend gcc-4.9)))
+           (prepend gcc-5)))
         (home-page "https://github.com/parallaxinc/propgcc")
         (supported-systems (delete "aarch64-linux" %supported-systems))))))
 
diff --git a/gnu/packages/patches/gcc-4.6-gnu-inline.patch b/gnu/packages/patches/gcc-4.6-gnu-inline.patch
deleted file mode 100644
index 710d358a8b6..00000000000
--- a/gnu/packages/patches/gcc-4.6-gnu-inline.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-This patch was taken from https://gcc.gnu.org/ml/gcc-patches/2015-08/msg00375.html.
-It is used by propeller-gcc-4.
-
-Since the 3.0.3 release of gperf (made in May 2007), the generated func
-has had the gnu_inline attribute applied to it.  The gcc source however
-has not been updated to include that which has lead to a mismatch.
-
-In practice, this hasn't been an issue for two reasons:
-(1) Before gcc-5, the default standard was (gnu) C89, and gcc does not
-warn or throw an error in this mode.
-(2) Starting with gcc-4.8, the compiler driver used to build gcc was
-changed to C++, and g++ does not warn or throw an error in this mode.
-
-This error does show up though when using gcc-5 to build gcc-4.7 or
-older as then the default is (gnu) C11 and the C compiler driver is
-used.  That failure looks like:
-In file included from .../gcc-4.7.4/gcc/cp/except.c:990:0:
-cfns.gperf: At top level:
-cfns.gperf:101:1: error: 'gnu_inline' attribute present on 'libc_name_p'
-cfns.gperf:26:14: error: but not here
-
-Whether the compiler should always emit this error regardless of the
-active standard or compiler driver is debatable (I think it should be
-consistent -- either always do it or never do it).
-
-2015-08-06  Mike Frysinger  <vapier@gentoo.org>
-
-        * cfns.gperf [__GNUC__, __GNUC_STDC_INLINE__]: Apply the
-        __gnu_inline__ attribute.
-        * cfns.h: Regenerated.
----
- gcc/cp/cfns.gperf | 3 +++
- gcc/cp/cfns.h     | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
-index 68acd3d..953262f 100644
---- a/gcc/cp/cfns.gperf
-+++ b/gcc/cp/cfns.gperf
-@@ -22,6 +22,9 @@ __inline
- static unsigned int hash (const char *, unsigned int);
- #ifdef __GNUC__
- __inline
-+#ifdef __GNUC_STDC_INLINE__
-+__attribute__ ((__gnu_inline__))
-+#endif
- #endif
- const char * libc_name_p (const char *, unsigned int);
- %}
-diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
-index 1c6665d..6d00c0e 100644
---- a/gcc/cp/cfns.h
-+++ b/gcc/cp/cfns.h
-@@ -53,6 +53,9 @@ __inline
- static unsigned int hash (const char *, unsigned int);
- #ifdef __GNUC__
- __inline
-+#ifdef __GNUC_STDC_INLINE__
-+__attribute__ ((__gnu_inline__))
-+#endif
- #endif
- const char * libc_name_p (const char *, unsigned int);
- /* maximum key range = 391, duplicates = 0 */
--- 
-2.4.4