gas/

2003-04-30  H.J. Lu <hjl@gnu.org>

	* config/tc-ia64.c (md_section_align): Deleted.

	* config/tc-ia64.h (SUB_SEGMENT_ALIGN): New.
	(md_section_align): New.

gas/testsuite/

2003-04-29  H.J. Lu <hjl@gnu.org>

	* gas/ia64/ia64.exp: Add align.

	* gas/ia64/align.d: New file.
	* gas/ia64/align.s: Likewise.

	* ia64/dependency-1.d: Remove the padding.

ld/testsuite/

2003-04-29  H.J. Lu <hjl@gnu.org>

	* ld-ia64/tlsbin.dd: Updated.
	* ld-ia64/tlsbin.rd: Likewise.
	* ld-ia64/tlsbin.sd: Likewise.
	* ld-ia64/tlsbin.td: Likewise.
	* ld-ia64/tlspic.rd: Likewise.
	* ld-ia64/tlspic.sd: Likewise.
	* ld-ia64/tlspic.td: Likewise.

8 files changed, 30 insertions, 15 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 64d6df7..87de955 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,12 @@
 2003-04-30  H.J. Lu <hjl@gnu.org>
 
+	* config/tc-ia64.c (md_section_align): Deleted.
+
+	* config/tc-ia64.h (SUB_SEGMENT_ALIGN): New.
+	(md_section_align): New.
+
+2003-04-30  H.J. Lu <hjl@gnu.org>
+
 	* config/tc-ia64.c (stmt_float_cons): Fix alignment for real10
 	and add real16.
 	(md_pseudo_table): Add "xreal16", "xreal16.ua", "real16" and
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 13ff8a0..10a17a9 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -10605,18 +10605,6 @@ md_atof (type, lit, size)
   return 0;
 }
 
-/* Round up a section's size to the appropriate boundary.  */
-valueT
-md_section_align (seg, size)
-     segT seg;
-     valueT size;
-{
-  int align = bfd_get_section_alignment (stdoutput, seg);
-  valueT mask = ((valueT) 1 << align) - 1;
-
-  return (size + mask) & ~mask;
-}
-
 /* Handle ia64 specific semantics of the align directive.  */
 
 void
diff --git a/gas/config/tc-ia64.h b/gas/config/tc-ia64.h
index 1853943..37124ce 100644
--- a/gas/config/tc-ia64.h
+++ b/gas/config/tc-ia64.h
@@ -59,6 +59,8 @@ extern const char *ia64_target_format PARAMS ((void));
 #define LEX_QM		LEX_NAME	/* allow `?' inside name */
 #define LEX_HASH	LEX_END_NAME	/* allow `#' ending a name */
 
+#define SUB_SEGMENT_ALIGN(SEG, FRCHAIN) 0
+
 struct ia64_fix
   {
     int bigendian;			/* byte order at fix location */
@@ -116,6 +118,7 @@ extern void ia64_dwarf2_emit_offset PARAMS ((symbolS *, unsigned int));
 #define TC_CONS_FIX_NEW(f,o,l,e)	ia64_cons_fix_new (f, o, l, e)
 #define TC_VALIDATE_FIX(fix,seg,skip)	ia64_validate_fix (fix)
 #define MD_PCREL_FROM_SECTION(fix,sec)	ia64_pcrel_from_section (fix, sec)
+#define md_section_align(seg,size)	(size)
 #define md_do_align(n,f,l,m,j)		ia64_md_do_align (n,f,l,m)
 #define HANDLE_ALIGN(f)			ia64_handle_align (f)
 #define md_elf_section_type(str,len)	ia64_elf_section_type (str, len)
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index fa65442..f8adc49 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-29  H.J. Lu <hjl@gnu.org>
+
+	* gas/ia64/ia64.exp: Add align.
+
+	* gas/ia64/align.d: New file.
+	* gas/ia64/align.s: Likewise.
+
+	* ia64/dependency-1.d: Remove the padding.
+
 2003-04-30  H.J. Lu <hjl@gnu.org>
 
 	* gas/ia64/ia64.exp: Add real.
diff --git a/gas/testsuite/gas/ia64/align.d b/gas/testsuite/gas/ia64/align.d
new file mode 100644
index 0000000..ef4f61e
--- /dev/null
+++ b/gas/testsuite/gas/ia64/align.d
@@ -0,0 +1,7 @@
+#objdump: -s -j .data
+#name: ia64 align
+
+.*: +file format .*
+
+Contents of section .data:
+ 0000 ff[ 	]+.[ 	]+
diff --git a/gas/testsuite/gas/ia64/align.s b/gas/testsuite/gas/ia64/align.s
new file mode 100644
index 0000000..310ec61
--- /dev/null
+++ b/gas/testsuite/gas/ia64/align.s
@@ -0,0 +1,3 @@
+	.data
+	.align 256
+	.byte -1
diff --git a/gas/testsuite/gas/ia64/dependency-1.d b/gas/testsuite/gas/ia64/dependency-1.d
index 3381282..1250ea8 100644
--- a/gas/testsuite/gas/ia64/dependency-1.d
+++ b/gas/testsuite/gas/ia64/dependency-1.d
@@ -15,6 +15,3 @@ Disassembly of section \.text:
    0:.*0b 40 00 40 10 18.*\[MMI\].*ldfs f8=\[r32\];;
    6:.*00 40 84 30 33 00.*stfd \[r33\]=f8
    c:.*00 00 04 00.*nop\.i 0x0;;
-  10:.*0c 00 00 00 01 00.*\[MFI\].*nop.m 0x0
-  16:.*00 00 00 02 00 00.*nop\.f 0x0
-  1c:.*00 00 04 00.*nop\.i 0x0
diff --git a/gas/testsuite/gas/ia64/ia64.exp b/gas/testsuite/gas/ia64/ia64.exp
index aaaa9be..deae264 100644
--- a/gas/testsuite/gas/ia64/ia64.exp
+++ b/gas/testsuite/gas/ia64/ia64.exp
@@ -43,4 +43,5 @@ if [istarget "ia64-*"] then {
     run_dump_test "dependency-1"
 
     run_dump_test "real"
+    run_dump_test "align"
 }