aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Wilson <wilson@redhat.com>2000-11-16 21:35:16 +0000
committerJim Wilson <wilson@gcc.gnu.org>2000-11-16 13:35:16 -0800
commit35d9f39deafd46d5fcac80fb71691334c6d788f9 (patch)
tree2d7cd9d60ce44aabe91f6cd782a093b35ce6323b
parent3cd22508eba67ce9e23330ac5e4f052343685328 (diff)
downloadgcc-35d9f39deafd46d5fcac80fb71691334c6d788f9.zip
gcc-35d9f39deafd46d5fcac80fb71691334c6d788f9.tar.gz
gcc-35d9f39deafd46d5fcac80fb71691334c6d788f9.tar.bz2
Fix ia64 mask bit conflict from parallel development.
* config/ia64/ia64.h (MASK_INLINE_DIV_LAT, MASK_INLINE_DIV_THR): Shift masks left by one to avoid conflict. From-SVN: r37507
-rw-r--r--gcc/ChangeLog3
-rw-r--r--gcc/config/ia64/ia64.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b735f44..1656d0e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
2000-11-16 Jim Wilson <wilson@redhat.com>
+ * config/ia64/ia64.h (MASK_INLINE_DIV_LAT, MASK_INLINE_DIV_THR):
+ Shift masks left by one to avoid conflict.
+
* config/ia64/ia64.c (ia64_encode_section_info): Disallow decls with
DECL_EXTERNAL set.
diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index 1f9250f..3bd6618 100644
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -65,9 +65,9 @@ extern int target_flags;
#define MASK_AUTO_PIC 0x00000400 /* generate automatically PIC */
-#define MASK_INLINE_DIV_LAT 0x00000400 /* inline div, min latency. */
+#define MASK_INLINE_DIV_LAT 0x00000800 /* inline div, min latency. */
-#define MASK_INLINE_DIV_THR 0x00000800 /* inline div, max throughput. */
+#define MASK_INLINE_DIV_THR 0x00001000 /* inline div, max throughput. */
#define MASK_DWARF2_ASM 0x40000000 /* test dwarf2 line info via gas. */