Remove the bootstrap hack that prevented the use of the rtld.

lib/csu/alpha/Makefile

@@ -1,24 +1,15 @@
 #
-#	$Id: Makefile,v 1.4 1998/04/01 03:24:19 jb Exp $
+#	$Id: Makefile,v 1.5 1998/05/04 02:06:09 jb Exp $
 #
 
 SRCS=		crt1.c crtbegin.c crtend.c
 OBJS=		crt1.o crtbegin.o crtend.o
 SOBJS=		crtbegin.so crtend.so
-CFLAGS+=	-Wall -Wno-unused
+CFLAGS+=	-Wall -Wno-unused -I${.CURDIR}/../../../libexec/rtld-elf
 NOMAN=		true
 NOPIC=		true
 NOPROFILE=	true
 INTERNALLIB=	true
-CFLAGS=
-
-# Force bootstrap mode until rtld is ported. The headers are broken
-# on alpha as the result of i386 changes.
-BOOTSTRAP=	true
-
-.ifndef	BOOTSTRAP
-CFLAGS+=	-DHAVE_RTLD -I${.CURDIR}/../../../libexec/rtld-elf
-.endif
 
 all: ${OBJS} ${SOBJS}
 

lib/csu/alpha/crt1.c

@@ -30,7 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: crt1.c,v 1.1.1.1 1998/03/07 20:27:10 jdp Exp $
+ *      $Id: crt1.c,v 1.1.1.2 1998/03/11 20:36:09 jb Exp $
  */
 
 #ifndef __GNUC__
@@ -39,7 +39,6 @@
 
 #include <stdlib.h>
 
-#ifdef	HAVE_RTLD
 #include <sys/exec.h>
 #include <sys/syscall.h>
 #include <rtld.h>
@@ -58,15 +57,6 @@ extern int		__syscall (int, ...);
 
 #pragma weak _DYNAMIC
 extern int _DYNAMIC;
-#else
-/*
- * When doing a bootstrap build, the header files for runtime
- * loader support are not available, so this source file is
- * compiled to a static object.
- */
-#define	Obj_Entry	void
-struct	ps_strings;
-#endif
 
 extern void _init(void);
 extern void _fini(void);
@@ -93,7 +83,6 @@ _start(char **ap,
 	if(argc > 0)
 		__progname = argv[0];
 
-#ifdef	HAVE_RTLD
 	if (&_DYNAMIC != NULL) {
 		if ((obj == NULL) || (obj->magic != RTLD_MAGIC))
 			_FATAL("Corrupt Obj_Entry pointer in GOT");
@@ -103,7 +92,6 @@ _start(char **ap,
 		__mainprog_obj = obj;
 		atexit(cleanup);
 	}
-#endif
 
 	atexit(_fini);
 	_init();