Commit f3b2faeb authored by John van Groningen's avatar John van Groningen
Browse files

test result code of linker, remove some debugging messages

parent 35611ea3
......@@ -3213,7 +3213,9 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
*arg++="linker";
# if !(!defined (LINUX) && defined (SOLARIS))
need_file ("_startup",OBJECT_FILE_EXTENSION,start_up_file_name);
# endif
*arg++=start_up_file_name;
need_file ("_system",OBJECT_FILE_EXTENSION,system_file_name);
......@@ -3248,6 +3250,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
{
int pid,r,status;
# if 0
char **a;
a=argv;
......@@ -3255,6 +3258,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
printf ("%s\n",*a);
++a;
}
# endif
pid=fork();
if (pid<0)
......@@ -3272,7 +3276,7 @@ static int link_project (P_NODE first_project_node,char *options_file_name,char
}
r=wait_for_child (pid, "Linker",&status);
if (!(r>=0 /* && status==0*/))
if (!(r>=0 && status==0))
return 0;
}
# endif
......@@ -4131,7 +4135,7 @@ int main (int argc,char **argv)
/* application options */
#if ! (defined (MAKE_MPW_TOOL) && defined (NEWBRIDGE))
#if ! (defined (MAKE_MPW_TOOL) && defined (NB))
else if (!strcmp (s,"h")){
++arg_n;
if (arg_n>=argc)
......@@ -4248,7 +4252,7 @@ int main (int argc,char **argv)
/* code generator options */
} else if (!strcmp (s,"ci")){
check_indices=1;
#if defined (MAKE_MPW_TOOL) && defined (NEWBRIDGE)
#if defined (MAKE_MPW_TOOL) && defined (NB)
} else if (!strcmp (s,"checkstack")){
check_stack_overflow=1;
} else if (!strcmp (s,"checkindices")){
......@@ -4285,7 +4289,7 @@ int main (int argc,char **argv)
if (clean_path_list[0]!='\0')
strcat (clean_path_list,":");
strcat (clean_path_list,argv[arg_n]);
#if defined (MAKE_MPW_TOOL) && defined (NEWBRIDGE)
#if defined (MAKE_MPW_TOOL) && defined (NB)
} else if (!strcmp (s,"o")){
++arg_n;
if (arg_n>=argc)
......@@ -4296,7 +4300,7 @@ int main (int argc,char **argv)
error_s ("Unknown option: %s",argument);
}
#if defined (MAKE_MPW_TOOL) && defined (NEWBRIDGE)
#if defined (MAKE_MPW_TOOL) && defined (NB)
if (main_module_name==NULL)
argument_error();
......@@ -4377,7 +4381,7 @@ int main (int argc,char **argv)
}
#ifdef NEWBRIDGE
#ifdef NB
{
P_NODE _system_pnode;
......@@ -4390,7 +4394,7 @@ int main (int argc,char **argv)
#endif
if (make_project_to_abc_files (first_project_node)
#ifdef NEWBRIDGE
#ifdef NB
&& make_project_to_abc_files (_system_pnode)
#endif
){
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment