* ldlex.l, ldgram.y: Add ALIGNOF.

	* ldexp.c (exp_print_token, foldname): Likewise.
	* ld.texinfo: Likewise.

	ld/testsuite/
	* ld-scripts/alignof.s: New.
	* ld-scripts/alignof.t: New
	* ld-scripts/alignof.exp: New.

4 files changed, 87 insertions, 0 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index a97f395..6030d0e 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-18  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* ld-scripts/alignof.s: New.
+	* ld-scripts/alignof.t: New
+	* ld-scripts/alignof.exp: New.
+
 2007-06-14  Alan Modra  <alan@grove.modra.org>
 
 	* ld-spu/ovl.d: Update.
diff --git a/ld/testsuite/ld-scripts/alignof.exp b/ld/testsuite/ld-scripts/alignof.exp
new file mode 100644
index 0000000..7b812db
--- /dev/null
+++ b/ld/testsuite/ld-scripts/alignof.exp
@@ -0,0 +1,57 @@
+# Test ALIGNOF in a linker script.
+# By Nathan Sidwell <nathan@codesourcery.com>
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+
+set testname "ALIGNOF"
+
+if ![ld_assemble $as $srcdir/$subdir/alignof.s tmpdir/alignof.o] {
+    unresolved $testname
+    return
+}
+
+if ![ld_simple_link $ld tmpdir/alignof "-T $srcdir/$subdir/alignof.t tmpdir/alignof.o"] {
+    fail $testname
+    return
+}
+
+if ![ld_nm $nm "" tmpdir/alignof] {
+    unresolved $testname
+    return
+}
+
+if {![info exists nm_output(alignof_text)] \
+     || ![info exists nm_output(alignof_data)]} {
+    send_log "bad output from nm\n"
+    verbose "bad output from nm"
+    fail $testname
+    return
+}
+
+if {$nm_output(alignof_text) != 64} {
+    send_log "alignof_text != 64\n"
+    verbose "alignof_text != 64"
+    fail $testname
+    return
+}
+
+if {$nm_output(alignof_data) != 16} {
+    send_log "alignof_data != 16\n"
+    verbose "alignof_data != 16"
+    fail $testname
+    return
+}
+
+pass $testname
diff --git a/ld/testsuite/ld-scripts/alignof.s b/ld/testsuite/ld-scripts/alignof.s
new file mode 100644
index 0000000..d440d2e
--- /dev/null
+++ b/ld/testsuite/ld-scripts/alignof.s
@@ -0,0 +1,9 @@
+
+	.text
+	.p2align 6
+	.long 0
+
+	.data
+	.p2align 4
+	.long 0
+	
diff --git a/ld/testsuite/ld-scripts/alignof.t b/ld/testsuite/ld-scripts/alignof.t
new file mode 100644
index 0000000..1241112
--- /dev/null
+++ b/ld/testsuite/ld-scripts/alignof.t
@@ -0,0 +1,15 @@
+SECTIONS {
+	.text :
+	  {
+	    tmpdir/alignof.o (.text)
+	  }
+	.data : 
+	  { 
+	    tmpdir/alignof.o (.data)
+	    LONG (ALIGNOF(.text))
+	    LONG (ALIGNOF(.data))
+	  }
+}	
+
+alignof_text = ALIGNOF(.text);
+alignof_data = ALIGNOF(.data);