Patchwork Remove and poison a pair of old target macros

login
register
mail settings
Submitter Steven Bosscher
Date June 21, 2012, 9:48 p.m.
Message ID <CABu31nNBZm9TEdYrBNFKNETE3hx6Pr_m+42jtmSexWE7GwZWjA@mail.gmail.com>
Download mbox | patch
Permalink /patch/166398/
State New
Headers show

Comments

Steven Bosscher - June 21, 2012, 9:48 p.m.
... because they are unused. Will commit as an obvious cleanup in a
few days' time.

Ciao!
Steven

	* system.h: Poison ASM_BYTE_OP and ASM_OUTPUT_BYTE.
	* vmsdbgout: Do not undefine it if defined.
	Rename loca ASM_BYTE_OP definition to VMS_ASM_BYTE_OP.
	* config/microblaze/microblaze/h: Do no define ASM_BYTE_OP.
	* config/mep/mep.h: Do not define ASM_OUTPUT_BYTE.
Michael Eager - June 22, 2012, 4:09 p.m.
On 06/21/2012 02:48 PM, Steven Bosscher wrote:

> Index: config/microblaze/microblaze.h
> ===================================================================
> --- config/microblaze/microblaze.h	(revision 188855)
> +++ config/microblaze/microblaze.h	(working copy)
> @@ -743,8 +743,6 @@ extern int save_volatiles;
>   #define UNALIGNED_INT_ASM_OP            ".data32"
>   #define UNALIGNED_DOUBLE_INT_ASM_OP     ".data8"
>
> -#define ASM_BYTE_OP                     ".data8"
> -
>   /* The following #defines are used in the headers files. Always
> retain these.  */
>
>   /* Added for declaring size at the end of the function.  */

OK.

Patch

Index: system.h
===================================================================
--- system.h	(revision 188855)
+++ system.h	(working copy)
@@ -815,7 +815,8 @@  extern void fancy_abort (const char *, i
 	LABEL_ALIGN_AFTER_BARRIER_MAX_SKIP JUMP_ALIGN_MAX_SKIP 		\
 	CAN_DEBUG_WITHOUT_FP UNLIKELY_EXECUTED_TEXT_SECTION_NAME	\
 	HOT_TEXT_SECTION_NAME LEGITIMATE_CONSTANT_P ALWAYS_STRIP_DOTDOT	\
-	OUTPUT_ADDR_CONST_EXTRA SMALL_REGISTER_CLASSES ASM_OUTPUT_IDENT
+	OUTPUT_ADDR_CONST_EXTRA SMALL_REGISTER_CLASSES ASM_OUTPUT_IDENT	\
+	ASM_BYTE_OP ASM_OUTPUT_BYTE

 /* Target macros only used for code built for the target, that have
    moved to libgcc-tm.h or have never been present elsewhere.  */
Index: vmsdbgout.c
===================================================================
--- vmsdbgout.c	(revision 188855)
+++ vmsdbgout.c	(working copy)
@@ -229,10 +229,7 @@  const struct gcc_debug_hooks vmsdbg_debu
 #endif
 #define UNALIGNED_DOUBLE_INT_ASM_OP	".quad"

-#ifdef ASM_BYTE_OP
-#undef ASM_BYTE_OP
-#endif
-#define ASM_BYTE_OP	".byte"
+#define VMS_ASM_BYTE_OP	".byte"

 #define NUMBYTES(I) ((I) < 256 ? 1 : (I) < 65536 ? 2 : 4)

@@ -247,7 +244,7 @@  const struct gcc_debug_hooks vmsdbg_debu
 #define UNALIGNED_OFFSET_ASM_OP(OFFSET) \
   (NUMBYTES(OFFSET) == 4 \
    ? UNALIGNED_LONG_ASM_OP \
-   : (NUMBYTES(OFFSET) == 2 ? UNALIGNED_SHORT_ASM_OP : ASM_BYTE_OP))
+   : (NUMBYTES(OFFSET) == 2 ? UNALIGNED_SHORT_ASM_OP : VMS_ASM_BYTE_OP))
 #endif

 /* Definitions of defaults for formats and names of various special
@@ -336,7 +333,7 @@  static char text_end_label[MAX_ARTIFICIA

 #ifndef ASM_OUTPUT_DEBUG_DATA1
 #define ASM_OUTPUT_DEBUG_DATA1(FILE,VALUE) \
-  fprintf ((FILE), "\t%s\t%#x", ASM_BYTE_OP, (unsigned char) VALUE)
+  fprintf ((FILE), "\t%s\t%#x", VMS_ASM_BYTE_OP, (unsigned char) VALUE)
 #endif

 #ifndef ASM_OUTPUT_DEBUG_DATA2
Index: config/microblaze/microblaze.h
===================================================================
--- config/microblaze/microblaze.h	(revision 188855)
+++ config/microblaze/microblaze.h	(working copy)
@@ -743,8 +743,6 @@  extern int save_volatiles;
 #define UNALIGNED_INT_ASM_OP            ".data32"
 #define UNALIGNED_DOUBLE_INT_ASM_OP     ".data8"

-#define ASM_BYTE_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: config/mep/mep.h
===================================================================
--- config/mep/mep.h	(revision 188855)
+++ config/mep/mep.h	(working copy)
@@ -636,9 +636,6 @@  typedef struct
     }						\
   while (0)

-#define ASM_OUTPUT_BYTE(STREAM, VALUE) \
-  fprintf (STREAM, "\t%s\t0x%x\n", ASM_BYTE_OP, (VALUE))
-
 /* Most of these are here to support based/tiny/far/io attributes.  */

 #define ASM_OUTPUT_ALIGNED_DECL_COMMON(STREAM, DECL, NAME, SIZE, ALIGNMENT) \