From 6f079ae3d93abaaf8db9cfda081e506f16e89e15 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 5 May 2004 13:06:18 +0000
Subject: [PATCH] * tc-s390.h (md_do_align, HANDLE_ALIGN): Remove.
(NOP_OPCODE): Define. (s390_align_code): Remove prototype. * tc-s390.c
(s390_align_code): Remove.
---
gas/ChangeLog | 7 +++++++
gas/config/tc-s390.c | 15 +--------------
gas/config/tc-s390.h | 20 ++------------------
3 files changed, 10 insertions(+), 32 deletions(-)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 45e88bda4cb..f1a6ee1e77a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-05 Jakub Jelinek <jakub@redhat.com>
+
+ * tc-s390.h (md_do_align, HANDLE_ALIGN): Remove.
+ (NOP_OPCODE): Define.
+ (s390_align_code): Remove prototype.
+ * tc-s390.c (s390_align_code): Remove.
+
2004-05-04 H.J. Lu <hongjiu.lu@intel.com>
* config/tc-ia64.c (make_unw_section_name): Removed.
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index c450eaeea75..4fafbec35fe 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -1,5 +1,5 @@
/* tc-s390.c -- Assemble for the S390
- Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of GAS, the GNU Assembler.
@@ -540,19 +540,6 @@ s390_md_end ()
bfd_set_arch_mach (stdoutput, bfd_arch_s390, bfd_mach_s390_31);
}
-void
-s390_align_code (fragP, count)
- fragS *fragP;
- int count;
-{
- /* We use nop pattern 0x0707. */
- if (count > 0)
- {
- memset (fragP->fr_literal + fragP->fr_fix, 0x07, count);
- fragP->fr_var = count;
- }
-}
-
/* Insert an operand value into an instruction. */
static void
diff --git a/gas/config/tc-s390.h b/gas/config/tc-s390.h
index a416927771d..fe55e15c89d 100644
--- a/gas/config/tc-s390.h
+++ b/gas/config/tc-s390.h
@@ -1,5 +1,5 @@
/* tc-s390.h -- Header file for tc-s390.c.
- Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
Written by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of GAS, the GNU Assembler.
@@ -76,23 +76,7 @@ extern int target_big_endian;
#define md_number_to_chars number_to_chars_bigendian
-#define md_do_align(n, fill, len, max, around) \
-if ((n) && !need_pass_2 && (fill == 0) && \
- (bfd_get_section_flags (stdoutput, now_seg) & SEC_CODE) != 0) { \
- char *p; \
- p = frag_var (rs_align_code, 15, 1, (relax_substateT) max, \
- (symbolS *) 0, (offsetT) (n), (char *) 0); \
- *p = 0x07; \
- goto around; \
-}
-
-extern void s390_align_code PARAMS ((fragS *, int));
-
-#define HANDLE_ALIGN(fragP) \
-if (fragP->fr_type == rs_align_code) \
- s390_align_code (fragP, (fragP->fr_next->fr_address \
- - fragP->fr_address \
- - fragP->fr_fix));
+#define NOP_OPCODE 0x07
/* call md_pcrel_from_section, not md_pcrel_from */
#define MD_PCREL_FROM_SECTION(FIX, SEC) md_pcrel_from_section(FIX, SEC)