s/boolean/bfd_boolean/ s/true/TRUE/ s/false/FALSE/. Simplify

[thirdparty/binutils-gdb.git] / ld / emultempl / lnk960.em

diff --git a/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em
index f23f2bc85d79a5f075823beef87b4fb3e72f4e63..b000fa976edf79b9465e8ee50fdc9e8711e9f415 100644 (file)
--- a/ld/emultempl/lnk960.em
+++ b/ld/emultempl/lnk960.em
@@ -61,62 +61,61 @@ static char *lnk960_get_script PARAMS ((int *));
 
 
 static void
-append(list, name)
+append (list, name)
      lib_list_type ***list;
      char *name;
 {
-  lib_list_type *element = 
-    (lib_list_type *)(xmalloc(sizeof(lib_list_type)));
+  lib_list_type *element = (lib_list_type *) xmalloc (sizeof (lib_list_type));
 
   element->name = name;
-  element->next = (lib_list_type *)NULL;
+  element->next = (lib_list_type *) NULL;
   **list = element;
   *list = &element->next;
 
 }
 
-static boolean had_hll = false;
-static boolean had_hll_name = false;
+static bfd_boolean had_hll = FALSE;
+static bfd_boolean had_hll_name = FALSE;
 
 static void
-lnk960_hll(name)
+lnk960_hll (name)
      char *name;
 {
-  had_hll = true;
-  if (name != (char *)NULL) {
-    had_hll_name = true;
-    append(&hll_list_tail, name);
-  }
+  had_hll = TRUE;
+  if (name != (char *) NULL)
+    {
+      had_hll_name = TRUE;
+      append (&hll_list_tail, name);
+    }
 }
 
 static void 
-lnk960_syslib(name)
+lnk960_syslib (name)
      char *name;
 {
-  append(&syslib_list_tail,name);
+  append (&syslib_list_tail, name);
 }
 
 
 #ifdef GNU960
 
 static void 
