summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>2014-10-21 22:55:02 +0000
committerdanglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>2014-10-21 22:55:02 +0000
commit0468fd148b8ed549cbbc0f696b60be89e4b26574 (patch)
treea1fe3b46c16c26ebf4ee10cb1bf83fad4a9408dd
parent990ad9dab0f62ffa1c861598e6ef05f1aa9403d9 (diff)
downloadgcc-0468fd148b8ed549cbbc0f696b60be89e4b26574.tar.gz
* config.gcc: Remove MASK_JUMP_IN_DELAY from target_cpu_default2.
* config/pa/pa.h (TARGET_DEFAULT): Remove MASK_JUMP_IN_DELAY. * config/pa/pa.opt (mjump-in-delay): Ignore option. Update comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216530 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config.gcc2
-rw-r--r--gcc/config/pa/pa.h2
-rw-r--r--gcc/config/pa/pa.opt4
4 files changed, 10 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 803d8942281..a6e7ae11261 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-21 John David Anglin <danglin@gcc.gnu.org>
+
+ * config.gcc: Remove MASK_JUMP_IN_DELAY from target_cpu_default2.
+ * config/pa/pa.h (TARGET_DEFAULT): Remove MASK_JUMP_IN_DELAY.
+ * config/pa/pa.opt (mjump-in-delay): Ignore option. Update comment.
+
2014-10-21 Manuel López-Ibáñez <manu@gcc.gnu.org>
* doc/invoke.texi (pedantic-errors): Explain better.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 6bbbb26e3ef..5b6f7b2580d 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -4066,7 +4066,7 @@ case ${target} in
hppa*-*-*)
if test x$gas = xyes
then
- target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
+ target_cpu_default2="MASK_GAS"
fi
;;
diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index 9a1773f29e4..ebeb8199d24 100644
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -114,7 +114,7 @@ extern unsigned long total_code_bytes;
#define TARGET_HPUX_UNWIND_LIBRARY 0
#ifndef TARGET_DEFAULT
-#define TARGET_DEFAULT (MASK_GAS | MASK_JUMP_IN_DELAY)
+#define TARGET_DEFAULT MASK_GAS
#endif
#ifndef TARGET_CPU_DEFAULT
diff --git a/gcc/config/pa/pa.opt b/gcc/config/pa/pa.opt
index ebb7578244f..041d12946e8 100644
--- a/gcc/config/pa/pa.opt
+++ b/gcc/config/pa/pa.opt
@@ -62,8 +62,8 @@ Target Report Mask(GAS)
Assume code will be assembled by GAS
mjump-in-delay
-Target Report Mask(JUMP_IN_DELAY)
-Put jumps in call delay slots
+Target Ignore
+Does nothing. Preserved for backward compatibility.
;; Not used by gcc
mlinker-opt