projects/ddmd: dmd/Util.d comparison

comparison dmd/Util.d @ 22:fd4acc376c45

Implemented object file output and linking on linux.

author	Robert Clipsham <robert@octarineparrot.com>
date	Thu, 08 Apr 2010 04:21:03 +0100
parents	5c9b78899f5d
children	cfa3747ebe4c

comparison

equal deleted inserted replaced

-:26b9f97f6162
+:fd4acc376c45
 import std.c.string;
 import std.stdio : writef, writefln, write;
 version (Windows)
 {
 import std.c.process : spawnl, spawnlp;
+}
+version (POSIX)
+{
+import core.sys.posix.unistd;
 }
 import core.stdc.stdlib;
 import core.stdc.ctype;
 import core.stdc.stdarg;
 public import core.stdc.stdio;
 		remove(toStringz(lnkfilename.toChars()));
 		///delete lnkfilename;
 }
 return status;
 } else version (POSIX) {/// linux || __APPLE__ || __FreeBSD__ || __sun&&__SVR4
-	assert(false, "Unimplemented");
-	/+
 pid_t childpid;
 int i;
 int status;
 // Build argv[]
-Array argv;
+Array argv = new Array();
-const char *cc = getenv("CC");
+const(char)* cc = core.stdc.stdlib.getenv("CC");
 if (!cc)
 	cc = "gcc";
-argv.push((void *)cc);
+argv.push(cast(void *)cc);
-argv.insert(1, global.params.objfiles);
+Array objfiles = new Array;
+for( i = 0; i < global.params.objfiles.dim; i++ )
+{   string str = (cast(String)global.params.objfiles.data[i]).str;
+	objfiles.push(cast(void*)toStringz(str));
+}
+argv.insert(1, objfiles);
 // None of that a.out stuff. Use explicit exe file name, or
 // generate one from name of first source file.
-argv.push((void *)"-o");
+argv.push(cast(void *)cast(char*)"-o");
 if (global.params.exefile)
 {
-	argv.push(global.params.exefile);
+	argv.push(cast(void*)toStringz(global.params.exefile));
 }
 else
 {	// Generate exe file name from first obj name
-	char *n = (char *)global.params.objfiles.data[0];
+	string n = (cast(String)global.params.objfiles.data[0]).str;
-	char *e;
-	char *ex;
 	n = FileName.name(n);
-	e = FileName.ext(n);
+	string e = FileName.ext(n);
-	if (e)
+	string ex = e ? n[0..$-(e.length+1)] : "a.out";
-	{
-	    e--;			// back up over '.'
+	argv.push(cast(void*)toStringz(ex));
-	    ex = (char *)mem.malloc(e - n + 1);
-	    memcpy(ex, n, e - n);
-	    ex[e - n] = 0;
-	}
-	else
-	    ex = (char *)"a.out";	// no extension, so give up
-	argv.push(ex);
 	global.params.exefile = ex;
 }
 // Make sure path to exe file exists
-{	char *p = FileName.path(global.params.exefile);
+{	string p = FileName.path(global.params.exefile);
 	FileName.ensurePathExists(p);
-	mem.free(p);
 }
 if (global.params.symdebug)
-	argv.push((void *)"-g");
+	argv.push(cast(void *)cast(char*)"-g");
 if (global.params.isX86_64)
-	argv.push((void *)"-m64");
+	argv.push(cast(void *)cast(char*)"-m64");
 else
-	argv.push((void *)"-m32");
+	argv.push(cast(void *)cast(char*)"-m32");
 if (0 && global.params.exefile)
 {
 	/* This switch enables what is known as 'smart linking'
 	 * in the Windows world, where unreferenced sections
 	 * Although it is documented to work with ld version 2.13,
 	 * in practice it does not, but just seems to be ignored.
 	 * Thomas Kuehne has verified that it works with ld 2.16.1.
 	 * BUG: disabled because it causes exception handling to fail
 	 */
-	argv.push((void *)"-Xlinker");
+	argv.push(cast(void *)cast(char*)"-Xlinker");
-	argv.push((void *)"--gc-sections");
+	argv.push(cast(void *)cast(char*)"--gc-sections");
 }
 for (i = 0; i < global.params.linkswitches.dim; i++)
-{	char *p = (char *)global.params.linkswitches.data[i];
+{	char *p = cast(char *)global.params.linkswitches.data[i];
 	if (!p || !p[0] || !(p[0] == '-' && p[1] == 'l'))
 	    // Don't need -Xlinker if switch starts with -l
-	    argv.push((void *)"-Xlinker");
+	    argv.push(cast(void *)cast(char*)"-Xlinker");
-	argv.push((void *) p);
+	argv.push(cast(void *) p);
 }
 /* Add each library, prefixing it with "-l".
 * The order of libraries passed is:
 *  1. any libraries passed with -L command line switch
 *  3. libraries specified by pragma(lib), which were appended
 *     to global.params.libfiles.
 *  4. standard libraries.
 */
 for (i = 0; i < global.params.libfiles.dim; i++)
-{	char *p = (char *)global.params.libfiles.data[i];
+{	char *p = cast(char *)global.params.libfiles.data[i];
 	size_t plen = strlen(p);
 	if (plen > 2 && p[plen - 2] == '.' && p[plen -1] == 'a')
-	    argv.push((void *)p);
+	    argv.push(cast(void *)p);
 	else
 	{
-	    char *s = (char *)mem.malloc(plen + 3);
+	    char *s = cast(char *)malloc(plen + 3);
 	    s[0] = '-';
 	    s[1] = 'l';
 	    memcpy(s + 2, p, plen + 1);
-	    argv.push((void *)s);
+	    argv.push(cast(void *)s);
 	}
 }
 /* Standard libraries must go after user specified libraries
 * passed with -l.
 */
 const char *libname = (global.params.symdebug)
 				? global.params.debuglibname
 				: global.params.defaultlibname;
-char *buf = (char *)malloc(2 + strlen(libname) + 1);
+char *buf = cast(char *)malloc(2 + strlen(libname) + 1);
 strcpy(buf, "-l");
 strcpy(buf + 2, libname);
-argv.push((void *)buf);		// turns into /usr/lib/libphobos2.a
+argv.push(cast(void *)buf);		// turns into /usr/lib/libphobos2.a
 //    argv.push((void *)"-ldruntime");
-argv.push((void *)"-lpthread");
+argv.push(cast(void *)cast(char*)"-lpthread");
-argv.push((void *)"-lm");
+argv.push(cast(void *)cast(char*)"-lm");
 if (!global.params.quiet || global.params.verbose)
 {
 	// Print it
 	for (i = 0; i < argv.dim; i++)
-	    printf("%s ", (char *)argv.data[i]);
+	    printf("%s ", cast(char *)argv.data[i]);
 	printf("\n");
 	fflush(stdout);
 }
 argv.push(null);
 childpid = fork();
 if (childpid == 0)
 {
-	execvp((char *)argv.data[0], (char **)argv.data);
+	execvp(cast(char *)argv.data[0], cast(char **)argv.data);
-	perror((char *)argv.data[0]);		// failed to execute
+	perror(cast(char *)argv.data[0]);		// failed to execute
 	return -1;
 }
 waitpid(childpid, &status, 0);
 status=WEXITSTATUS(status);
 if (status)
 	printf("--- errorlevel %d\n", status);
 return status;
-	+/
 } else {
 writef ("Linking is not yet supported for this version of DMD.\n");
 return -1;
 }
 }

Mercurial > projects > ddmd

comparison dmd/Util.d @ 22:fd4acc376c45