From patchwork Sun Jun 24 13:42:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Bosscher X-Patchwork-Id: 166881 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id A4938B6F5A for ; Sun, 24 Jun 2012 23:43:37 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1341150218; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: MIME-Version:Received:From:Date:Message-ID:Subject:To:Cc: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=wg6mLYx j+O5UH2rmPer6CK5b7nE=; b=uOoE7uyRfjcZb1HrFS1DHBzygs7RTEnKFClHY5x I4whAvwcFOcfDjKLfdDTVVrmmcTA9FhonQuRKOsFVRlvpHIwarXaVC+7MKaROMr7 8msBB0RhxQFQeH1zEUsXecoIEoytF4C0ZhBKcIAa9/25HI/fk6vR+pBsnIb9sSBH JmLk= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:MIME-Version:Received:From:Date:Message-ID:Subject:To:Cc:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=KEnwmtcUlqyDw4UxR2Uce4fekj23Eh6ixianZmcZXxYe4qNgbgyy35/4LddjYr eO0PAsXZUPevDit5g/CFxVgTloYNwoDdqlN9KHb3/kdFGkC/DfLShzkn9ghUXnPo lCLkGTP6UhFP3PosqLBbdklZ5dGsZGNuGVm5ZD4M9IZww=; Received: (qmail 9775 invoked by alias); 24 Jun 2012 13:43:34 -0000 Received: (qmail 9767 invoked by uid 22791); 24 Jun 2012 13:43:32 -0000 X-SWARE-Spam-Status: No, hits=-4.1 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_DB X-Spam-Check-By: sourceware.org Received: from mail-lb0-f175.google.com (HELO mail-lb0-f175.google.com) (209.85.217.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 24 Jun 2012 13:43:19 +0000 Received: by lbol5 with SMTP id l5so5694513lbo.20 for ; Sun, 24 Jun 2012 06:43:17 -0700 (PDT) Received: by 10.152.131.68 with SMTP id ok4mr8544491lab.47.1340545397448; Sun, 24 Jun 2012 06:43:17 -0700 (PDT) MIME-Version: 1.0 Received: by 10.112.4.229 with HTTP; Sun, 24 Jun 2012 06:42:56 -0700 (PDT) From: Steven Bosscher Date: Sun, 24 Jun 2012 15:42:56 +0200 Message-ID: Subject: [patch] Remove and poison a few more old target macros To: GCC Patches Cc: Michael Eager , DJ Delorie X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Like the ones before: they are unused. Will commit as an obvious cleanup in a few days' time. Ciao! Steven * system.h (UNALIGNED_SHORT_ASM_OP, UNALIGNED_INT_ASM_OP, UNALIGNED_LONG_ASM_OP, UNALIGNED_DOUBLE_INT_ASM_OP): Poison. * vmsdbgout.c (UNALIGNED_SHORT_ASM_OP, UNALIGNED_INT_ASM_OP, UNALIGNED_LONG_ASM_OP, UNALIGNED_DOUBLE_INT_ASM_OP): Rename to VMS_UNALIGNED_SHORT_ASM_OP, VMS_UNALIGNED_INT_ASM_OP, VMS_UNALIGNED_LONG_ASM_OP, and VMS_UNALIGNED_DOUBLE_INT_ASM_OP. * config/microblaze/microblaze.h (UNALIGNED_SHORT_ASM_OP, UNALIGNED_INT_ASM_OP, UNALIGNED_DOUBLE_INT_ASM_OP): Do not define. * doc/tm.texi.in: Remove UNALIGNED_INT_ASM_OP reference from the documentation. * doc/tm.texi: Regenerate. * doc/cpp.texi: Make example for #error generic. * config/frv/frv.h: Fix example text to match tm.texi. Index: system.h =================================================================== --- system.h (revision 188917) +++ system.h (working copy) @@ -889,7 +889,8 @@ extern void fancy_abort (const char *, i PREFERRED_OUTPUT_RELOAD_CLASS SYSTEM_INCLUDE_DIR \ STANDARD_INCLUDE_DIR STANDARD_INCLUDE_COMPONENT \ LINK_ELIMINATE_DUPLICATE_LDIRECTORIES MIPS_DEBUGGING_INFO \ - IDENT_ASM_OP + IDENT_ASM_OP UNALIGNED_SHORT_ASM_OP UNALIGNED_INT_ASM_OP \ + UNALIGNED_LONG_ASM_OP UNALIGNED_DOUBLE_INT_ASM_OP /* Hooks that are no longer used. */ #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \ Index: vmsdbgout.c =================================================================== --- vmsdbgout.c (revision 188917) +++ vmsdbgout.c (working copy) @@ -206,28 +206,11 @@ const struct gcc_debug_hooks vmsdbg_debu }; /* Definitions of defaults for assembler-dependent names of various - pseudo-ops and section names. - Theses may be overridden in the tm.h file (if necessary) for a particular - assembler. */ -#ifdef UNALIGNED_SHORT_ASM_OP -#undef UNALIGNED_SHORT_ASM_OP -#endif -#define UNALIGNED_SHORT_ASM_OP ".word" - -#ifdef UNALIGNED_INT_ASM_OP -#undef UNALIGNED_INT_ASM_OP -#endif -#define UNALIGNED_INT_ASM_OP ".long" - -#ifdef UNALIGNED_LONG_ASM_OP -#undef UNALIGNED_LONG_ASM_OP -#endif -#define UNALIGNED_LONG_ASM_OP ".long" - -#ifdef UNALIGNED_DOUBLE_INT_ASM_OP -#undef UNALIGNED_DOUBLE_INT_ASM_OP -#endif -#define UNALIGNED_DOUBLE_INT_ASM_OP ".quad" + pseudo-ops and section names. */ +#define VMS_UNALIGNED_SHORT_ASM_OP ".word" +#define VMS_UNALIGNED_INT_ASM_OP ".long" +#define VMS_UNALIGNED_LONG_ASM_OP ".long" +#define VMS_UNALIGNED_DOUBLE_INT_ASM_OP ".quad" #define VMS_ASM_BYTE_OP ".byte" @@ -237,14 +220,14 @@ const struct gcc_debug_hooks vmsdbg_debu #ifndef UNALIGNED_PTR_ASM_OP #define UNALIGNED_PTR_ASM_OP \ - (PTR_SIZE == 8 ? UNALIGNED_DOUBLE_INT_ASM_OP : UNALIGNED_INT_ASM_OP) + (PTR_SIZE == 8 ? VMS_UNALIGNED_DOUBLE_INT_ASM_OP : VMS_UNALIGNED_INT_ASM_OP) #endif #ifndef UNALIGNED_OFFSET_ASM_OP #define UNALIGNED_OFFSET_ASM_OP(OFFSET) \ (NUMBYTES(OFFSET) == 4 \ - ? UNALIGNED_LONG_ASM_OP \ - : (NUMBYTES(OFFSET) == 2 ? UNALIGNED_SHORT_ASM_OP : VMS_ASM_BYTE_OP)) + ? VMS_UNALIGNED_LONG_ASM_OP \ + : (NUMBYTES(OFFSET) == 2 ? VMS_UNALIGNED_SHORT_ASM_OP : VMS_ASM_BYTE_OP)) #endif /* Definitions of defaults for formats and names of various special @@ -284,7 +267,7 @@ static char text_end_label[MAX_ARTIFICIA #define ASM_OUTPUT_DEBUG_DELTA2(FILE,LABEL1,LABEL2) \ do \ { \ - fprintf ((FILE), "\t%s\t", UNALIGNED_SHORT_ASM_OP); \ + fprintf ((FILE), "\t%s\t", VMS_UNALIGNED_SHORT_ASM_OP); \ assemble_name (FILE, LABEL1); \ fprintf (FILE, "-"); \ assemble_name (FILE, LABEL2); \ @@ -296,7 +279,7 @@ static char text_end_label[MAX_ARTIFICIA #define ASM_OUTPUT_DEBUG_DELTA4(FILE,LABEL1,LABEL2) \ do \ { \ - fprintf ((FILE), "\t%s\t", UNALIGNED_INT_ASM_OP); \ + fprintf ((FILE), "\t%s\t", VMS_UNALIGNED_INT_ASM_OP); \ assemble_name (FILE, LABEL1); \ fprintf (FILE, "-"); \ assemble_name (FILE, LABEL2); \ @@ -338,13 +321,14 @@ static char text_end_label[MAX_ARTIFICIA #ifndef ASM_OUTPUT_DEBUG_DATA2 #define ASM_OUTPUT_DEBUG_DATA2(FILE,VALUE) \ - fprintf ((FILE), "\t%s\t%#x", UNALIGNED_SHORT_ASM_OP, \ + fprintf ((FILE), "\t%s\t%#x", VMS_UNALIGNED_SHORT_ASM_OP, \ (unsigned short) VALUE) #endif #ifndef ASM_OUTPUT_DEBUG_DATA4 #define ASM_OUTPUT_DEBUG_DATA4(FILE,VALUE) \ - fprintf ((FILE), "\t%s\t%#lx", UNALIGNED_INT_ASM_OP, (unsigned long) VALUE) + fprintf ((FILE), "\t%s\t%#lx", VMS_UNALIGNED_INT_ASM_OP, \ + (unsigned long) VALUE) #endif #ifndef ASM_OUTPUT_DEBUG_DATA @@ -360,7 +344,7 @@ static char text_end_label[MAX_ARTIFICIA #ifndef ASM_OUTPUT_DEBUG_DATA8 #define ASM_OUTPUT_DEBUG_DATA8(FILE,VALUE) \ - fprintf ((FILE), "\t%s\t%#llx", UNALIGNED_DOUBLE_INT_ASM_OP, \ + fprintf ((FILE), "\t%s\t%#llx", VMS_UNALIGNED_DOUBLE_INT_ASM_OP, \ (unsigned long long) VALUE) #endif Index: config/microblaze/microblaze.h =================================================================== --- config/microblaze/microblaze.h (revision 188917) +++ config/microblaze/microblaze.h (working copy) @@ -738,11 +738,6 @@ extern int save_volatiles; #define INTERRUPT_HANDLER_NAME "_interrupt_handler" -/* These #define added for C++. */ -#define UNALIGNED_SHORT_ASM_OP ".data16" -#define UNALIGNED_INT_ASM_OP ".data32" -#define UNALIGNED_DOUBLE_INT_ASM_OP ".data8" - /* The following #defines are used in the headers files. Always retain these. */ /* Added for declaring size at the end of the function. */ Index: doc/tm.texi.in =================================================================== --- doc/tm.texi.in (revision 188916) +++ doc/tm.texi.in (working copy) @@ -8814,8 +8814,8 @@ that it does not contain any extraneous Define this macro to 0 if your target supports DWARF 2 frame unwind information, but it does not yet work with exception handling. Otherwise, if your target supports this information (if it defines -@code{INCOMING_RETURN_ADDR_RTX} and either @code{UNALIGNED_INT_ASM_OP} -or @code{OBJECT_FORMAT_ELF}), GCC will provide a default definition of 1. +@code{INCOMING_RETURN_ADDR_RTX} and @code{OBJECT_FORMAT_ELF}), +GCC will provide a default definition of 1. @end defmac @hook TARGET_EXCEPT_UNWIND_INFO Index: doc/tm.texi =================================================================== --- doc/tm.texi (revision 188916) +++ doc/tm.texi (working copy) @@ -8919,8 +8919,8 @@ that it does not contain any extraneous Define this macro to 0 if your target supports DWARF 2 frame unwind information, but it does not yet work with exception handling. Otherwise, if your target supports this information (if it defines -@code{INCOMING_RETURN_ADDR_RTX} and either @code{UNALIGNED_INT_ASM_OP} -or @code{OBJECT_FORMAT_ELF}), GCC will provide a default definition of 1. +@code{INCOMING_RETURN_ADDR_RTX} and @code{OBJECT_FORMAT_ELF}), +GCC will provide a default definition of 1. @end defmac @deftypefn {Common Target Hook} {enum unwind_info_type} TARGET_EXCEPT_UNWIND_INFO (struct gcc_options *@var{opts}) Index: doc/cpp.texi =================================================================== --- doc/cpp.texi (revision 188916) +++ doc/cpp.texi (working copy) @@ -3420,8 +3420,8 @@ the installation in a consistent way, yo an inconsistency and report it with @samp{#error}. For example, @smallexample -#if !defined(UNALIGNED_INT_ASM_OP) && defined(DWARF2_DEBUGGING_INFO) -#error "DWARF2_DEBUGGING_INFO requires UNALIGNED_INT_ASM_OP." +#if !defined(FOO) && defined(BAR) +#error "BAR requires FOO." #endif @end smallexample Index: config/frv/frv.h =================================================================== --- config/frv/frv.h (revision 188916) +++ config/frv/frv.h (working copy) @@ -1825,8 +1825,8 @@ fprintf (STREAM, "\t.word .L%d\n", VALUE /* Define this macro to 0 if your target supports DWARF 2 frame unwind information, but it does not yet work with exception handling. Otherwise, if your target supports this information (if it defines - `INCOMING_RETURN_ADDR_RTX' and either `UNALIGNED_INT_ASM_OP' or - `OBJECT_FORMAT_ELF'), GCC will provide a default definition of 1. + `INCOMING_RETURN_ADDR_RTX' and `OBJECT_FORMAT_ELF'), GCC will provide + a default definition of 1. If this macro is defined to 1, the DWARF 2 unwinder will be the default exception handling mechanism; otherwise, setjmp/longjmp will be used by