* remove GNU960 conditional code in ld
@ 2005-02-24 14:32 Ben Elliston
2005-02-24 17:43 ` Nick Clifton
0 siblings, 1 reply; 2+ messages in thread
From: Ben Elliston @ 2005-02-24 14:32 UTC (permalink / raw)
To: binutils
[-- Attachment #1: Type: text/plain, Size: 7312 bytes --]
Some of this was removed in the 1991-1997 timeframe, but some conditional code still
lingers. These #ifdefs are not matched to any #defines, so it's not been used in
years. Okay for mainline?
2005-02-24 Ben Elliston <bje@au.ibm.com>
* ldfile.c: Remove GNU960 conditional code.
* emultempl/gld960.em: Likewise.
* emultempl/gld960c.em: Likewise.
* emultempl/lnk960.em: Likewise.
Index: ldfile.c
===================================================================
RCS file: /home/bje/src-cvs/src/ld/ldfile.c,v
retrieving revision 1.36
diff -u -p -r1.36 ldfile.c
--- ldfile.c 11 Oct 2004 02:40:47 -0000 1.36
+++ ldfile.c 24 Feb 2005 05:35:11 -0000
@@ -507,61 +507,6 @@ ldfile_open_command_file (const char *na
saved_script_handle = ldlex_input_stack;
}
-#ifdef GNU960
-static char *
-gnu960_map_archname (char *name)
-{
- struct tabentry { char *cmd_switch; char *arch; };
- static struct tabentry arch_tab[] =
- {
- "", "",
- "KA", "ka",
- "KB", "kb",
- "KC", "mc", /* Synonym for MC */
- "MC", "mc",
- "CA", "ca",
- "SA", "ka", /* Functionally equivalent to KA */
- "SB", "kb", /* Functionally equivalent to KB */
- NULL, ""
- };
- struct tabentry *tp;
-
- for (tp = arch_tab; tp->cmd_switch != NULL; tp++)
- {
- if (! strcmp (name,tp->cmd_switch))
- break;
- }
-
- if (tp->cmd_switch == NULL)
- einfo (_("%P%F: unknown architecture: %s\n"), name);
-
- return tp->arch;
-}
-
-void
-ldfile_add_arch (char *name)
-{
- search_arch_type *new = xmalloc (sizeof (search_arch_type));
-
- if (*name != '\0')
- {
- if (ldfile_output_machine_name[0] != '\0')
- {
- einfo (_("%P%F: target architecture respecified\n"));
- return;
- }
-
- ldfile_output_machine_name = name;
- }
-
- new->next = NULL;
- new->name = gnu960_map_archname (name);
- *search_arch_tail_ptr = new;
- search_arch_tail_ptr = &new->next;
-}
-
-#else /* not GNU960 */
-
void
ldfile_add_arch (const char *in_name)
{
@@ -581,7 +526,6 @@ ldfile_add_arch (const char *in_name)
search_arch_tail_ptr = &new->next;
}
-#endif
/* Set the output architecture. */
Index: emultempl/gld960.em
===================================================================
RCS file: /home/bje/src-cvs/src/ld/emultempl/gld960.em,v
retrieving revision 1.13
diff -u -p -r1.13 gld960.em
--- emultempl/gld960.em 27 Jun 2003 00:38:25 -0000 1.13
+++ emultempl/gld960.em 24 Feb 2005 05:35:11 -0000
@@ -39,29 +39,6 @@ the Free Software Foundation, 59 Temple
#include "ldfile.h"
#include "ldemul.h"
-#ifdef GNU960
-
-static void
-gld960_before_parse (void)
-{
- 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/libbout",
- (const char *) NULL),
- FALSE);
- }
- }
- ldfile_output_architecture = bfd_arch_i960;
-}
-
-#else /* not GNU960 */
-
static void gld960_before_parse (void)
{
char *env ;
@@ -75,9 +52,6 @@ static void gld960_before_parse (void)
ldfile_output_architecture = bfd_arch_i960;
}
-#endif /* GNU960 */
-
-
static void
gld960_set_output_arch (void)
{
@@ -87,13 +61,6 @@ gld960_set_output_arch (void)
static char *
gld960_choose_target (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
{
-#ifdef GNU960
-
- output_filename = "b.out";
- return bfd_make_targ_name(BFD_BOUT_FORMAT, 0);
-
-#else
-
char *from_outside = getenv(TARGET_ENVIRON);
output_filename = "b.out";
@@ -101,8 +68,6 @@ gld960_choose_target (int argc ATTRIBUTE
return from_outside;
return "b.out.little";
-
-#endif
}
static char *
Index: emultempl/gld960c.em
===================================================================
RCS file: /home/bje/src-cvs/src/ld/emultempl/gld960c.em,v
retrieving revision 1.15
diff -u -p -r1.15 gld960c.em
--- emultempl/gld960c.em 3 Jan 2004 11:09:07 -0000 1.15
+++ emultempl/gld960c.em 24 Feb 2005 05:35:11 -0000
@@ -41,29 +41,6 @@ Software Foundation, 59 Temple Place - S
#include "ldfile.h"
#include "ldemul.h"
-#ifdef GNU960
-
-static void
-gld960_before_parse (void)
-{
- 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",
- (const char *) NULL),
- FALSE);
- }
- }
- ldfile_output_architecture = bfd_arch_i960;
-}
-
-#else /* not GNU960 */
-
static void gld960_before_parse (void)
{
char *env ;
@@ -78,9 +55,6 @@ static void gld960_before_parse (void)
ldfile_output_architecture = bfd_arch_i960;
}
-#endif /* GNU960 */
-
-
static void
gld960_set_output_arch (void)
{
@@ -102,13 +76,6 @@ gld960_set_output_arch (void)
static char *
gld960_choose_target (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
{
-#ifdef GNU960
-
- output_filename = "b.out";
- return bfd_make_targ_name(BFD_BOUT_FORMAT, 0);
-
-#else
-
char *from_outside = getenv(TARGET_ENVIRON);
output_filename = "b.out";
@@ -116,8 +83,6 @@ gld960_choose_target (int argc ATTRIBUTE
return from_outside;
return "coff-Intel-little";
-
-#endif
}
static char *
Index: emultempl/lnk960.em
===================================================================
RCS file: /home/bje/src-cvs/src/ld/emultempl/lnk960.em,v
retrieving revision 1.13
diff -u -p -r1.13 lnk960.em
--- emultempl/lnk960.em 27 Jun 2003 00:38:25 -0000 1.13
+++ emultempl/lnk960.em 24 Feb 2005 05:35:11 -0000
@@ -81,32 +81,6 @@ lnk960_syslib (char *name)
}
-#ifdef GNU960
-
-static void
-lnk960_before_parse (void)
-{
- 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);
- }
-
- 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;
-}
-
-#else /* not GNU960 */
-
static void
lnk960_before_parse (void)
{
@@ -125,9 +99,6 @@ lnk960_before_parse (void)
ldfile_output_machine = bfd_mach_i960_core;
}
-#endif /* GNU960 */
-
-
static void
add_on (lib_list_type *list, lang_input_file_enum_type search)
{
@@ -230,12 +201,6 @@ lnk960_set_output_arch (void)
static char *
lnk960_choose_target (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
{
-#ifdef GNU960
-
- return bfd_make_targ_name (BFD_COFF_FORMAT, 0);
-
-#else
-
char *from_outside = getenv (TARGET_ENVIRON);
if (from_outside != (char *) NULL)
return from_outside;
@@ -244,8 +209,6 @@ lnk960_choose_target (int argc ATTRIBUTE
#else
return "coff-Intel-big";
#endif
-#endif
-
}
static char *
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 256 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: remove GNU960 conditional code in ld
2005-02-24 14:32 remove GNU960 conditional code in ld Ben Elliston
@ 2005-02-24 17:43 ` Nick Clifton
0 siblings, 0 replies; 2+ messages in thread
From: Nick Clifton @ 2005-02-24 17:43 UTC (permalink / raw)
To: Ben Elliston; +Cc: binutils
Hi Ben,
> 2005-02-24 Ben Elliston <bje@au.ibm.com>
>
> * ldfile.c: Remove GNU960 conditional code.
> * emultempl/gld960.em: Likewise.
> * emultempl/gld960c.em: Likewise.
> * emultempl/lnk960.em: Likewise.
Approved - please apply.
Cheers
Nick
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-02-24 16:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-02-24 14:32 remove GNU960 conditional code in ld Ben Elliston
2005-02-24 17:43 ` Nick Clifton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).