[rpms/gcc] rhel-f41-base: Clean up last change

[rpms/gcc] rhel-f41-base: Clean up last change

[Jakub Jelinek]

A new commit has been pushed.

Repo   : rpms/gcc
Branch : rhel-f41-base
Commit : 39f49505ef603d3fd32e4341e3835f22f6114bf6
Author : Jakub Jelinek <jakub@redhat.com>
Date   : 2014-02-20T15:06:38+01:00
Stats  : +19/-17 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/gcc/c/39f49505ef603d3fd32e4341e3835f22f6114bf6?branch=rhel-f41-base

Log:
Clean up last change

---
diff --git a/gcc.spec b/gcc.spec
index 93dcc23..b66efcc 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -198,7 +198,7 @@ Patch13: gcc48-pr56564.patch
 Patch14: gcc48-pr56493.patch
 Patch15: gcc48-color-auto.patch
 Patch16: gcc48-pr28865.patch
-Patch17: gcc48-aarch64-define-TRY_EMPTY_VM_SPACE.patch
+Patch17: gcc48-pr60010.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 Patch1001: fastjar-0.97-len1.patch
@@ -759,7 +759,7 @@ package or when debugging this package.
 %patch15 -p0 -b .color-auto~
 %endif
 %patch16 -p0 -b .pr28865~
-%patch17 -p1 -b .aarch64-pch~
+%patch17 -p0 -b .pr60010~
 
 %if 0%{?_enable_debug_packages}
 cat > split-debuginfo.sh <<\EOF
@@ -3028,7 +3028,7 @@ fi
 
 %changelog
 * Fri Jan 31 2014 Kyle McMartin <kyle@redhat.com> 4.8.2-14
-- aarch64: fix cc1plus segfault using pch (#1058991), PR pch/60010
+- fix pch on aarch64 (#1058991, PR pch/60010)
 
 * Tue Jan 21 2014 Jakub Jelinek <jakub@redhat.com> 4.8.2-13
 - when removing -Wall from CXXFLAGS, if -Werror=format-security

diff --git a/gcc48-aarch64-define-TRY_EMPTY_VM_SPACE.patch b/gcc48-aarch64-define-TRY_EMPTY_VM_SPACE.patch
deleted file mode 100644
index 4e54e05..0000000
--- a/gcc48-aarch64-define-TRY_EMPTY_VM_SPACE.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60010
-https://bugzilla.redhat.com/show_bug.cgi?id=1058991
-
---- a/gcc/config/host-linux.c
-+++ b/gcc/config/host-linux.c
-@@ -86,6 +86,8 @@
- # define TRY_EMPTY_VM_SPACE	0x60000000
- #elif defined(__mc68000__)
- # define TRY_EMPTY_VM_SPACE	0x40000000
-+#elif defined(__aarch64__)
-+# define TRY_EMPTY_VM_SPACE	0x1000000000
- #elif defined(__ARM_EABI__)
- # define TRY_EMPTY_VM_SPACE     0x60000000
- #elif defined(__mips__) && defined(__LP64__)

diff --git a/gcc48-pr60010.patch b/gcc48-pr60010.patch
new file mode 100644
index 0000000..0baa553
--- /dev/null
+++ b/gcc48-pr60010.patch
@@ -0,0 +1,16 @@
+2014-02-14  Kyle McMartin  <kyle@redhat.com>
+
+	PR pch/60010
+	* config/host-linux.c (TRY_EMPTY_VM_SPACE): Define for AArch64.
+
+--- gcc/config/host-linux.c	(revision 207784)
++++ gcc/config/host-linux.c	(revision 207785)
+@@ -86,6 +86,8 @@
+ # define TRY_EMPTY_VM_SPACE	0x60000000
+ #elif defined(__mc68000__)
+ # define TRY_EMPTY_VM_SPACE	0x40000000
++#elif defined(__aarch64__)
++# define TRY_EMPTY_VM_SPACE	0x1000000000
+ #elif defined(__ARM_EABI__)
+ # define TRY_EMPTY_VM_SPACE     0x60000000
+ #elif defined(__mips__) && defined(__LP64__)