Wed Jan 28 17:45:46 1998 Ian Lance Taylor <ian@cygnus.com>
* configure.in: Remove vfork check. * nlmconv.c: Never include vfork.h. * aclocal.m4, configure, Makefile.in, config.in: Rebuild. * configure.in: Check for mingw32 when deciding whether to build dlltool.
This commit is contained in:
Ian Lance Taylor
parent
c336631bef
commit
1d1a5a53ee
|
|
@ -1,3 +1,19 @@
|
|||
Wed Jan 28 17:45:46 1998 Ian Lance Taylor <ian@cygnus.com>
|
||||
|
||||
* configure.in: Remove vfork check.
|
||||
* nlmconv.c: Never include vfork.h.
|
||||
* aclocal.m4, configure, Makefile.in, config.in: Rebuild.
|
||||
|
||||
Wed Jan 28 17:43:02 1998 J.J. van der Heijden <J.J.vanderHeijden@student.utwente.nl>
|
||||
|
||||
* configure.in: Check for mingw32 when deciding whether to build
|
||||
dlltool.
|
||||
* dlltool.c: Never include vfork.h.
|
||||
(run): Use pexecute rather than vfork.
|
||||
(gen_lib_file): Check for errors from bfd_set_archive_head and
|
||||
bfd_close. Close all the BFDs in the archive before deleting the
|
||||
temporary files.
|
||||
|
||||
Thu Jan 22 16:22:55 1998 Fred Fish <fnf@cygnus.com>
|
||||
|
||||
* objdump.c (disassemble_bytes): Add flag INSN_HAS_RELOC to tell
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# gives unlimited permission to copy, distribute and modify it.
|
||||
|
||||
|
||||
SHELL = /bin/sh
|
||||
SHELL = @SHELL@
|
||||
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
|
@ -80,6 +80,7 @@ AUTOMAKE_OPTIONS = dejagnu
|
|||
tooldir = $(exec_prefix)/$(target_alias)
|
||||
|
||||
CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
|
||||
|
||||
YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi`
|
||||
YFLAGS = -d
|
||||
|
|
@ -117,9 +118,7 @@ man_MANS = ar.1 nm.1 objdump.1 ranlib.1 size.1 strings.1 strip.1 objcopy.1 \
|
|||
|
||||
PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) $(ADDR2LINE_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@
|
||||
|
||||
bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) \
|
||||
$(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) $(ADDR2LINE_PROG) \
|
||||
@BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@
|
||||
bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) $(ADDR2LINE_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@
|
||||
|
||||
noinst_PROGRAMS = $(NM_PROG) $(STRIP_PROG)
|
||||
|
||||
|
|
@ -345,7 +344,7 @@ OBJECTS = $(nlmconv_OBJECTS) $(srconv_OBJECTS) $(sysdump_OBJECTS) $(coffdump_OBJ
|
|||
default: all
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .dvi .h .info .l .lo .o .ps .texi .texinfo .y
|
||||
.SUFFIXES: .S .c .dvi .h .info .l .lo .o .ps .s .texi .texinfo .y
|
||||
$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
|
||||
|
||||
|
|
@ -361,7 +360,7 @@ config.status: $(srcdir)/configure
|
|||
$(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
|
||||
cd $(srcdir) && $(AUTOCONF)
|
||||
|
||||
config.h: stamp-h
|
||||
config.h: stamp-h ; @:
|
||||
stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \
|
||||
|
|
@ -415,6 +414,12 @@ distclean-noinstPROGRAMS:
|
|||
|
||||
maintainer-clean-noinstPROGRAMS:
|
||||
|
||||
.s.o:
|
||||
$(COMPILE) -c $<
|
||||
|
||||
.S.o:
|
||||
$(COMPILE) -c $<
|
||||
|
||||
.c.o:
|
||||
$(COMPILE) -c $<
|
||||
|
||||
|
|
@ -431,6 +436,13 @@ maintainer-clean-compile:
|
|||
.c.lo:
|
||||
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
|
||||
|
||||
# These are just copies of the above rule.
|
||||
.s.lo:
|
||||
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
|
||||
|
||||
.S.lo:
|
||||
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
|
||||
|
||||
mostlyclean-libtool:
|
||||
rm -f *.lo
|
||||
|
||||
|
|
@ -888,12 +900,6 @@ stamp-under: Makefile
|
|||
$(SHELL) $(srcdir)/../move-if-change underscore.t underscore.c
|
||||
touch stamp-under
|
||||
|
||||
version.o: version.c Makefile
|
||||
$(COMPILE) -c -DVERSION='"$(VERSION)"' $(srcdir)/version.c
|
||||
|
||||
bucomm.o: bucomm.c Makefile
|
||||
$(COMPILE) -c -DTARGET='"@target@"' $(srcdir)/bucomm.c
|
||||
|
||||
cplus-dem.o: $(BASEDIR)/libiberty/cplus-dem.c $(INCDIR)/getopt.h
|
||||
$(COMPILE) -c -DMAIN -DVERSION='"$(VERSION)"' $(BASEDIR)/libiberty/cplus-dem.c
|
||||
|
||||
|
|
@ -915,15 +921,15 @@ cplus-dem.o: $(BASEDIR)/libiberty/cplus-dem.c $(INCDIR)/getopt.h
|
|||
# -rm -f $(STRIP_PROG)
|
||||
# -ln $(OBJCOPY_PROG) $(STRIP_PROG)
|
||||
|
||||
sysroff.c: sysinfo sysroff.info
|
||||
./sysinfo -c <$(srcdir)/sysroff.info >sysroff.c
|
||||
./sysinfo -i <$(srcdir)/sysroff.info >>sysroff.c
|
||||
./sysinfo -g <$(srcdir)/sysroff.info >>sysroff.c
|
||||
sysroff.c: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info
|
||||
./sysinfo$(EXEEXT_FOR_BUILD) -c <$(srcdir)/sysroff.info >sysroff.c
|
||||
./sysinfo$(EXEEXT_FOR_BUILD) -i <$(srcdir)/sysroff.info >>sysroff.c
|
||||
./sysinfo$(EXEEXT_FOR_BUILD) -g <$(srcdir)/sysroff.info >>sysroff.c
|
||||
|
||||
sysroff.h: sysinfo sysroff.info
|
||||
./sysinfo -d <$(srcdir)/sysroff.info >sysroff.h
|
||||
sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info
|
||||
./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h
|
||||
|
||||
sysinfo: sysinfo.o syslex.o
|
||||
sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o
|
||||
$(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o
|
||||
|
||||
syslex.o: syslex.c sysinfo.h
|
||||
|
|
|
|||
|
|
@ -102,19 +102,26 @@ AC_REQUIRE([AM_PROG_LD])
|
|||
AC_REQUIRE([AC_PROG_LN_S])
|
||||
|
||||
# Always use our own libtool.
|
||||
LIBTOOL='$(top_builddir)/libtool'
|
||||
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
AC_SUBST(LIBTOOL)
|
||||
|
||||
dnl CYGNUS LOCAL arguments to enable-shared
|
||||
dnl Allow the --disable-shared flag to stop us from building shared libs.
|
||||
AC_ARG_ENABLE(shared,
|
||||
[ --enable-shared build shared libraries [default=yes]],
|
||||
[if test "$enableval" = no; then
|
||||
enable_shared=no
|
||||
else
|
||||
enable_shared=yes
|
||||
fi])
|
||||
[p=${PACKAGE-bogus-package-name}
|
||||
case "$enableval" in
|
||||
yes) enable_shared=yes ;;
|
||||
no) enable_shared=no ;;
|
||||
# The value of $p (aka $PACKAGE) is assumed to come from AM_INIT_AUTOMAKE.
|
||||
# If it didn't, it'll be `bogus-package-name', thus making this condition
|
||||
# not be used.
|
||||
*$p*) enable_shared=yes ;;
|
||||
*) shared=no ;;
|
||||
esac])
|
||||
libtool_shared=
|
||||
test "$enable_shared" = no && libtool_shared=" --disable-shared"
|
||||
dnl END CYGNUS LOCAL
|
||||
|
||||
dnl Allow the --disable-static flag to stop us from building static libs.
|
||||
AC_ARG_ENABLE(static,
|
||||
|
|
@ -173,10 +180,7 @@ else
|
|||
fi
|
||||
AC_CACHE_VAL(ac_cv_path_LD,
|
||||
[case "$LD" in
|
||||
/*)
|
||||
ac_cv_path_LD="$LD" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
"")
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
||||
for ac_dir in $PATH; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
|
|
@ -194,6 +198,9 @@ AC_CACHE_VAL(ac_cv_path_LD,
|
|||
done
|
||||
IFS="$ac_save_ifs"
|
||||
;;
|
||||
*)
|
||||
ac_cv_path_LD="$LD" # Let the user override the test with a path.
|
||||
;;
|
||||
esac])
|
||||
LD="$ac_cv_path_LD"
|
||||
if test -n "$LD"; then
|
||||
|
|
@ -267,11 +274,9 @@ AC_DEFUN(AM_MAINTAINER_MODE,
|
|||
# Otherwise set it to "no".
|
||||
|
||||
dnl AM_CYGWIN32()
|
||||
dnl You might think we can do this by checking for a cygwin32-specific
|
||||
dnl cpp define.
|
||||
AC_DEFUN(AM_CYGWIN32,
|
||||
[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32,
|
||||
[AC_TRY_COMPILE(,[int main () { return __CYGWIN32__; }],
|
||||
[AC_TRY_COMPILE(,[return __CYGWIN32__;],
|
||||
am_cv_cygwin32=yes, am_cv_cygwin32=no)
|
||||
rm -f conftest*])
|
||||
CYGWIN32=
|
||||
|
|
@ -286,10 +291,11 @@ dnl This knows we add .exe if we're building in the Cygwin32
|
|||
dnl environment. But if we're not, then it compiles a test program
|
||||
dnl to see if there is a suffix for executables.
|
||||
AC_DEFUN(AM_EXEEXT,
|
||||
dnl AC_REQUIRE([AC_PROG_CC])AC_REQUIRE([AM_CYGWIN32])
|
||||
[AC_REQUIRE([AM_CYGWIN32])
|
||||
AC_REQUIRE([AM_MINGW32])
|
||||
AC_MSG_CHECKING([for executable suffix])
|
||||
[AC_CACHE_VAL(am_cv_exeext,
|
||||
[if test "$CYGWIN32" = yes; then
|
||||
AC_CACHE_VAL(am_cv_exeext,[
|
||||
if test "$CYGWIN32" = yes -o "$MINGW32" = yes; then
|
||||
am_cv_exeext=.exe
|
||||
else
|
||||
cat > am_c_test.c << 'EOF'
|
||||
|
|
@ -298,7 +304,7 @@ int main() {
|
|||
}
|
||||
EOF
|
||||
${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
|
||||
am_cv_exeext=`ls am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
|
||||
am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
|
||||
rm -f am_c_test*])
|
||||
test x"${am_cv_exeext}" = x && am_cv_exeext=no
|
||||
fi
|
||||
|
|
@ -307,3 +313,16 @@ test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext}
|
|||
AC_MSG_RESULT(${am_cv_exeext})
|
||||
AC_SUBST(EXEEXT)])
|
||||
|
||||
# Check to see if we're running under Mingw, without using
|
||||
# AC_CANONICAL_*. If so, set output variable MINGW32 to "yes".
|
||||
# Otherwise set it to "no".
|
||||
|
||||
dnl AM_MINGW32()
|
||||
AC_DEFUN(AM_MINGW32,
|
||||
[AC_CACHE_CHECK(for Mingw32 environment, am_cv_mingw32,
|
||||
[AC_TRY_COMPILE(,[return __MINGW32__;],
|
||||
am_cv_mingw32=yes, am_cv_mingw32=no)
|
||||
rm -f conftest*])
|
||||
MINGW32=
|
||||
test "$am_cv_mingw32" = yes && MINGW32=yes])
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
/* nlmconv.c -- NLM conversion program
|
||||
Copyright (C) 1993 Free Software Foundation, Inc.
|
||||
Copyright (C) 1993, 94, 95, 96, 1997 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Binutils.
|
||||
|
||||
|
|
@ -15,30 +15,34 @@ GNU General Public License for more details.
|
|||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||||
|
||||
/* Written by Ian Lance Taylor <ian@cygnus.com>.
|
||||
|
||||
This program can be used to convert any appropriate object file
|
||||
into a NetWare Loadable Module (an NLM). It will accept a linker
|
||||
specification file which is identical to that accepted by the
|
||||
NetWare linker, NLMLINK, except that the INPUT command, normally
|
||||
used to give a list of object files to link together, is not used.
|
||||
This program will convert only a single object file. */
|
||||
NetWare linker, NLMLINK. */
|
||||
|
||||
/* AIX requires this to be the first thing in the file. */
|
||||
#ifndef __GNUC__
|
||||
# ifdef _AIX
|
||||
#pragma alloca
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "bfd.h"
|
||||
#include "libiberty.h"
|
||||
#include "bucomm.h"
|
||||
|
||||
#include <ansidecl.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <ctype.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/file.h>
|
||||
#include <assert.h>
|
||||
#include <getopt.h>
|
||||
#include "bfd.h"
|
||||
#include "libiberty.h"
|
||||
#include "sysdep.h"
|
||||
#include "bucomm.h"
|
||||
|
||||
/* Internal BFD NLM header. */
|
||||
#include "libnlm.h"
|
||||
#include "nlmconv.h"
|
||||
|
|
@ -57,10 +61,6 @@ extern char *strerror ();
|
|||
extern struct tm *localtime ();
|
||||
#endif
|
||||
|
||||
#ifndef getenv
|
||||
extern char *getenv ();
|
||||
#endif
|
||||
|
||||
#ifndef SEEK_SET
|
||||
#define SEEK_SET 0
|
||||
#endif
|
||||
|
|
@ -76,9 +76,6 @@ extern char *getenv ();
|
|||
/* The name used to invoke the program. */
|
||||
char *program_name;
|
||||
|
||||
/* The version number. */
|
||||
extern char *program_version;
|
||||
|
||||
/* Local variables. */
|
||||
|
||||
/* Whether to print out debugging information (currently just controls
|
||||
|
|
@ -137,10 +134,6 @@ static void default_mangle_relocs PARAMS ((bfd *, asection *, arelent ***,
|
|||
long *, char *,
|
||||
bfd_size_type));
|
||||
static char *link_inputs PARAMS ((struct string_list *, char *));
|
||||
static const char *choose_temp_base_try PARAMS ((const char *,
|
||||
const char *));
|
||||
static void choose_temp_base PARAMS ((void));
|
||||
static int pexecute PARAMS ((char *, char *[]));
|
||||
|
||||
#ifdef NLMCONV_I386
|
||||
static void i386_mangle_relocs PARAMS ((bfd *, asection *, arelent ***,
|
||||
|
|
@ -208,6 +201,7 @@ main (argc, argv)
|
|||
xmalloc_set_program_name (program_name);
|
||||
|
||||
bfd_init ();
|
||||
set_default_bfd_target ();
|
||||
|
||||
while ((opt = getopt_long (argc, argv, "dhI:l:O:T:V", long_options,
|
||||
(int *) NULL))
|
||||
|
|
@ -234,8 +228,7 @@ main (argc, argv)
|
|||
header_file = optarg;
|
||||
break;
|
||||
case 'V':
|
||||
printf ("GNU %s version %s\n", program_name, program_version);
|
||||
exit (0);
|
||||
print_version ("nlmconv");
|
||||
/*NOTREACHED*/
|
||||
case 0:
|
||||
break;
|
||||
|
|
@ -343,7 +336,7 @@ main (argc, argv)
|
|||
if (output_format == NULL)
|
||||
output_format = select_output_format (bfd_get_arch (inbfd),
|
||||
bfd_get_mach (inbfd),
|
||||
inbfd->xvec->byteorder_big_p);
|
||||
bfd_big_endian (inbfd));
|
||||
|
||||
assert (output_format != NULL);
|
||||
|
||||
|
|
@ -1125,6 +1118,8 @@ Usage: %s [-dhV] [-I bfdname] [-O bfdname] [-T header-file] [-l linker]\n\
|
|||
[--help] [--version]\n\
|
||||
[in-file [out-file]]\n",
|
||||
program_name);
|
||||
if (status == 0)
|
||||
fprintf (file, "Report bugs to bug-gnu-utils@prep.ai.mit.edu\n");
|
||||
exit (status);
|
||||
}
|
||||
|
||||
|
|
@ -1221,7 +1216,8 @@ setup_sections (inbfd, insec, data_ptr)
|
|||
bfd_section_alignment (inbfd, insec)))
|
||||
bfd_fatal ("set section alignment");
|
||||
|
||||
if (! bfd_set_section_flags (outbfd, outsec, f))
|
||||
if (! bfd_set_section_flags (outbfd, outsec,
|
||||
f | bfd_get_section_flags (outbfd, outsec)))
|
||||
bfd_fatal ("set section flags");
|
||||
|
||||
bfd_set_reloc (outbfd, outsec, (arelent **) NULL, 0);
|
||||
|
|
@ -1848,28 +1844,6 @@ powerpc_build_stubs (inbfd, outbfd, symbols_ptr, symcount_ptr)
|
|||
* POWERPC_STUB_TOC_ENTRY_SIZE))))
|
||||
bfd_fatal ("stub section sizes");
|
||||
}
|
||||
|
||||
/* PowerPC NetWare requires a custom header. We create it here.
|
||||
The first word is the header version number, currently 1. The
|
||||
second word is the timestamp of the input file. Unfortunately,
|
||||
they do not conform to the emergent standard for custom headers.
|
||||
We must fake the version number and timestamp in the offset and
|
||||
length fields. */
|
||||
memcpy (nlm_custom_header (outbfd)->stamp, "CuStHeAd", 8);
|
||||
nlm_custom_header (outbfd)->hdrLength = 0;
|
||||
/* Put version number in dataOffset field. */
|
||||
nlm_custom_header (outbfd)->dataOffset = 1;
|
||||
/* Put timestamp in length field. */
|
||||
{
|
||||
struct stat s;
|
||||
|
||||
if (stat (bfd_get_filename (inbfd), &s) < 0)
|
||||
s.st_mtime = 0;
|
||||
nlm_custom_header (outbfd)->dataLength = s.st_mtime;
|
||||
}
|
||||
/* No data stamp. */
|
||||
memset (nlm_custom_header (outbfd)->dataStamp, 0,
|
||||
sizeof (nlm_custom_header (outbfd)->dataStamp));
|
||||
}
|
||||
|
||||
/* Resolve all the stubs for PowerPC NetWare. We fill in the contents
|
||||
|
|
@ -1949,7 +1923,7 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents,
|
|||
char *contents;
|
||||
bfd_size_type contents_size;
|
||||
{
|
||||
const reloc_howto_type *toc_howto;
|
||||
reloc_howto_type *toc_howto;
|
||||
long reloc_count;
|
||||
register arelent **relocs;
|
||||
register long i;
|
||||
|
|
@ -1963,8 +1937,8 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents,
|
|||
going to write out whatever we return in the contents field. */
|
||||
if (strcmp (bfd_get_section_name (insec->owner, insec), ".got") == 0)
|
||||
memset (contents + powerpc_initial_got_size, 0,
|
||||
(bfd_get_section_size_after_reloc (insec)
|
||||
- powerpc_initial_got_size));
|
||||
(size_t) (bfd_get_section_size_after_reloc (insec)
|
||||
- powerpc_initial_got_size));
|
||||
|
||||
reloc_count = *reloc_count_ptr;
|
||||
relocs = *relocs_ptr;
|
||||
|
|
@ -1972,11 +1946,30 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents,
|
|||
{
|
||||
arelent *rel;
|
||||
asymbol *sym;
|
||||
bfd_vma symvalue;
|
||||
bfd_vma sym_value;
|
||||
|
||||
rel = *relocs++;
|
||||
sym = *rel->sym_ptr_ptr;
|
||||
|
||||
/* Convert any relocs against the .bss section into relocs
|
||||
against the .data section. */
|
||||
if (strcmp (bfd_get_section_name (outbfd, bfd_get_section (sym)),
|
||||
NLM_UNINITIALIZED_DATA_NAME) == 0)
|
||||
{
|
||||
asection *datasec;
|
||||
|
||||
datasec = bfd_get_section_by_name (outbfd,
|
||||
NLM_INITIALIZED_DATA_NAME);
|
||||
if (datasec != NULL)
|
||||
{
|
||||
rel->addend += (bfd_get_section_vma (outbfd,
|
||||
bfd_get_section (sym))
|
||||
+ sym->value);
|
||||
rel->sym_ptr_ptr = datasec->symbol_ptr_ptr;
|
||||
sym = *rel->sym_ptr_ptr;
|
||||
}
|
||||
}
|
||||
|
||||
/* We must be able to resolve all PC relative relocs at this
|
||||
point. If we get a branch to an undefined symbol we build a
|
||||
stub, since NetWare will resolve undefined symbols into a
|
||||
|
|
@ -2029,14 +2022,14 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents,
|
|||
symbol value. The symbol will be start of the TOC section
|
||||
(which is named .got). We do want to include the addend. */
|
||||
if (rel->howto == toc_howto)
|
||||
symvalue = 0;
|
||||
sym_value = 0;
|
||||
else
|
||||
symvalue = sym->value;
|
||||
sym_value = sym->value;
|
||||
|
||||
/* If this is a relocation against a symbol with a value, or
|
||||
there is a reloc addend, we need to update the addend in the
|
||||
object file. */
|
||||
if (symvalue + rel->addend != 0)
|
||||
if (sym_value + rel->addend != 0)
|
||||
{
|
||||
bfd_vma val;
|
||||
|
||||
|
|
@ -2047,7 +2040,7 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents,
|
|||
(bfd_byte *) contents + rel->address);
|
||||
val = ((val &~ rel->howto->dst_mask)
|
||||
| (((val & rel->howto->src_mask)
|
||||
+ symvalue
|
||||
+ sym_value
|
||||
+ rel->addend)
|
||||
& rel->howto->dst_mask));
|
||||
if ((bfd_signed_vma) val < - 0x8000
|
||||
|
|
@ -2063,7 +2056,7 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents,
|
|||
(bfd_byte *) contents + rel->address);
|
||||
val = ((val &~ rel->howto->dst_mask)
|
||||
| (((val & rel->howto->src_mask)
|
||||
+ symvalue
|
||||
+ sym_value
|
||||
+ rel->addend)
|
||||
& rel->howto->dst_mask));
|
||||
bfd_put_32 (outbfd, val, (bfd_byte *) contents + rel->address);
|
||||
|
|
@ -2073,7 +2066,8 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents,
|
|||
abort ();
|
||||
}
|
||||
|
||||
rel->sym_ptr_ptr = bfd_get_section (sym)->symbol_ptr_ptr;
|
||||
if (! bfd_is_und_section (bfd_get_section (sym)))
|
||||
rel->sym_ptr_ptr = bfd_get_section (sym)->symbol_ptr_ptr;
|
||||
rel->addend = 0;
|
||||
}
|
||||
|
||||
|
|
@ -2117,12 +2111,14 @@ link_inputs (inputs, ld)
|
|||
size_t i;
|
||||
int pid;
|
||||
int status;
|
||||
char *errfmt;
|
||||
char *errarg;
|
||||
|
||||
c = 0;
|
||||
for (q = inputs; q != NULL; q = q->next)
|
||||
++c;
|
||||
|
||||
argv = (char **) alloca (c + 5);
|
||||
argv = (char **) alloca ((c + 5) * sizeof(char *));
|
||||
|
||||
#ifndef __MSDOS__
|
||||
if (ld == NULL)
|
||||
|
|
@ -2148,13 +2144,13 @@ link_inputs (inputs, ld)
|
|||
if (ld == NULL)
|
||||
ld = (char *) LD_NAME;
|
||||
|
||||
choose_temp_base ();
|
||||
temp_filename = choose_temp_base ();
|
||||
|
||||
unlink_on_exit = xmalloc (strlen (temp_filename) + 3);
|
||||
sprintf (unlink_on_exit, "%s.O", temp_filename);
|
||||
|
||||
argv[0] = ld;
|
||||
argv[1] = (char *) "-r";
|
||||
argv[1] = (char *) "-Ur";
|
||||
argv[2] = (char *) "-o";
|
||||
argv[3] = unlink_on_exit;
|
||||
i = 4;
|
||||
|
|
@ -2169,11 +2165,19 @@ link_inputs (inputs, ld)
|
|||
fprintf (stderr, "\n");
|
||||
}
|
||||
|
||||
pid = pexecute (ld, argv);
|
||||
|
||||
if (waitpid (pid, &status, 0) < 0)
|
||||
pid = pexecute (ld, argv, program_name, (char *) NULL, &errfmt, &errarg,
|
||||
PEXECUTE_SEARCH | PEXECUTE_ONE);
|
||||
if (pid == -1)
|
||||
{
|
||||
perror ("waitpid");
|
||||
fprintf (stderr, "%s: execution of %s failed: ", program_name, ld);
|
||||
fprintf (stderr, errfmt, errarg);
|
||||
unlink (unlink_on_exit);
|
||||
exit (1);
|
||||
}
|
||||
|
||||
if (pwait (pid, &status, 0) < 0)
|
||||
{
|
||||
perror ("pwait");
|
||||
unlink (unlink_on_exit);
|
||||
exit (1);
|
||||
}
|
||||
|
|
@ -2187,162 +2191,3 @@ link_inputs (inputs, ld)
|
|||
|
||||
return unlink_on_exit;
|
||||
}
|
||||
|
||||
/* Choose a temporary file name. Stolen from gcc.c. */
|
||||
|
||||
static const char *
|
||||
choose_temp_base_try (try, base)
|
||||
const char *try;
|
||||
const char *base;
|
||||
{
|
||||
const char *rv;
|
||||
|
||||
if (base)
|
||||
rv = base;
|
||||
else if (try == NULL)
|
||||
rv = NULL;
|
||||
else if (access (try, R_OK | W_OK) != 0)
|
||||
rv = NULL;
|
||||
else
|
||||
rv = try;
|
||||
return rv;
|
||||
}
|
||||
|
||||
static void
|
||||
choose_temp_base ()
|
||||
{
|
||||
const char *base = NULL;
|
||||
int len;
|
||||
|
||||
base = choose_temp_base_try (getenv ("TMPDIR"), base);
|
||||
base = choose_temp_base_try (getenv ("TMP"), base);
|
||||
base = choose_temp_base_try (getenv ("TEMP"), base);
|
||||
|
||||
#ifdef P_tmpdir
|
||||
base = choose_temp_base_try (P_tmpdir, base);
|
||||
#endif
|
||||
|
||||
base = choose_temp_base_try ("/usr/tmp", base);
|
||||
base = choose_temp_base_try ("/tmp", base);
|
||||
|
||||
/* If all else fails, use the current directory! */
|
||||
if (base == NULL)
|
||||
base = "./";
|
||||
|
||||
len = strlen (base);
|
||||
temp_filename = xmalloc (len + sizeof("/ccXXXXXX") + 1);
|
||||
strcpy (temp_filename, base);
|
||||
if (len > 0 && temp_filename[len-1] != '/')
|
||||
temp_filename[len++] = '/';
|
||||
strcpy (temp_filename + len, "ccXXXXXX");
|
||||
|
||||
mktemp (temp_filename);
|
||||
if (*temp_filename == '\0')
|
||||
abort ();
|
||||
}
|
||||
|
||||
/* Execute a job. Stolen from gcc.c. */
|
||||
|
||||
#ifndef OS2
|
||||
#ifdef __MSDOS__
|
||||
|
||||
static int
|
||||
pexecute (program, argv)
|
||||
char *program;
|
||||
char *argv[];
|
||||
{
|
||||
char *scmd, *rf;
|
||||
FILE *argfile;
|
||||
int i;
|
||||
|
||||
scmd = (char *)malloc (strlen (program) + strlen (temp_filename) + 10);
|
||||
rf = scmd + strlen(program) + 2 + el;
|
||||
sprintf (scmd, "%s.exe @%s.gp", program, temp_filename);
|
||||
argfile = fopen (rf, "w");
|
||||
if (argfile == 0)
|
||||
pfatal_with_name (rf);
|
||||
|
||||
for (i=1; argv[i]; i++)
|
||||
{
|
||||
char *cp;
|
||||
for (cp = argv[i]; *cp; cp++)
|
||||
{
|
||||
if (*cp == '"' || *cp == '\'' || *cp == '\\' || isspace (*cp))
|
||||
fputc ('\\', argfile);
|
||||
fputc (*cp, argfile);
|
||||
}
|
||||
fputc ('\n', argfile);
|
||||
}
|
||||
fclose (argfile);
|
||||
|
||||
i = system (scmd);
|
||||
|
||||
remove (rf);
|
||||
|
||||
if (i == -1)
|
||||
{
|
||||
perror (program);
|
||||
return MIN_FATAL_STATUS << 8;
|
||||
}
|
||||
|
||||
return i << 8;
|
||||
}
|
||||
|
||||
#else /* not __MSDOS__ */
|
||||
|
||||
static int
|
||||
pexecute (program, argv)
|
||||
char *program;
|
||||
char *argv[];
|
||||
{
|
||||
int pid;
|
||||
int retries, sleep_interval;
|
||||
|
||||
/* Fork a subprocess; wait and retry if it fails. */
|
||||
sleep_interval = 1;
|
||||
for (retries = 0; retries < 4; retries++)
|
||||
{
|
||||
pid = vfork ();
|
||||
if (pid >= 0)
|
||||
break;
|
||||
sleep (sleep_interval);
|
||||
sleep_interval *= 2;
|
||||
}
|
||||
|
||||
switch (pid)
|
||||
{
|
||||
case -1:
|
||||
#ifdef vfork
|
||||
perror ("fork");
|
||||
#else
|
||||
perror ("vfork");
|
||||
#endif
|
||||
exit (1);
|
||||
/* NOTREACHED */
|
||||
return 0;
|
||||
|
||||
case 0: /* child */
|
||||
/* Exec the program. */
|
||||
execvp (program, argv);
|
||||
perror (program);
|
||||
exit (1);
|
||||
/* NOTREACHED */
|
||||
return 0;
|
||||
|
||||
default:
|
||||
/* Return child's process number. */
|
||||
return pid;
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* not __MSDOS__ */
|
||||
#else /* not OS2 */
|
||||
|
||||
static int
|
||||
pexecute (program, argv)
|
||||
char *program;
|
||||
char *argv[];
|
||||
{
|
||||
return spawnvp (1, program, argv);
|
||||
}
|
||||
#endif /* not OS2 */
|
||||
|
|
|
|||
Loading…
Reference in New Issue