X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=main.c;h=2497541ca6e0648e93bdfbb0dcaafa935c73c7f1;hb=2e89f72ef82f9bf281d9fd62c076e5681dd9643b;hp=9d7c04e549d6f5620229faf39ee09970b356a995;hpb=28a24ba15f436422c3c8e16341de47e9989184a4;p=cparser

diff --git a/main.c b/main.c
index 9d7c04e..2497541 100644
--- a/main.c
+++ b/main.c
@@ -80,7 +80,11 @@
 #include "warning.h"
 
 #ifndef PREPROCESSOR
-#define PREPROCESSOR "cpp -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int -U__SIZE_TYPE__ -D__SIZE_TYPE__=__SIZE_TYPE__ -m32 -U__STRICT_ANSI__"
+#ifdef __APPLE__
+#define PREPROCESSOR "gcc -E -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int -U__SIZE_TYPE__ -D__SIZE_TYPE__=unsigned\\ long -m32 -U__STRICT_ANSI__"
+#else
+#define PREPROCESSOR "cpp -std=c99 -U__WCHAR_TYPE__ -D__WCHAR_TYPE__=int -U__SIZE_TYPE__ -D__SIZE_TYPE__=unsigned\\ long -m32 -U__STRICT_ANSI__"
+#endif
 #endif
 
 #ifndef LINKER
@@ -88,8 +92,12 @@
 #endif
 
 #ifndef ASSEMBLER
+#ifdef __APPLE__
+#define ASSEMBLER "gcc -c -xassembler"
+#else
 #define ASSEMBLER "as --32"
 #endif
+#endif
 
 /** The current c mode/dialect. */
 unsigned int c_mode = _C89|_C99|_GNUC;
@@ -112,8 +120,10 @@ extern bool print_implicit_casts;
 /* to switch on printing of parenthesis to indicate operator precedence */
 extern bool print_parenthesis;
 
-static int            verbose;
-static struct obstack cppflags_obst, ldflags_obst;
+static int             verbose;
+static struct obstack  cppflags_obst, ldflags_obst;
+static char            dep_target[1024];
+static const char     *outname;
 
 typedef struct file_list_entry_t file_list_entry_t;
 
@@ -253,11 +263,25 @@ static void add_flag(struct obstack *obst, const char *format, ...)
 
 static FILE *preprocess(const char *fname)
 {
-	char buf[4096];
 	obstack_1grow(&cppflags_obst, '\0');
 	const char *flags = obstack_finish(&cppflags_obst);
 
-	snprintf(buf, sizeof(buf), PREPROCESSOR " %s %s", flags, fname);
+	obstack_printf(&cppflags_obst, "%s", PREPROCESSOR);
+	if (dep_target[0] != '\0') {
+		add_flag(&cppflags_obst, "-MF");
+		add_flag(&cppflags_obst, "%s", dep_target);
+		if (outname != NULL) {
+				add_flag(&cppflags_obst, "-MQ");
+				add_flag(&cppflags_obst, "%s", outname);
+		}
+	}
+	if (flags[0] != '\0') {
+		obstack_printf(&cppflags_obst, " %s", flags);
+	}
+	add_flag(&cppflags_obst, "%s", fname);
+
+	obstack_1grow(&cppflags_obst, '\0');
+	const char *buf = obstack_finish(&cppflags_obst);
 	if(verbose) {
 		puts(buf);
 	}
@@ -267,6 +291,7 @@ static FILE *preprocess(const char *fname)
 		fprintf(stderr, "invoking preprocessor failed\n");
 		exit(1);
 	}
+
 	return f;
 }
 
@@ -486,14 +511,14 @@ int main(int argc, char **argv)
 {
 	initialize_firm();
 
-	const char        *outname      = NULL;
-	const char        *dumpfunction = NULL;
-	compile_mode_t     mode         = CompileAssembleLink;
-	int                opt_level    = 1;
-	int                result       = EXIT_SUCCESS;
-	char               cpu_arch[16] = "ia32";
-	file_list_entry_t *files        = NULL;
-	file_list_entry_t *last_file    = NULL;
+	const char        *dumpfunction         = NULL;
+	compile_mode_t     mode                 = CompileAssembleLink;
+	int                opt_level            = 1;
+	int                result               = EXIT_SUCCESS;
+	char               cpu_arch[16]         = "ia32";
+	file_list_entry_t *files                = NULL;
+	file_list_entry_t *last_file            = NULL;
+	bool               construct_dep_target = false;
 	struct obstack     file_obst;
 
 	obstack_init(&cppflags_obst);
@@ -555,6 +580,11 @@ int main(int argc, char **argv)
 		break;
 	}
 
+#ifdef __APPLE__
+	/* Darwin expects the stack to be aligned to 16byte boundary */
+	firm_be_option("ia32-stackalign=4");
+#endif
+
 	/* parse rest of options */
 	filetype_t  forced_filetype = FILETYPE_AUTODETECT;
 	bool        help_displayed  = false;
@@ -614,8 +644,10 @@ int main(int argc, char **argv)
 				mode = PreprocessOnly;
 				add_flag(&cppflags_obst, "-M");
 			} else if (streq(option, "MMD") ||
-			           streq(option, "MD")  ||
-			           streq(option, "MM")  ||
+			           streq(option, "MD")) {
+			    construct_dep_target = true;
+				add_flag(&cppflags_obst, "-%s", option);
+			} else if(streq(option, "MM")  ||
 			           streq(option, "MP")) {
 				add_flag(&cppflags_obst, "-%s", option);
 			} else if (streq(option, "MT") ||
@@ -912,6 +944,16 @@ int main(int argc, char **argv)
 	init_parser();
 	init_ast2firm();
 
+	if (construct_dep_target) {
+		if (outname != 0 && strlen(outname) >= 2) {
+			get_output_name(dep_target, sizeof(dep_target), outname, ".d");
+		} else {
+			get_output_name(dep_target, sizeof(dep_target), files->name, ".d");
+		}
+	} else {
+		dep_target[0] = '\0';
+	}
+
 	char outnamebuf[4096];
 	if (outname == NULL) {
 		const char *filename = files->name;