diff options
| author | David MacKenzie <djm@cygnus> | 1993-07-03 02:01:03 +0000 |
|---|---|---|
| committer | David MacKenzie <djm@cygnus> | 1993-07-03 02:01:03 +0000 |
| commit | 173a0c3d261a0694f4bc612991e7d9e8e9965337 (patch) | |
| tree | 5266854c4ae7057552c95eaff8ef87a8edca3208 /ld/ldlang.c | |
| parent | 56fc37746df0a25faeca007457f00e179074f5ab (diff) | |
| download | gdb-173a0c3d261a0694f4bc612991e7d9e8e9965337.zip gdb-173a0c3d261a0694f4bc612991e7d9e8e9965337.tar.gz gdb-173a0c3d261a0694f4bc612991e7d9e8e9965337.tar.bz2 | |
* ldmain.c (main): Don't add scriptdir to the lib search path.
* genscripts.sh: Put the scripts in the ldscripts directory, not
emulations.
* configure.in (ldscripts): Make, instead of emulations.
* Makefile.in (scriptdir): Take off the "ld" part.
(install, clean, distclean): Use ldscripts, not emulations.
In tests, pass -L., not -Lemulations.
(ldmain.o): Don't pass -DSCRIPTDIR=....
* ldlang.c (lang_process): Add "ldscripts/" to the name of the
default script file.
Diffstat (limited to 'ld/ldlang.c')
| -rw-r--r-- | ld/ldlang.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c index 6b78478..0fa4158 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -2441,10 +2441,10 @@ lang_process () { /* Read the emulation's appropriate default script. */ char *scriptname = ldemul_get_script (); - size_t size = strlen (scriptname) + 3; + size_t size = strlen (scriptname) + 13; char *buf = (char *) ldmalloc(size); - sprintf (buf, "-T%s", scriptname); + sprintf (buf, "-Tldscripts/%s", scriptname); parse_line (buf, 0); free (buf); } @@ -2788,11 +2788,12 @@ lang_statement_append (list, element, field) list->tail = field; } -/* Set the output format type */ +/* Set the output format type. -oformat overrides scripts. */ void -lang_add_output_format (format) +lang_add_output_format (format, from_script) CONST char *format; + int from_script; { - output_target = format; + if (!from_script || output_target == NULL) + output_target = format; } - |