-lnk960_before_parse()
+lnk960_before_parse ()
 {
   static char *env_variables[] = { "G960LIB", "G960BASE", 0 };
   char **p;
   char *env ;
 
-  for ( p = env_variables; *p; p++ ){
-    env =  (char *) getenv(*p);
-    if (env) {
-      ldfile_add_library_path(concat(env,"/lib/libcoff",""), false);
+  for (p = env_variables; *p; p++)
+    {
+      env = (char *) getenv (*p);
+      if (env)
+       ldfile_add_library_path (concat (env, "/lib/libcoff", ""), FALSE);
     }
-  }
 
-  env= (char *) getenv("I960BASE");
-  if ( env ) {
-    ldfile_add_library_path(concat(env,"/lib",""), false);
-  }
+  env = (char *) getenv ("I960BASE");
+  if (env)
+    ldfile_add_library_path(concat (env, "/lib", ""), FALSE);
 
   ldfile_output_architecture = bfd_arch_i960;
   ldfile_output_machine = bfd_mach_i960_core;
@@ -125,19 +124,19 @@ lnk960_before_parse()
 #else  /* not GNU960 */
 
 static void 
-lnk960_before_parse()
+lnk960_before_parse ()
 {
-  char *name = getenv("I960BASE");
+  char *name = getenv ("I960BASE");
 
-  if (name == (char *)NULL) {
-    name = getenv("G960BASE");
-    if (name == (char *)NULL) {
-      einfo("%P%F I960BASE and G960BASE not set\n");
+  if (name == (char *) NULL)
+    {
+      name = getenv("G960BASE");
+      if (name == (char *) NULL)
+       einfo ("%P%F I960BASE and G960BASE not set\n");
     }
-  }
 
 
-  ldfile_add_library_path(concat(name,"/lib",""), false);
+  ldfile_add_library_path (concat (name, "/lib", ""), FALSE);
   ldfile_output_architecture = bfd_arch_i960;
   ldfile_output_machine = bfd_mach_i960_core;
 }
@@ -146,55 +145,52 @@ lnk960_before_parse()
 
 
 static void
-add_on(list, search)
+add_on (list, search)
      lib_list_type *list;
      lang_input_file_enum_type search;
 {
-  while (list) {
-    lang_add_input_file(list->name,
-                       search,
-                       (char *)NULL);
-    list = list->next;
-  }
+  while (list)
+    {
+      lang_add_input_file (list->name, search, (char *) NULL);
+      list = list->next;
+    }
 }
 static void
-lnk960_after_parse()
+lnk960_after_parse ()
 {
   /* If there has been no arch, default to -KB */
-  if (ldfile_output_machine_name[0] ==0) {
-    ldfile_add_arch("KB");
-  }
+  if (ldfile_output_machine_name[0] == 0)
+    ldfile_add_arch ("KB");
 
   /* if there has been no hll list then add our own */
   
-  if(had_hll && !had_hll_name) {
-    append(&hll_list_tail,"cg");
-    if (ldfile_output_machine == bfd_mach_i960_ka_sa ||
-       ldfile_output_machine == bfd_mach_i960_ca) {
-        {
-         append(&hll_list_tail,"fpg");
-        }
+  if (had_hll && !had_hll_name)
+    {
+      append (&hll_list_tail, "cg");
+      if (ldfile_output_machine == bfd_mach_i960_ka_sa
+         || ldfile_output_machine == bfd_mach_i960_ca)
+       append (&hll_list_tail, "fpg");
     }
-  }
   
-  add_on(hll_list, lang_input_file_is_l_enum);
-  add_on(syslib_list, lang_input_file_is_search_file_enum);
+  add_on (hll_list, lang_input_file_is_l_enum);
+  add_on (syslib_list, lang_input_file_is_search_file_enum);
 }
 
 static void
-lnk960_before_allocation()
+lnk960_before_allocation ()
 {
 }
 
 static void
-lnk960_after_allocation()
+lnk960_after_allocation ()
 {
-  if (link_info.relocateable == false) {
-    lang_abs_symbol_at_end_of(".text","_etext");
-    lang_abs_symbol_at_end_of(".data","_edata");
-    lang_abs_symbol_at_beginning_of(".bss","_bss_start");
-    lang_abs_symbol_at_end_of(".bss","_end");
-  }
+  if (!link_info.relocateable)
+    {
+      lang_abs_symbol_at_end_of (".text", "_etext");
+      lang_abs_symbol_at_end_of (".data", "_edata");
+      lang_abs_symbol_at_beginning_of (".bss", "_bss_start");
+      lang_abs_symbol_at_end_of (".bss", "_end");
+    }
 }
 
 
@@ -231,18 +227,21 @@ machine_table[] =
 };
 
 static void
-lnk960_set_output_arch()
+lnk960_set_output_arch ()
 {
   /* Set the output architecture and machine if possible */
   unsigned int i;
   ldfile_output_machine = bfd_mach_i960_core;
-  for (i= 0; machine_table[i].name != (char*)NULL; i++) {
-    if (strcmp(ldfile_output_machine_name,machine_table[i].name)==0) {
-      ldfile_output_machine = machine_table[i].number;
-      break;
+  for (i= 0; machine_table[i].name != (char*) NULL; i++)
+    {
+      if (strcmp (ldfile_output_machine_name, machine_table[i].name) == 0)
+       {
+         ldfile_output_machine = machine_table[i].number;
+         break;
+       }
     }
-  }
-  bfd_set_arch_mach(output_bfd, ldfile_output_architecture, ldfile_output_machine);
+  bfd_set_arch_mach (output_bfd, ldfile_output_architecture,
+                    ldfile_output_machine);
 }
 
 static char *
@@ -252,12 +251,12 @@ lnk960_choose_target (argc, argv)
 {
 #ifdef GNU960
 
-  return bfd_make_targ_name(BFD_COFF_FORMAT, 0);
+  return bfd_make_targ_name (BFD_COFF_FORMAT, 0);
 
 #else
 
-  char *from_outside = getenv(TARGET_ENVIRON);
-  if (from_outside != (char *)NULL)
+  char *from_outside = getenv (TARGET_ENVIRON);
+  if (from_outside != (char *) NULL)
     return from_outside;
 #ifdef LNK960_LITTLE
   return "coff-Intel-little";
@@ -269,7 +268,7 @@ lnk960_choose_target (argc, argv)
 }
 
 static char *
-lnk960_get_script(isfile)
+lnk960_get_script (isfile)
      int *isfile;
 EOF
 
@@ -284,19 +283,19 @@ cat >>e${EMULATION_NAME}.c <<EOF
 {                           
   *isfile = 0;
 
-  if (link_info.relocateable == true && config.build_constructors == true)
+  if (link_info.relocateable && config.build_constructors)
     return
 EOF
-sed $sc ldscripts/${EMULATION_NAME}.xu                     >> e${EMULATION_NAME}.c
-echo '  ; else if (link_info.relocateable == true) return' >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xr                     >> e${EMULATION_NAME}.c
-echo '  ; else if (!config.text_read_only) return'         >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xbn                    >> e${EMULATION_NAME}.c
-echo '  ; else if (!config.magic_demand_paged) return'     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xn                     >> e${EMULATION_NAME}.c
-echo '  ; else return'                                     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.x                      >> e${EMULATION_NAME}.c
-echo '; }'                                                 >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xu                 >> e${EMULATION_NAME}.c
+echo '  ; else if (link_info.relocateable) return'     >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xr                 >> e${EMULATION_NAME}.c
+echo '  ; else if (!config.text_read_only) return'     >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xbn                >> e${EMULATION_NAME}.c
+echo '  ; else if (!config.magic_demand_paged) return' >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xn                 >> e${EMULATION_NAME}.c
+echo '  ; else return'                                 >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.x                  >> e${EMULATION_NAME}.c
+echo '; }'                                             >> e${EMULATION_NAME}.c
 
 else
 # Scripts read from the filesystem.
@@ -305,9 +304,9 @@ cat >>e${EMULATION_NAME}.c <<EOF
 {                           
   *isfile = 1;
 
-  if (link_info.relocateable == true && config.build_constructors == true)
+  if (link_info.relocateable && config.build_constructors)
     return "ldscripts/${EMULATION_NAME}.xu";
-  else if (link_info.relocateable == true)
+  else if (link_info.relocateable)
     return "ldscripts/${EMULATION_NAME}.xr";
   else if (!config.text_read_only)
     return "ldscripts/${EMULATION_NAME}.xbn";