* system.h: Poison ASM_BYTE_OP and ASM_OUTPUT_BYTE.

	* vmsdbgout: Do not undefine it if defined.
	Rename local 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@188917 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 13 insertions, 12 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b51c96a6a47..33bc12d9268 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-06-24  Steven Bosscher  <steven@gcc.gnu.org>
+
+	* system.h: Poison ASM_BYTE_OP and ASM_OUTPUT_BYTE.
+	* vmsdbgout: Do not undefine it if defined.
+	Rename local 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.
+
 2012-06-24  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* config/mips/mips.c (mips_process_sync_loop): Add missing
diff --git a/gcc/config/mep/mep.h b/gcc/config/mep/mep.h
index dbb48143034..ad5b36d375d 100644
--- a/gcc/config/mep/mep.h
+++ b/gcc/config/mep/mep.h
@@ -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) \
diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h
index 783d1e09cb1..ca306ab5d75 100644
--- a/gcc/config/microblaze/microblaze.h
+++ b/gcc/config/microblaze/microblaze.h
@@ -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.  */
diff --git a/gcc/system.h b/gcc/system.h
index cf1cc26f917..8238ed8fb9b 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -815,7 +815,8 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
 	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
 
 /* Target macros only used for code built for the target, that have
    moved to libgcc-tm.h or have never been present elsewhere.  */
diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c
index eedf1bd5124..12fa8ffba52 100644
--- a/gcc/vmsdbgout.c
+++ b/gcc/vmsdbgout.c
@@ -229,10 +229,7 @@ const struct gcc_debug_hooks vmsdbg_debug_hooks
 #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_debug_hooks
 #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_ARTIFICIAL_LABEL_BYTES];
 
 #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