From b73fcae86e5f1b80085e9928bc336f34ba60fcf1 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Mon, 30 Jun 1997 16:38:17 +0000
Subject: [PATCH] 	From Jason Merrill <jason@cygnus.com>: 	* read.c
 (do_align): If BFD_ASSEMBLER, only use NOP_OPCODE if 	SEC_CODE is set. 
 * config/tc-i386.h (md_maybe_text): Define. 	(md_do_align): Use
 md_maybe_text.

---
 gas/ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3aa7d8e6d0..b16eb521a1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jun 30 12:27:28 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	From Jason Merrill <jason@cygnus.com>:
+	* read.c (do_align): If BFD_ASSEMBLER, only use NOP_OPCODE if
+	SEC_CODE is set.
+	* config/tc-i386.h (md_maybe_text): Define.
+	(md_do_align): Use md_maybe_text.
+
 Fri Jun 27 19:15:27 1997  Michael Meissner  <meissner@cygnus.com>
 
 	* config/tc-ppc.h (tc_fix_adjustable): Only check for GOT type