2006-01-27 H.J. Lu <hongjiu.lu@intel.com>

PR ld/2218
	* ld-pie/pie.exp: New file.
	* ld-pie/weakundef.c: Likewise.
	* ld-pie/weakundef.out: Likewise.

	* lib/ld-lib.exp (run_ld_link_exec_tests): Fix nesting. Support
	building PIE and shared library.

ld/testsuite/ChangeLog

@@ -1,3 +1,13 @@
+2006-01-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/2218
+	* ld-pie/pie.exp: New file.
+	* ld-pie/weakundef.c: Likewise.
+	* ld-pie/weakundef.out: Likewise.
+
+	* lib/ld-lib.exp (run_ld_link_exec_tests): Fix nesting. Support
+	building PIE and shared library.
+
 2006-01-18  Alexandre Oliva  <aoliva@redhat.com>
 
 	Introduce TLS descriptors for i386 and x86_64.

ld/testsuite/ld-pie/pie.exp

@@ -0,0 +1,31 @@
+# Expect script for various PIE tests.
+#   Copyright 2006 Free Software Foundation, Inc.
+#
+# 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.
+#
+
+# This test can only be run if ld generates native executables.
+if ![isnative] then {return}
+
+# Run on Linux only.
+if { ![istarget *-*-linux*] } {
+    return
+}
+
+set array_tests {
+    {"weak undefined" "-pie" "" {weakundef.c} "weakundef" "weakundef.out" "-fPIC"}
+}
+
+run_ld_link_exec_tests [] $array_tests

ld/testsuite/ld-pie/weakundef.c

@@ -0,0 +1,15 @@
+#include <stdio.h>
+
+#pragma weak undef_func
+
+extern int undef_func (void);
+int (*ptr_to_func)(void) = undef_func;
+
+int
+main (void)
+{
+  if (ptr_to_func == NULL)
+    printf ("PASSED\n");
+
+  return 0;
+}

ld/testsuite/ld-pie/weakundef.out

@@ -0,0 +1 @@
+PASSED

ld/testsuite/lib/ld-lib.exp

@@ -1318,7 +1318,17 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } {
 	    # them.
 	    ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile
 
-	if ![ld_link $ld $binfile "-L$srcdir/$subdir $ld_options $objfiles"] {
+	    # We have to use $CC to build PIE and shared library.
+	    if { [ string match "-shared" $ld_options ] \
+		 || [ string match "-pie" $ld_options ] } {
+		set link_proc ld_simple_link
+		set link_cmd $CC
+	    } else {
+		set link_proc ld_link
+		set link_cmd $ld
+	    }
+
+	    if ![$link_proc $link_cmd $binfile "-L$srcdir/$subdir $ld_options $objfiles"] {
 		set failed 1
 	    } else {
 		set failed 0
@@ -1342,13 +1352,14 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } {
 			set failed 1
 		    }
 		}
+	    }
 
 	    if { $failed != 0 } {
 		fail $testname
 	    } else {
 		set errcnt 0
 		pass $testname
-	    } }
+	    }
 	}
     }
 }