aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/rs6000/sysv4.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 009a6eb..38a86ab 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-05 Segher Boessenkool <segher@kernel.crashing.org>
+
+ * config/rs6000/sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Correct error
+ message for incompatible -msdata=* and -mcall-* options.
+
2017-10-05 Jan Hubicka <hubicka@ucw.cz>
* i386.c (ia32_multipass_dfa_lookahead): Default to issue rate
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index e381ce9..37bd63f 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -160,7 +160,7 @@ do { \
{ \
rs6000_sdata = SDATA_NONE; \
error ("%<%s=%s%> and %<%s-%s%> are incompatible", \
- "-msdata", "-mcall", rs6000_sdata_name, rs6000_abi_name); \
+ "-msdata", rs6000_sdata_name, "-mcall", rs6000_abi_name); \
} \
\
targetm.have_srodata_section = rs6000_sdata == SDATA_EABI; \