From 967245d1f63076dde846f0201a0fba05c334a3e6 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 4 May 2016 22:51:01 +0930 Subject: [PATCH] [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 --- gcc/ChangeLog | 1 + gcc/config/rs6000/sysv4.h | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f339b0ecb5a..a097aeef062 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,6 @@ 2016-05-04 Alan Modra + * 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 cbf909722da..af9fe1af7d0 100644 --- 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) -- 2.30.2