[RS6000] Simplify sysv4.h TARGET_TOC

We can use the TARGET_* defines here.  There isn't any reason to use
the underlying variable and masks.  Also, TARGET_RELOCATABLE implies
TARGET_MINIMAL_TOC, so there is no need to test TARGET_RELOCATABLE.

	* config/rs6000/sysv4.h (TARGET_TOC): Simplify.

From-SVN: r235875

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f339b0ecb5a4e179c5d59b7e0ad0ec1bb269754a..a097aeef062230c0f5c6a3b5e650f27e8d273910 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,6 @@
 2016-05-04  Alan Modra  <amodra@gmail.com>
 
+       * config/rs6000/sysv4.h (TARGET_TOC): Simplify.
        * config/rs6000/rs6000.c (rs6000_elf_output_toc_section_asm_op):
        Align .toc.
 

diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index cbf909722da467275064b1eaa5c8453dc2222039..af9fe1af7d02952b6b35896dd6e68dbc1d51d5fd 100644 (file)
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -40,10 +40,8 @@
 #undef ASM_DEFAULT_SPEC
 #define        ASM_DEFAULT_SPEC "-mppc"
 
-#define        TARGET_TOC              ((rs6000_isa_flags & OPTION_MASK_64BIT) \
-                                || ((rs6000_isa_flags                  \
-                                     & (OPTION_MASK_RELOCATABLE        \
-                                        | OPTION_MASK_MINIMAL_TOC))    \
+#define        TARGET_TOC              (TARGET_64BIT                           \
+                                || (TARGET_MINIMAL_TOC                 \
                                     && flag_pic > 1)                   \
                                 || DEFAULT_ABI != ABI_V4)