diff options
| author | Alan Modra <amodra@gmail.com> | 2018-04-16 15:11:22 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2018-04-16 15:11:22 +0930 |
| commit | b4b594e304d44458e25e106ddb4824a37aaf556c (patch) | |
| tree | 56141c32290d4aa4c12ccf1bb1aae631cca7ad39 /binutils | |
| parent | fceadf09517d8b37a0fa77852e26a789fc160d94 (diff) | |
| download | gdb-b4b594e304d44458e25e106ddb4824a37aaf556c.zip gdb-b4b594e304d44458e25e106ddb4824a37aaf556c.tar.gz gdb-b4b594e304d44458e25e106ddb4824a37aaf556c.tar.bz2 | |
Remove netware support
include/
* nlm/ChangeLog-9315: Delete.
* nlm/alpha-ext.h: Delete.
* nlm/common.h: Delete.
* nlm/external.h: Delete.
* nlm/i386-ext.h: Delete.
* nlm/internal.h: Delete.
* nlm/ppc-ext.h: Delete.
* nlm/sparc32-ext.h: Delete.
bfd/
* Makefile.am: Remove netware support.
* bfd-in.h: Likewise.
* bfd.c: Likewise.
* config.bfd: Likewise.
* configure.ac: Likewise.
* doc/bfdint.texi: Likewise.
* ecoff.c: Likewise.
* targets.c: Likewise.
* libnlm.h: Delete.
* nlm-target.h: Delete.
* nlm.c: Delete.
* nlm32-alpha.c: Delete.
* nlm32-i386.c: Delete.
* nlm32-ppc.c: Delete.
* nlm32-sparc.c: Delete.
* nlm32.c: Delete.
* nlm64.c: Delete.
* nlmcode.h: Delete.
* nlmswap.h: Delete.
* Makefile.in: Regenerate.
* bfd-in2.h: Regenerate.
* configure: Regenerate.
* po/SRC-POTFILES.in: Regenerate.
binutils/
* .gitignore: Remove netware support.
* Makefile.am: Likewise.
* configure.ac: Likewise.
* doc/Makefile.am: Likewise.
* doc/binutils.texi: Likewise.
* testsuite/binutils-all/nm.exp: Likewise.
* nlmconv.c: Delete.
* nlmconv.h: Delete.
* nlmheader.y: Delete.
* Makefile.in: Regenerate.
* configure: Regenerate.
* doc/Makefile.in: Regenerate.
* po/POTFILES.in: Regenerate.
gas/
* Makefile.am: Remove netware support.
* config/tc-i386.c: Likewise.
* configure.tgt: Likewise.
* config/te-netware.h: Delete.
* Makefile.in: Regenerate.
* po/POTFILES.in: Regenerate.
gprof/
* corefile.c: Remove netware support.
ld/
* Makefile.am: Remove netware support.
* configure.tgt: Likewise.
* testsuite/ld-powerpc/powerpc.exp: Likewise.
* emulparams/i386nw.sh: Delete.
* emulparams/ppcnw.sh: Delete.
* scripttempl/nw.sc: Delete.
* Makefile.in: Regenerate.
* po/BLD-POTFILES.in: Regenerate.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/.gitignore | 4 | ||||
| -rw-r--r-- | binutils/ChangeLog | 16 | ||||
| -rw-r--r-- | binutils/Makefile.am | 45 | ||||
| -rw-r--r-- | binutils/Makefile.in | 121 | ||||
| -rwxr-xr-x | binutils/configure | 31 | ||||
| -rw-r--r-- | binutils/configure.ac | 27 | ||||
| -rw-r--r-- | binutils/doc/Makefile.am | 8 | ||||
| -rw-r--r-- | binutils/doc/Makefile.in | 10 | ||||
| -rw-r--r-- | binutils/doc/binutils.texi | 110 | ||||
| -rw-r--r-- | binutils/nlmconv.c | 2166 | ||||
| -rw-r--r-- | binutils/nlmconv.h | 86 | ||||
| -rw-r--r-- | binutils/nlmheader.y | 959 | ||||
| -rw-r--r-- | binutils/po/POTFILES.in | 2 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/nm.exp | 7 |
14 files changed, 68 insertions, 3524 deletions
diff --git a/binutils/.gitignore b/binutils/.gitignore index 1934ea0..321aa29 100644 --- a/binutils/.gitignore +++ b/binutils/.gitignore @@ -6,7 +6,6 @@ /dlltool /dllwrap /elfedit -/nlmconv /nm-new /objcopy /objdump @@ -29,8 +28,6 @@ /defparse.h /mcparse.c /mcparse.h -/nlmheader.c -/nlmheader.h /rcparse.c /rcparse.h /sysinfo.c @@ -45,7 +42,6 @@ /doc/cxxfilt.man /doc/dlltool.1 /doc/elfedit.1 -/doc/nlmconv.1 /doc/nm.1 /doc/objcopy.1 /doc/objdump.1 diff --git a/binutils/ChangeLog b/binutils/ChangeLog index ba26a67..92db71b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,21 @@ 2018-04-16 Alan Modra <amodra@gmail.com> + * .gitignore: Remove netware support. + * Makefile.am: Likewise. + * configure.ac: Likewise. + * doc/Makefile.am: Likewise. + * doc/binutils.texi: Likewise. + * testsuite/binutils-all/nm.exp: Likewise. + * nlmconv.c: Delete. + * nlmconv.h: Delete. + * nlmheader.y: Delete. + * Makefile.in: Regenerate. + * configure: Regenerate. + * doc/Makefile.in: Regenerate. + * po/POTFILES.in: Regenerate. + +2018-04-16 Alan Modra <amodra@gmail.com> + * testsuite/binutils-all/objdump.exp: Remove tahoe support. 2018-04-14 Alan Modra <amodra@gmail.com> diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 84cef69..ffcaf82 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -78,7 +78,6 @@ DEMANGLER_PROG=cxxfilt ADDR2LINE_PROG=addr2line -NLMCONV_PROG=nlmconv DLLTOOL_PROG=dlltool WINDRES_PROG=windres WINDMC_PROG=windmc @@ -86,7 +85,7 @@ DLLWRAP_PROG=dllwrap SRCONV_PROG=srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT) -bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) $(RANLIB_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ @BUILD_WINDMC@ $(ADDR2LINE_PROG) $(READELF_PROG) $(ELFEDIT_PROG) @BUILD_DLLWRAP@ +bin_PROGRAMS = $(SIZE_PROG) $(OBJDUMP_PROG) $(AR_PROG) $(STRINGS_PROG) $(RANLIB_PROG) $(OBJCOPY_PROG) @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ @BUILD_WINDMC@ $(ADDR2LINE_PROG) $(READELF_PROG) $(ELFEDIT_PROG) @BUILD_DLLWRAP@ bin_SCRIPTS = @BUILD_INSTALL_MISC@ EXTRA_SCRIPTS = embedspu @@ -102,7 +101,7 @@ TEST_PROGS = $(BFDTEST1_PROG) $(BFDTEST2_PROG) RENAMED_PROGS = $(NM_PROG) $(STRIP_PROG) $(DEMANGLER_PROG) noinst_PROGRAMS = $(RENAMED_PROGS) $(TEST_PROGS) @BUILD_MISC@ -EXTRA_PROGRAMS = $(NLMCONV_PROG) srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(WINDMC_PROG) $(DLLWRAP_PROG) +EXTRA_PROGRAMS = srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(WINDMC_PROG) $(DLLWRAP_PROG) # Stuff that goes in tooldir/ if appropriate. TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump objcopy readelf @@ -119,7 +118,7 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ HFILES = \ arsup.h binemul.h bucomm.h budbg.h \ - coffgrok.h debug.h dlltool.h dwarf.h elfcomm.h nlmconv.h \ + coffgrok.h debug.h dlltool.h dwarf.h elfcomm.h \ objdump.h sysdep.h unwind-ia64.h windres.h winduni.h windint.h \ windmc.h @@ -132,7 +131,7 @@ CFILES = \ dwarf.c debug.c dlltool.c dllwrap.c \ elfcomm.c emul_aix.c emul_vanilla.c filemode.c \ ieee.c is-ranlib.c is-strip.c maybe-ranlib.c maybe-strip.c \ - nlmconv.c nm.c not-ranlib.c not-strip.c \ + nm.c not-ranlib.c not-strip.c \ objcopy.c objdump.c prdbg.c \ od-xcoff.c od-macho.c \ rclex.c rdcoff.c rddbg.c readelf.c rename.c \ @@ -144,7 +143,7 @@ CFILES = \ GENERATED_CFILES = \ arparse.c arlex.c sysroff.c sysinfo.c syslex.c \ - defparse.c deflex.c nlmheader.c rcparse.c mcparse.c + defparse.c deflex.c rcparse.c mcparse.c DEBUG_SRCS = rddbg.c debug.c stabs.c ieee.c rdcoff.c WRITE_DEBUG_SRCS = $(DEBUG_SRCS) wrstabs.c @@ -216,7 +215,6 @@ strip_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) ranlib_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) cxxfilt_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) objcopy_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) -nlmconv_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) srconv_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) sysdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) coffdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) @@ -388,18 +386,6 @@ endif $(COMPILE) -c `test -f deflex.c || echo $(srcdir)/`deflex.c $(NO_WERROR) endif -nlmheader.@OBJEXT@: nlmheader.c -if am__fastdepCC - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f nlmheader.c || echo $(srcdir)/`nlmheader.c $(NO_WERROR) - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -else -if AMDEP - source='nlmheader.c' object='$@' libtool=no @AMDEPBACKSLASH@ - DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -endif - $(COMPILE) -c `test -f nlmheader.c || echo $(srcdir)/`nlmheader.c $(NO_WERROR) -endif - rcparse.@OBJEXT@: rcparse.c if am__fastdepCC $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f rcparse.c || echo $(srcdir)/`rcparse.c $(NO_WERROR) @@ -483,25 +469,6 @@ coffdump_SOURCES = coffdump.c coffgrok.c $(BULIBS) sysdump_SOURCES = sysdump.c $(BULIBS) sysdump.@OBJEXT@: sysroff.c -# coff/sym.h and coff/ecoff.h won't be found by the automatic dependency -# scripts, since they are only included conditionally. -nlmconv.@OBJEXT@: nlmconv.c -if am__fastdepCC - ldname=`echo ld | sed '$(transform)'`; \ - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ \ - -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -else -if AMDEP - source='nlmconv.c' object='$@' libtool=no @AMDEPBACKSLASH@ - DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -endif - ldname=`echo ld | sed '$(transform)'`; \ - $(COMPILE) -c -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c -endif - -nlmconv_SOURCES = nlmconv.c nlmheader.y $(BULIBS) - windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.c \ winduni.c resres.c $(BULIBS) windres_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) @@ -514,7 +481,7 @@ dllwrap_SOURCES = dllwrap.c version.c dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL) -EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ +EXTRA_DIST = arparse.c arparse.h arlex.c sysinfo.c sysinfo.h \ syslex.c deflex.c defparse.h defparse.c rcparse.h rcparse.c \ mcparse.h mcparse.c embedspu.sh diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 648592c..ccecdf7 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -71,23 +71,23 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -bin_PROGRAMS = $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \ - $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \ - @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ \ - @BUILD_WINDMC@ $(am__EXEEXT_12) $(am__EXEEXT_13) \ - $(am__EXEEXT_14) @BUILD_DLLWRAP@ -noinst_PROGRAMS = $(am__EXEEXT_18) $(am__EXEEXT_21) @BUILD_MISC@ -EXTRA_PROGRAMS = $(am__EXEEXT_1) srconv$(EXEEXT) sysdump$(EXEEXT) \ - coffdump$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3) \ - $(am__EXEEXT_4) $(am__EXEEXT_5) +bin_PROGRAMS = $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ + $(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \ + @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ @BUILD_WINDMC@ \ + $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \ + @BUILD_DLLWRAP@ $(am__empty) +noinst_PROGRAMS = $(am__EXEEXT_17) $(am__EXEEXT_20) @BUILD_MISC@ +EXTRA_PROGRAMS = srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT) \ + $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ + $(am__EXEEXT_4) subdir = . DIST_COMMON = NEWS README ChangeLog $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/config.in \ $(srcdir)/../mkinstalldirs $(top_srcdir)/po/Make-in arparse.h \ - arparse.c arlex.c defparse.h defparse.c deflex.c nlmheader.h \ - nlmheader.c arparse.h arparse.c arlex.c mcparse.h mcparse.c \ - rcparse.h rcparse.c $(srcdir)/../depcomp $(srcdir)/../ylwrap + arparse.c arlex.c defparse.h defparse.c deflex.c arparse.h \ + arparse.c arlex.c mcparse.h mcparse.c rcparse.h rcparse.c \ + $(srcdir)/../depcomp $(srcdir)/../ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/../config/acx.m4 \ @@ -117,28 +117,27 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = po/Makefile.in CONFIG_CLEAN_VPATH_FILES = -am__EXEEXT_1 = nlmconv$(EXEEXT) -am__EXEEXT_2 = dlltool$(EXEEXT) -am__EXEEXT_3 = windres$(EXEEXT) -am__EXEEXT_4 = windmc$(EXEEXT) -am__EXEEXT_5 = dllwrap$(EXEEXT) -am__EXEEXT_6 = size$(EXEEXT) -am__EXEEXT_7 = objdump$(EXEEXT) -am__EXEEXT_8 = ar$(EXEEXT) -am__EXEEXT_9 = strings$(EXEEXT) -am__EXEEXT_10 = ranlib$(EXEEXT) -am__EXEEXT_11 = objcopy$(EXEEXT) -am__EXEEXT_12 = addr2line$(EXEEXT) -am__EXEEXT_13 = readelf$(EXEEXT) -am__EXEEXT_14 = elfedit$(EXEEXT) +am__EXEEXT_1 = dlltool$(EXEEXT) +am__EXEEXT_2 = windres$(EXEEXT) +am__EXEEXT_3 = windmc$(EXEEXT) +am__EXEEXT_4 = dllwrap$(EXEEXT) +am__EXEEXT_5 = size$(EXEEXT) +am__EXEEXT_6 = objdump$(EXEEXT) +am__EXEEXT_7 = ar$(EXEEXT) +am__EXEEXT_8 = strings$(EXEEXT) +am__EXEEXT_9 = ranlib$(EXEEXT) +am__EXEEXT_10 = objcopy$(EXEEXT) +am__EXEEXT_11 = addr2line$(EXEEXT) +am__EXEEXT_12 = readelf$(EXEEXT) +am__EXEEXT_13 = elfedit$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" -am__EXEEXT_15 = nm-new$(EXEEXT) -am__EXEEXT_16 = strip-new$(EXEEXT) -am__EXEEXT_17 = cxxfilt$(EXEEXT) -am__EXEEXT_18 = $(am__EXEEXT_15) $(am__EXEEXT_16) $(am__EXEEXT_17) -am__EXEEXT_19 = bfdtest1$(EXEEXT) -am__EXEEXT_20 = bfdtest2$(EXEEXT) -am__EXEEXT_21 = $(am__EXEEXT_19) $(am__EXEEXT_20) +am__EXEEXT_14 = nm-new$(EXEEXT) +am__EXEEXT_15 = strip-new$(EXEEXT) +am__EXEEXT_16 = cxxfilt$(EXEEXT) +am__EXEEXT_17 = $(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) +am__EXEEXT_18 = bfdtest1$(EXEEXT) +am__EXEEXT_19 = bfdtest2$(EXEEXT) +am__EXEEXT_20 = $(am__EXEEXT_18) $(am__EXEEXT_19) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__objects_1 = bucomm.$(OBJEXT) version.$(OBJEXT) filemode.$(OBJEXT) am_addr2line_OBJECTS = addr2line.$(OBJEXT) $(am__objects_1) @@ -171,10 +170,6 @@ am__objects_2 = elfcomm.$(OBJEXT) am_elfedit_OBJECTS = elfedit.$(OBJEXT) version.$(OBJEXT) \ $(am__objects_2) elfedit_OBJECTS = $(am_elfedit_OBJECTS) -am_nlmconv_OBJECTS = nlmconv.$(OBJEXT) nlmheader.$(OBJEXT) \ - $(am__objects_1) -nlmconv_OBJECTS = $(am_nlmconv_OBJECTS) -nlmconv_LDADD = $(LDADD) am_nm_new_OBJECTS = nm.$(OBJEXT) $(am__objects_1) nm_new_OBJECTS = $(am_nm_new_OBJECTS) nm_new_LDADD = $(LDADD) @@ -273,11 +268,11 @@ LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ SOURCES = $(addr2line_SOURCES) $(ar_SOURCES) $(EXTRA_ar_SOURCES) \ bfdtest1.c bfdtest2.c $(coffdump_SOURCES) $(cxxfilt_SOURCES) \ $(dlltool_SOURCES) $(dllwrap_SOURCES) $(elfedit_SOURCES) \ - $(nlmconv_SOURCES) $(nm_new_SOURCES) $(objcopy_SOURCES) \ - $(objdump_SOURCES) $(EXTRA_objdump_SOURCES) $(ranlib_SOURCES) \ - $(readelf_SOURCES) $(size_SOURCES) $(srconv_SOURCES) \ - $(strings_SOURCES) $(strip_new_SOURCES) $(sysdump_SOURCES) \ - $(windmc_SOURCES) $(windres_SOURCES) + $(nm_new_SOURCES) $(objcopy_SOURCES) $(objdump_SOURCES) \ + $(EXTRA_objdump_SOURCES) $(ranlib_SOURCES) $(readelf_SOURCES) \ + $(size_SOURCES) $(srconv_SOURCES) $(strings_SOURCES) \ + $(strip_new_SOURCES) $(sysdump_SOURCES) $(windmc_SOURCES) \ + $(windres_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -311,7 +306,6 @@ BUILD_DLLTOOL = @BUILD_DLLTOOL@ BUILD_DLLWRAP = @BUILD_DLLWRAP@ BUILD_INSTALL_MISC = @BUILD_INSTALL_MISC@ BUILD_MISC = @BUILD_MISC@ -BUILD_NLMCONV = @BUILD_NLMCONV@ BUILD_SRCONV = @BUILD_SRCONV@ BUILD_WINDMC = @BUILD_WINDMC@ BUILD_WINDRES = @BUILD_WINDRES@ @@ -372,7 +366,6 @@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ -NLMCONV_DEFS = @NLMCONV_DEFS@ NM = @NM@ NMEDIT = @NMEDIT@ NO_WERROR = @NO_WERROR@ @@ -501,7 +494,6 @@ OBJDUMP_PROG = objdump # Note: This one is used as the installed name too, unlike the above. DEMANGLER_PROG = cxxfilt ADDR2LINE_PROG = addr2line -NLMCONV_PROG = nlmconv DLLTOOL_PROG = dlltool WINDRES_PROG = windres WINDMC_PROG = windmc @@ -527,7 +519,7 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ HFILES = \ arsup.h binemul.h bucomm.h budbg.h \ - coffgrok.h debug.h dlltool.h dwarf.h elfcomm.h nlmconv.h \ + coffgrok.h debug.h dlltool.h dwarf.h elfcomm.h \ objdump.h sysdep.h unwind-ia64.h windres.h winduni.h windint.h \ windmc.h @@ -539,7 +531,7 @@ CFILES = \ dwarf.c debug.c dlltool.c dllwrap.c \ elfcomm.c emul_aix.c emul_vanilla.c filemode.c \ ieee.c is-ranlib.c is-strip.c maybe-ranlib.c maybe-strip.c \ - nlmconv.c nm.c not-ranlib.c not-strip.c \ + nm.c not-ranlib.c not-strip.c \ objcopy.c objdump.c prdbg.c \ od-xcoff.c od-macho.c \ rclex.c rdcoff.c rddbg.c readelf.c rename.c \ @@ -551,7 +543,7 @@ CFILES = \ GENERATED_CFILES = \ arparse.c arlex.c sysroff.c sysinfo.c syslex.c \ - defparse.c deflex.c nlmheader.c rcparse.c mcparse.c + defparse.c deflex.c rcparse.c mcparse.c DEBUG_SRCS = rddbg.c debug.c stabs.c ieee.c rdcoff.c WRITE_DEBUG_SRCS = $(DEBUG_SRCS) wrstabs.c @@ -595,7 +587,6 @@ strip_new_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) ranlib_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) cxxfilt_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) objcopy_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) -nlmconv_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) srconv_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) sysdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) coffdump_DEPENDENCIES = $(LIBINTL_DEP) $(LIBIBERTY) $(BFDLIB) @@ -637,7 +628,6 @@ dlltool_SOURCES = dlltool.c defparse.y deflex.l $(BULIBS) dlltool_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) coffdump_SOURCES = coffdump.c coffgrok.c $(BULIBS) sysdump_SOURCES = sysdump.c $(BULIBS) -nlmconv_SOURCES = nlmconv.c nlmheader.y $(BULIBS) windres_SOURCES = windres.c resrc.c rescoff.c resbin.c rcparse.y rclex.c \ winduni.c resres.c $(BULIBS) @@ -648,7 +638,7 @@ windmc_SOURCES = windmc.c mcparse.y mclex.c \ windmc_LDADD = $(BFDLIB) $(LIBIBERTY) $(LEXLIB) $(LIBINTL) $(LIBICONV) dllwrap_SOURCES = dllwrap.c version.c dllwrap_LDADD = $(LIBIBERTY) $(LIBINTL) -EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ +EXTRA_DIST = arparse.c arparse.h arlex.c sysinfo.c sysinfo.h \ syslex.c deflex.c defparse.h defparse.c rcparse.h rcparse.c \ mcparse.h mcparse.c embedspu.sh @@ -803,12 +793,6 @@ dllwrap$(EXEEXT): $(dllwrap_OBJECTS) $(dllwrap_DEPENDENCIES) $(EXTRA_dllwrap_DEP elfedit$(EXEEXT): $(elfedit_OBJECTS) $(elfedit_DEPENDENCIES) $(EXTRA_elfedit_DEPENDENCIES) @rm -f elfedit$(EXEEXT) $(LINK) $(elfedit_OBJECTS) $(elfedit_LDADD) $(LIBS) -nlmheader.h: nlmheader.c - @if test ! -f $@; then rm -f nlmheader.c; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) nlmheader.c; else :; fi -nlmconv$(EXEEXT): $(nlmconv_OBJECTS) $(nlmconv_DEPENDENCIES) $(EXTRA_nlmconv_DEPENDENCIES) - @rm -f nlmconv$(EXEEXT) - $(LINK) $(nlmconv_OBJECTS) $(nlmconv_LDADD) $(LIBS) nm-new$(EXEEXT): $(nm_new_OBJECTS) $(nm_new_DEPENDENCIES) $(EXTRA_nm_new_DEPENDENCIES) @rm -f nm-new$(EXEEXT) $(LINK) $(nm_new_OBJECTS) $(nm_new_LDADD) $(LIBS) @@ -925,8 +909,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maybe-strip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mclex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mcparse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlmconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlmheader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/not-ranlib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/not-strip.Po@am__quote@ @@ -1211,8 +1193,6 @@ maintainer-clean-generic: -rm -f defparse.h -rm -f mcparse.c -rm -f mcparse.h - -rm -f nlmheader.c - -rm -f nlmheader.h -rm -f rcparse.c -rm -f rcparse.h -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) @@ -1428,13 +1408,6 @@ deflex.@OBJEXT@: deflex.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f deflex.c || echo $(srcdir)/`deflex.c $(NO_WERROR) -nlmheader.@OBJEXT@: nlmheader.c -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f nlmheader.c || echo $(srcdir)/`nlmheader.c $(NO_WERROR) -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nlmheader.c' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f nlmheader.c || echo $(srcdir)/`nlmheader.c $(NO_WERROR) - rcparse.@OBJEXT@: rcparse.c @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `test -f rcparse.c || echo $(srcdir)/`rcparse.c $(NO_WERROR) @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @@ -1479,18 +1452,6 @@ rescoff.@OBJEXT@: @am__fastdepCC_FALSE@ $(COMPILE) -c $(DLLTOOL_DEFS) $(srcdir)/rescoff.c sysdump.@OBJEXT@: sysroff.c -# coff/sym.h and coff/ecoff.h won't be found by the automatic dependency -# scripts, since they are only included conditionally. -nlmconv.@OBJEXT@: nlmconv.c -@am__fastdepCC_TRUE@ ldname=`echo ld | sed '$(transform)'`; \ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ \ -@am__fastdepCC_TRUE@ -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nlmconv.c' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ ldname=`echo ld | sed '$(transform)'`; \ -@am__fastdepCC_FALSE@ $(COMPILE) -c -DLD_NAME="\"$${ldname}\"" @NLMCONV_DEFS@ $(srcdir)/nlmconv.c - diststuff: $(EXTRA_DIST) info all: info mostlyclean-local: diff --git a/binutils/configure b/binutils/configure index 374605d..2e90d60 100755 --- a/binutils/configure +++ b/binutils/configure @@ -614,8 +614,6 @@ BUILD_WINDRES DLLTOOL_DEFS BUILD_DLLTOOL BUILD_SRCONV -BUILD_NLMCONV -NLMCONV_DEFS LTLIBICONV LIBICONV zlibinc @@ -11226,7 +11224,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11229 "configure" +#line 11227 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11332,7 +11330,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11335 "configure" +#line 11333 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14420,8 +14418,6 @@ _ACEOF all_targets=false -BUILD_NLMCONV= -NLMCONV_DEFS= BUILD_SRCONV= BUILD_DLLTOOL= DLLTOOL_DEFS= @@ -14440,9 +14436,7 @@ for targ in $target $canon_targets do if test "x$targ" = "xall"; then all_targets=true - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' BUILD_SRCONV='$(SRCONV_PROG)' - NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC" BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)' BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)' BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)' @@ -14455,25 +14449,6 @@ do od_vectors="$od_vectors objdump_private_desc_xcoff" else case $targ in - i[3-7]86*-*-netware*) - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' - NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386" - ;; - alpha*-*-netware*) - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' - NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_ALPHA" - ;; - powerpc*-*-netware*) - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' - NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_POWERPC" - ;; - sparc*-*-netware*) - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' - NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_SPARC" - ;; - esac - - case $targ in *-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;; esac @@ -14667,8 +14642,6 @@ OBJDUMP_DEFS="${OBJDUMP_DEFS} -DOBJDUMP_PRIVATE_VECTORS=\"${OBJDUMP_PRIVATE_VECT - - cat >>confdefs.h <<_ACEOF #define TARGET "${target}" _ACEOF diff --git a/binutils/configure.ac b/binutils/configure.ac index 430192b..9e4ba6f 100644 --- a/binutils/configure.ac +++ b/binutils/configure.ac @@ -228,8 +228,6 @@ AC_CHECK_HEADER(iconv.h) AM_ICONV all_targets=false -BUILD_NLMCONV= -NLMCONV_DEFS= BUILD_SRCONV= BUILD_DLLTOOL= DLLTOOL_DEFS= @@ -248,9 +246,7 @@ for targ in $target $canon_targets do if test "x$targ" = "xall"; then all_targets=true - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' BUILD_SRCONV='$(SRCONV_PROG)' - NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC" BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)' BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)' BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)' @@ -263,27 +259,6 @@ do od_vectors="$od_vectors objdump_private_desc_xcoff" else case $targ in -changequote(,)dnl - i[3-7]86*-*-netware*) -changequote([,])dnl - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' - NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386" - ;; - alpha*-*-netware*) - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' - NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_ALPHA" - ;; - powerpc*-*-netware*) - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' - NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_POWERPC" - ;; - sparc*-*-netware*) - BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)' - NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_SPARC" - ;; - esac - - case $targ in *-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;; esac @@ -473,8 +448,6 @@ fi OBJDUMP_DEFS="${OBJDUMP_DEFS} -DOBJDUMP_PRIVATE_VECTORS=\"${OBJDUMP_PRIVATE_VECTORS}\"" -AC_SUBST(NLMCONV_DEFS) -AC_SUBST(BUILD_NLMCONV) AC_SUBST(BUILD_SRCONV) AC_SUBST(BUILD_DLLTOOL) AC_SUBST(DLLTOOL_DEFS) diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 0848ee5..0c108db 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -35,7 +35,6 @@ man_MANS = \ addr2line.1 \ ar.1 \ dlltool.1 \ - nlmconv.1 \ nm.1 \ objcopy.1 \ objdump.1 \ @@ -79,13 +78,6 @@ dlltool.1: $(binutils_TEXI) $(binutils_TEXINFOS) mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f dlltool.pod -nlmconv.1: $(binutils_TEXI) $(binutils_TEXINFOS) - touch $@ - -$(TEXI2POD) $(MANCONF) -Dnlmconv < $(binutils_TEXI) > nlmconv.pod - -($(POD2MAN) nlmconv.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ - mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) - rm -f nlmconv.pod - nm.1: $(binutils_TEXI) $(binutils_TEXINFOS) touch $@ -$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) > nm.pod diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 705dab5..88d01d0 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -161,7 +161,6 @@ BUILD_DLLTOOL = @BUILD_DLLTOOL@ BUILD_DLLWRAP = @BUILD_DLLWRAP@ BUILD_INSTALL_MISC = @BUILD_INSTALL_MISC@ BUILD_MISC = @BUILD_MISC@ -BUILD_NLMCONV = @BUILD_NLMCONV@ BUILD_SRCONV = @BUILD_SRCONV@ BUILD_WINDMC = @BUILD_WINDMC@ BUILD_WINDRES = @BUILD_WINDRES@ @@ -222,7 +221,6 @@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ -NLMCONV_DEFS = @NLMCONV_DEFS@ NM = @NM@ NMEDIT = @NMEDIT@ NO_WERROR = @NO_WERROR@ @@ -328,7 +326,6 @@ man_MANS = \ addr2line.1 \ ar.1 \ dlltool.1 \ - nlmconv.1 \ nm.1 \ objcopy.1 \ objdump.1 \ @@ -828,13 +825,6 @@ dlltool.1: $(binutils_TEXI) $(binutils_TEXINFOS) mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) rm -f dlltool.pod -nlmconv.1: $(binutils_TEXI) $(binutils_TEXINFOS) - touch $@ - -$(TEXI2POD) $(MANCONF) -Dnlmconv < $(binutils_TEXI) > nlmconv.pod - -($(POD2MAN) nlmconv.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \ - mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1) - rm -f nlmconv.pod - nm.1: $(binutils_TEXI) $(binutils_TEXINFOS) touch $@ -$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) > nm.pod diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi index caf7f9d..c965200 100644 --- a/binutils/doc/binutils.texi +++ b/binutils/doc/binutils.texi @@ -34,7 +34,6 @@ section entitled ``GNU Free Documentation License''. * c++filt: (binutils)c++filt. Filter to demangle encoded C++ symbols. * cxxfilt: (binutils)c++filt. MS-DOS name for c++filt. * dlltool: (binutils)dlltool. Create files needed to build and use DLLs. -* nlmconv: (binutils)nlmconv. Converts object code into an NLM. * nm: (binutils)nm. List symbols from object files. * objcopy: (binutils)objcopy. Copy and translate object files. * objdump: (binutils)objdump. Display information from object files. @@ -121,9 +120,6 @@ Demangle encoded C++ symbols (on MS-DOS, this program is named @item addr2line Convert addresses into file names and line numbers -@item nlmconv -Convert object code into a Netware Loadable Module - @item windres Manipulate Windows resources @@ -151,7 +147,6 @@ in the section entitled ``GNU Free Documentation License''. * c++filt:: Filter to demangle encoded C++ symbols * cxxfilt: c++filt. MS-DOS name for c++filt * addr2line:: Convert addresses to file and line -* nlmconv:: Converts object code into an NLM * windmc:: Generator for Windows message resources * windres:: Manipulate Windows resources * dlltool:: Create files needed to build and use DLLs @@ -3697,111 +3692,6 @@ Info entries for @file{binutils}. @c man end @end ignore -@node nlmconv -@chapter nlmconv - -@command{nlmconv} converts a relocatable object file into a NetWare -Loadable Module. - -@ignore -@command{nlmconv} currently works with @samp{i386} object -files in @code{coff}, @sc{elf}, or @code{a.out} format, and @sc{SPARC} -object files in @sc{elf}, or @code{a.out} format@footnote{ -@command{nlmconv} should work with any @samp{i386} or @sc{sparc} object -format in the Binary File Descriptor library. It has only been tested -with the above formats.}. -@end ignore - -@quotation -@emph{Warning:} @command{nlmconv} is not always built as part of the binary -utilities, since it is only useful for NLM targets. -@end quotation - -@c man title nlmconv converts object code into an NLM. - -@smallexample -@c man begin SYNOPSIS nlmconv -nlmconv [@option{-I} @var{bfdname}|@option{--input-target=}@var{bfdname}] - [@option{-O} @var{bfdname}|@option{--output-target=}@var{bfdname}] - [@option{-T} @var{headerfile}|@option{--header-file=}@var{headerfile}] - [@option{-d}|@option{--debug}] [@option{-l} @var{linker}|@option{--linker=}@var{linker}] - [@option{-h}|@option{--help}] [@option{-V}|@option{--version}] - @var{infile} @var{outfile} -@c man end -@end smallexample - -@c man begin DESCRIPTION nlmconv - -@command{nlmconv} converts the relocatable @samp{i386} object file -@var{infile} into the NetWare Loadable Module @var{outfile}, optionally -reading @var{headerfile} for NLM header information. For instructions -on writing the NLM command file language used in header files, see the -@samp{linkers} section, @samp{NLMLINK} in particular, of the @cite{NLM -Development and Tools Overview}, which is part of the NLM Software -Developer's Kit (``NLM SDK''), available from Novell, Inc. -@command{nlmconv} uses the @sc{gnu} Binary File Descriptor library to read -@var{infile}; -@ifclear man -see @ref{BFD,,BFD,ld.info,Using LD}, for more information. -@end ifclear - -@command{nlmconv} can perform a link step. In other words, you can list -more than one object file for input if you list them in the definitions -file (rather than simply specifying one input file on the command line). -In this case, @command{nlmconv} calls the linker for you. - -@c man end - -@c man begin OPTIONS nlmconv - -@table @env -@item -I @var{bfdname} -@itemx --input-target=@var{bfdname} -Object format of the input file. @command{nlmconv} can usually determine -the format of a given file (so no default is necessary). -@xref{Target Selection}, for more information. - -@item -O @var{bfdname} -@itemx --output-target=@var{bfdname} -Object format of the output file. @command{nlmconv} infers the output -format based on the input format, e.g. for a @samp{i386} input file the -output format is @samp{nlm32-i386}. -@xref{Target Selection}, for more information. - -@item -T @var{headerfile} -@itemx --header-file=@var{headerfile} -Reads @var{headerfile} for NLM header information. For instructions on -writing the NLM command file language used in header files, see@ see the -@samp{linkers} section, of the @cite{NLM Development and Tools -Overview}, which is part of the NLM Software Developer's Kit, available -from Novell, Inc. - -@item -d -@itemx --debug -Displays (on standard error) the linker command line used by @command{nlmconv}. - -@item -l @var{linker} -@itemx --linker=@var{linker} -Use @var{linker} for any linking. @var{linker} can be an absolute or a -relative pathname. - -@item -h -@itemx --help -Prints a usage summary. - -@item -V -@itemx --version -Prints the version number for @command{nlmconv}. -@end table - -@c man end - -@ignore -@c man begin SEEALSO nlmconv -the Info entries for @file{binutils}. -@c man end -@end ignore - @node windmc @chapter windmc diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c deleted file mode 100644 index 68941f8..0000000 --- a/binutils/nlmconv.c +++ /dev/null @@ -1,2166 +0,0 @@ -/* nlmconv.c -- NLM conversion program - Copyright (C) 1993-2018 Free Software Foundation, Inc. - - This file is part of GNU Binutils. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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., 51 Franklin Street - Fifth Floor, Boston, - MA 02110-1301, 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. */ - -/* AIX requires this to be the first thing in the file. */ -#ifndef __GNUC__ -# ifdef _AIX - #pragma alloca -#endif -#endif - -#include "sysdep.h" -#include "bfd.h" -#include "libiberty.h" -#include "filenames.h" -#include "safe-ctype.h" - -#include "ansidecl.h" -#include <time.h> -#include <assert.h> -#include "getopt.h" - -/* Internal BFD NLM header. */ -#include "libnlm.h" -#include "nlmconv.h" - -#ifdef NLMCONV_ALPHA -#include "coff/sym.h" -#include "coff/ecoff.h" -#endif - -#include "bucomm.h" - -/* If strerror is just a macro, we want to use the one from libiberty - since it will handle undefined values. */ -#undef strerror -extern char *strerror (int); - -#ifndef SEEK_SET -#define SEEK_SET 0 -#endif - -#ifndef R_OK -#define R_OK 4 -#define W_OK 2 -#define X_OK 1 -#endif - -/* Global variables. */ - -/* The name used to invoke the program. */ -char *program_name; - -/* Local variables. */ - -/* Whether to print out debugging information (currently just controls - whether it prints the linker command if there is one). */ -static int debug; - -/* The symbol table. */ -static asymbol **symbols; - -/* A section we create in the output file to hold pointers to where - the sections of the input file end up. We will put a pointer to - this section in the NLM header. These is an entry for each input - section. The format is - null terminated section name - zeroes to adjust to 4 byte boundary - 4 byte section data file pointer - 4 byte section size - We don't need a version number. The way we find this information - is by finding a stamp in the NLM header information. If we need to - change the format of this information, we can simply change the - stamp. */ -static asection *secsec; - -/* A temporary file name to be unlinked on exit. Actually, for most - errors, we leave it around. It's not clear whether that is helpful - or not. */ -static char *unlink_on_exit; - -/* The list of long options. */ -static struct option long_options[] = -{ - { "debug", no_argument, 0, 'd' }, - { "header-file", required_argument, 0, 'T' }, - { "help", no_argument, 0, 'h' }, - { "input-target", required_argument, 0, 'I' }, - { "input-format", required_argument, 0, 'I' }, /* Obsolete */ - { "linker", required_argument, 0, 'l' }, - { "output-target", required_argument, 0, 'O' }, - { "output-format", required_argument, 0, 'O' }, /* Obsolete */ - { "version", no_argument, 0, 'V' }, - { NULL, no_argument, 0, 0 } -}; - -/* Local routines. */ - -int main (int, char **); - -static void show_usage (FILE *, int); -static const char *select_output_format - (enum bfd_architecture, unsigned long, bfd_boolean); -static void setup_sections (bfd *, asection *, void *); -static void copy_sections (bfd *, asection *, void *); -static void mangle_relocs - (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); -static void default_mangle_relocs - (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); -static char *link_inputs (struct string_list *, char *, char *); - -#ifdef NLMCONV_I386 -static void i386_mangle_relocs (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); -#endif - -#ifdef NLMCONV_ALPHA -static void alpha_mangle_relocs (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); -#endif - -#ifdef NLMCONV_POWERPC -static void powerpc_build_stubs (bfd *, bfd *, asymbol ***, long *); -static void powerpc_resolve_stubs (bfd *, bfd *); -static void powerpc_mangle_relocs (bfd *, asection *, arelent ***, long *, char *, bfd_size_type); -#endif - -/* The main routine. */ - -int -main (int argc, char **argv) -{ - int opt; - char *input_file = NULL; - const char *input_format = NULL; - const char *output_format = NULL; - const char *header_file = NULL; - char *ld_arg = NULL; - Nlm_Internal_Fixed_Header fixed_hdr_struct; - Nlm_Internal_Variable_Header var_hdr_struct; - Nlm_Internal_Version_Header version_hdr_struct; - Nlm_Internal_Copyright_Header copyright_hdr_struct; - Nlm_Internal_Extended_Header extended_hdr_struct; - bfd *inbfd; - bfd *outbfd; - asymbol **newsyms, **outsyms; - long symcount, newsymalloc, newsymcount; - long symsize; - asection *text_sec, *bss_sec, *data_sec; - bfd_vma vma; - bfd_size_type align; - asymbol *endsym; - long i; - char inlead, outlead; - bfd_boolean gotstart, gotexit, gotcheck; - struct stat st; - FILE *custom_data = NULL; - FILE *help_data = NULL; - FILE *message_data = NULL; - FILE *rpc_data = NULL; - FILE *shared_data = NULL; - size_t custom_size = 0; - size_t help_size = 0; - size_t message_size = 0; - size_t module_size = 0; - size_t rpc_size = 0; - asection *custom_section = NULL; - asection *help_section = NULL; - asection *message_section = NULL; - asection *module_section = NULL; - asection *rpc_section = NULL; - asection *shared_section = NULL; - bfd *sharedbfd; - size_t shared_offset = 0; - size_t shared_size = 0; - static Nlm_Internal_Fixed_Header sharedhdr; - int len; - char *modname; - char **matching; - -#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) - setlocale (LC_MESSAGES, ""); -#endif -#if defined (HAVE_SETLOCALE) - setlocale (LC_CTYPE, ""); -#endif - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - - program_name = argv[0]; - xmalloc_set_program_name (program_name); - bfd_set_error_program_name (program_name); - - expandargv (&argc, &argv); - - bfd_init (); - set_default_bfd_target (); - - while ((opt = getopt_long (argc, argv, "dHhI:l:O:T:Vv", long_options, - (int *) NULL)) - != EOF) - { - switch (opt) - { - case 'd': - debug = 1; - break; - case 'H': - case 'h': - show_usage (stdout, 0); - break; - case 'I': - input_format = optarg; - break; - case 'l': - ld_arg = optarg; - break; - case 'O': - output_format = optarg; - break; - case 'T': - header_file = optarg; - break; - case 'v': - case 'V': - print_version ("nlmconv"); - break; - case 0: - break; - default: - show_usage (stderr, 1); - break; - } - } - - /* The input and output files may be named on the command line. */ - output_file = NULL; - if (optind < argc) - { - input_file = argv[optind]; - ++optind; - if (optind < argc) - { - output_file = argv[optind]; - ++optind; - if (optind < argc) - show_usage (stderr, 1); - if (filename_cmp (input_file, output_file) == 0) - { - fatal (_("input and output files must be different")); - } - } - } - - /* Initialize the header information to default values. */ - fixed_hdr = &fixed_hdr_struct; - memset ((void *) &fixed_hdr_struct, 0, sizeof fixed_hdr_struct); - var_hdr = &var_hdr_struct; - memset ((void *) &var_hdr_struct, 0, sizeof var_hdr_struct); - version_hdr = &version_hdr_struct; - memset ((void *) &version_hdr_struct, 0, sizeof version_hdr_struct); - copyright_hdr = ©right_hdr_struct; - memset ((void *) ©right_hdr_struct, 0, sizeof copyright_hdr_struct); - extended_hdr = &extended_hdr_struct; - memset ((void *) &extended_hdr_struct, 0, sizeof extended_hdr_struct); - check_procedure = NULL; - custom_file = NULL; - debug_info = FALSE; - exit_procedure = "_Stop"; - export_symbols = NULL; - map_file = NULL; - full_map = FALSE; - help_file = NULL; - import_symbols = NULL; - message_file = NULL; - modules = NULL; - sharelib_file = NULL; - start_procedure = "_Prelude"; - verbose = FALSE; - rpc_file = NULL; - - parse_errors = 0; - - /* Parse the header file (if there is one). */ - if (header_file != NULL) - { - if (! nlmlex_file (header_file) - || yyparse () != 0 - || parse_errors != 0) - exit (1); - } - - if (input_files != NULL) - { - if (input_file != NULL) - { - fatal (_("input file named both on command line and with INPUT")); - } - if (input_files->next == NULL) - input_file = input_files->string; - else - input_file = link_inputs (input_files, ld_arg, map_file); - } - else if (input_file == NULL) - { - non_fatal (_("no input file")); - show_usage (stderr, 1); - } - - inbfd = bfd_openr (input_file, input_format); - if (inbfd == NULL) - bfd_fatal (input_file); - - if (! bfd_check_format_matches (inbfd, bfd_object, &matching)) - { - bfd_nonfatal (input_file); - if (bfd_get_error () == bfd_error_file_ambiguously_recognized) - { - list_matching_formats (matching); - free (matching); - } - exit (1); - } - - if (output_format == NULL) - output_format = select_output_format (bfd_get_arch (inbfd), - bfd_get_mach (inbfd), - bfd_big_endian (inbfd)); - - assert (output_format != NULL); - - /* Use the output file named on the command line if it exists. - Otherwise use the file named in the OUTPUT statement. */ - if (output_file == NULL) - { - non_fatal (_("no name for output file")); - show_usage (stderr, 1); - } - - outbfd = bfd_openw (output_file, output_format); - if (outbfd == NULL) - bfd_fatal (output_file); - if (! bfd_set_format (outbfd, bfd_object)) - bfd_fatal (output_file); - - assert (bfd_get_flavour (outbfd) == bfd_target_nlm_flavour); - - /* XXX: Should we accept the unknown bfd format here ? */ - if (bfd_arch_get_compatible (inbfd, outbfd, TRUE) == NULL) - non_fatal (_("warning: input and output formats are not compatible")); - - /* Move the values read from the command file into outbfd. */ - *nlm_fixed_header (outbfd) = fixed_hdr_struct; - *nlm_variable_header (outbfd) = var_hdr_struct; - *nlm_version_header (outbfd) = version_hdr_struct; - *nlm_copyright_header (outbfd) = copyright_hdr_struct; - *nlm_extended_header (outbfd) = extended_hdr_struct; - - /* Start copying the input BFD to the output BFD. */ - if (! bfd_set_file_flags (outbfd, bfd_get_file_flags (inbfd))) - bfd_fatal (bfd_get_filename (outbfd)); - - symsize = bfd_get_symtab_upper_bound (inbfd); - if (symsize < 0) - bfd_fatal (input_file); - symbols = (asymbol **) xmalloc (symsize); - symcount = bfd_canonicalize_symtab (inbfd, symbols); - if (symcount < 0) - bfd_fatal (input_file); - - /* Make sure we have a .bss section. */ - bss_sec = bfd_get_section_by_name (outbfd, NLM_UNINITIALIZED_DATA_NAME); - if (bss_sec == NULL) - { - bss_sec = bfd_make_section_with_flags (outbfd, - NLM_UNINITIALIZED_DATA_NAME, - SEC_ALLOC); - if (bss_sec == NULL - || ! bfd_set_section_alignment (outbfd, bss_sec, 1)) - bfd_fatal (_("make .bss section")); - } - - /* We store the original section names in the .nlmsections section, - so that programs which understand it can resurrect the original - sections from the NLM. We will put a pointer to .nlmsections in - the NLM header area. */ - secsec = bfd_make_section_with_flags (outbfd, ".nlmsections", - SEC_HAS_CONTENTS); - if (secsec == NULL) - bfd_fatal (_("make .nlmsections section")); - -#ifdef NLMCONV_POWERPC - /* For PowerPC NetWare we need to build stubs for calls to undefined - symbols. Because each stub requires an entry in the TOC section - which must be at the same location as other entries in the TOC - section, we must do this before determining where the TOC section - goes in setup_sections. */ - if (bfd_get_arch (inbfd) == bfd_arch_powerpc) - powerpc_build_stubs (inbfd, outbfd, &symbols, &symcount); -#endif - - /* Set up the sections. */ - bfd_map_over_sections (inbfd, setup_sections, (void *) outbfd); - - text_sec = bfd_get_section_by_name (outbfd, NLM_CODE_NAME); - - /* The .bss section immediately follows the .data section. */ - data_sec = bfd_get_section_by_name (outbfd, NLM_INITIALIZED_DATA_NAME); - if (data_sec != NULL) - { - bfd_size_type add; - - vma = bfd_get_section_size (data_sec); - align = 1 << bss_sec->alignment_power; - add = ((vma + align - 1) &~ (align - 1)) - vma; - vma += add; - if (! bfd_set_section_vma (outbfd, bss_sec, vma)) - bfd_fatal (_("set .bss vma")); - if (add != 0) - { - bfd_size_type data_size; - - data_size = bfd_get_section_size (data_sec); - if (! bfd_set_section_size (outbfd, data_sec, data_size + add)) - bfd_fatal (_("set .data size")); - } - } - - /* Adjust symbol information. */ - inlead = bfd_get_symbol_leading_char (inbfd); - outlead = bfd_get_symbol_leading_char (outbfd); - gotstart = FALSE; - gotexit = FALSE; - gotcheck = FALSE; - newsymalloc = 10; - newsyms = (asymbol **) xmalloc (newsymalloc * sizeof (asymbol *)); - newsymcount = 0; - endsym = NULL; - for (i = 0; i < symcount; i++) - { - asymbol *sym; - - sym = symbols[i]; - - /* Add or remove a leading underscore. */ - if (inlead != outlead) - { - if (inlead != '\0') - { - if (bfd_asymbol_name (sym)[0] == inlead) - { - if (outlead == '\0') - ++sym->name; - else - { - char *new_name; - - new_name = xmalloc (strlen (bfd_asymbol_name (sym)) + 1); - new_name[0] = outlead; - strcpy (new_name + 1, bfd_asymbol_name (sym) + 1); - sym->name = new_name; - } - } - } - else - { - char *new_name; - - new_name = xmalloc (strlen (bfd_asymbol_name (sym)) + 2); - new_name[0] = outlead; - strcpy (new_name + 1, bfd_asymbol_name (sym)); - sym->name = new_name; - } - } - - /* NLM's have an uninitialized data section, but they do not - have a common section in the Unix sense. Move all common - symbols into the .bss section, and mark them as exported. */ - if (bfd_is_com_section (bfd_get_section (sym))) - { - bfd_vma size = sym->value; - - sym->section = bss_sec; - sym->value = bfd_get_section_size (bss_sec); - size += sym->value; - align = 1 << bss_sec->alignment_power; - size = (size + align - 1) & ~(align - 1); - bfd_set_section_size (outbfd, bss_sec, size); - sym->flags |= BSF_EXPORT | BSF_GLOBAL; - } - else if (bfd_get_section (sym)->output_section != NULL) - { - /* Move the symbol into the output section. */ - sym->value += bfd_get_section (sym)->output_offset; - sym->section = bfd_get_section (sym)->output_section; - /* This is no longer a section symbol. */ - sym->flags &=~ BSF_SECTION_SYM; - } - - /* Force _edata and _end to be defined. This would normally be - done by the linker, but the manipulation of the common - symbols will confuse it. */ - if ((sym->flags & BSF_DEBUGGING) == 0 - && bfd_asymbol_name (sym)[0] == '_' - && bfd_is_und_section (bfd_get_section (sym))) - { - if (strcmp (bfd_asymbol_name (sym), "_edata") == 0) - { - sym->section = bss_sec; - sym->value = 0; - } - if (strcmp (bfd_asymbol_name (sym), "_end") == 0) - { - sym->section = bss_sec; - endsym = sym; - } - -#ifdef NLMCONV_POWERPC - /* For PowerPC NetWare, we define __GOT0. This is the start - of the .got section. */ - if (bfd_get_arch (inbfd) == bfd_arch_powerpc - && strcmp (bfd_asymbol_name (sym), "__GOT0") == 0) - { - asection *got_sec; - - got_sec = bfd_get_section_by_name (inbfd, ".got"); - assert (got_sec != (asection *) NULL); - sym->value = got_sec->output_offset; - sym->section = got_sec->output_section; - } -#endif - } - - /* If this is a global symbol, check the export list. */ - if ((sym->flags & (BSF_EXPORT | BSF_GLOBAL)) != 0) - { - struct string_list *l; - int found_simple; - - /* Unfortunately, a symbol can appear multiple times on the - export list, with and without prefixes. */ - found_simple = 0; - for (l = export_symbols; l != NULL; l = l->next) - { - if (strcmp (l->string, bfd_asymbol_name (sym)) == 0) - found_simple = 1; - else - { - char *zbase; - - zbase = strchr (l->string, '@'); - if (zbase != NULL - && strcmp (zbase + 1, bfd_asymbol_name (sym)) == 0) - { - /* We must add a symbol with this prefix. */ - if (newsymcount >= newsymalloc) - { - newsymalloc += 10; - newsyms = ((asymbol **) - xrealloc ((void *) newsyms, - (newsymalloc - * sizeof (asymbol *)))); - } - newsyms[newsymcount] = - (asymbol *) xmalloc (sizeof (asymbol)); - *newsyms[newsymcount] = *sym; - newsyms[newsymcount]->name = l->string; - ++newsymcount; - } - } - } - if (! found_simple) - { - /* The unmodified symbol is actually not exported at - all. */ - sym->flags &=~ (BSF_GLOBAL | BSF_EXPORT); - sym->flags |= BSF_LOCAL; - } - } - - /* If it's an undefined symbol, see if it's on the import list. - Change the prefix if necessary. */ - if (bfd_is_und_section (bfd_get_section (sym))) - { - struct string_list *l; - - for (l = import_symbols; l != NULL; l = l->next) - { - if (strcmp (l->string, bfd_asymbol_name (sym)) == 0) - break; - else - { - char *zbase; - - zbase = strchr (l->string, '@'); - if (zbase != NULL - && strcmp (zbase + 1, bfd_asymbol_name (sym)) == 0) - { - sym->name = l->string; - break; - } - } - } - if (l == NULL) - non_fatal (_("warning: symbol %s imported but not in import list"), - bfd_asymbol_name (sym)); - } - - /* See if it's one of the special named symbols. */ - if ((sym->flags & BSF_DEBUGGING) == 0) - { - bfd_vma val; - - /* FIXME: If these symbols are not in the .text section, we - add the .text section size to the value. This may not be - correct for all targets. I'm not sure how this should - really be handled. */ - if (strcmp (bfd_asymbol_name (sym), start_procedure) == 0) - { - val = bfd_asymbol_value (sym); - if (bfd_get_section (sym) == data_sec - && text_sec != (asection *) NULL) - val += bfd_section_size (outbfd, text_sec); - if (! bfd_set_start_address (outbfd, val)) - bfd_fatal (_("set start address")); - gotstart = TRUE; - } - if (strcmp (bfd_asymbol_name (sym), exit_procedure) == 0) - { - val = bfd_asymbol_value (sym); - if (bfd_get_section (sym) == data_sec - && text_sec != (asection *) NULL) - val += bfd_section_size (outbfd, text_sec); - nlm_fixed_header (outbfd)->exitProcedureOffset = val; - gotexit = TRUE; - } - if (check_procedure != NULL - && strcmp (bfd_asymbol_name (sym), check_procedure) == 0) - { - val = bfd_asymbol_value (sym); - if (bfd_get_section (sym) == data_sec - && text_sec != (asection *) NULL) - val += bfd_section_size (outbfd, text_sec); - nlm_fixed_header (outbfd)->checkUnloadProcedureOffset = val; - gotcheck = TRUE; - } - } - } - - if (endsym != NULL) - { - endsym->value = bfd_get_section_size (bss_sec); - - /* FIXME: If any relocs referring to _end use inplace addends, - then I think they need to be updated. This is handled by - i386_mangle_relocs. Is it needed for any other object - formats? */ - } - - if (newsymcount == 0) - outsyms = symbols; - else - { - outsyms = (asymbol **) xmalloc ((symcount + newsymcount + 1) - * sizeof (asymbol *)); - memcpy (outsyms, symbols, symcount * sizeof (asymbol *)); - memcpy (outsyms + symcount, newsyms, newsymcount * sizeof (asymbol *)); - outsyms[symcount + newsymcount] = NULL; - } - - bfd_set_symtab (outbfd, outsyms, symcount + newsymcount); - - if (! gotstart) - non_fatal (_("warning: START procedure %s not defined"), start_procedure); - if (! gotexit) - non_fatal (_("warning: EXIT procedure %s not defined"), exit_procedure); - if (check_procedure != NULL && ! gotcheck) - non_fatal (_("warning: CHECK procedure %s not defined"), check_procedure); - - /* Add additional sections required for the header information. */ - if (custom_file != NULL) - { - custom_data = fopen (custom_file, "r"); - if (custom_data == NULL - || fstat (fileno (custom_data), &st) < 0) - { - fprintf (stderr, "%s:%s: %s\n", program_name, custom_file, - strerror (errno)); - custom_file = NULL; - } - else - { - custom_size = st.st_size; - custom_section = bfd_make_section_with_flags (outbfd, ".nlmcustom", - SEC_HAS_CONTENTS); - if (custom_section == NULL - || ! bfd_set_section_size (outbfd, custom_section, custom_size)) - bfd_fatal (_("custom section")); - } - } - if (help_file != NULL) - { - help_data = fopen (help_file, "r"); - if (help_data == NULL - || fstat (fileno (help_data), &st) < 0) - { - fprintf (stderr, "%s:%s: %s\n", program_name, help_file, - strerror (errno)); - help_file = NULL; - } - else - { - help_size = st.st_size; - help_section = bfd_make_section_with_flags (outbfd, ".nlmhelp", - SEC_HAS_CONTENTS); - if (help_section == NULL - || ! bfd_set_section_size (outbfd, help_section, help_size)) - bfd_fatal (_("help section")); - LITMEMCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); - } - } - if (message_file != NULL) - { - message_data = fopen (message_file, "r"); - if (message_data == NULL - || fstat (fileno (message_data), &st) < 0) - { - fprintf (stderr, "%s:%s: %s\n", program_name, message_file, - strerror (errno)); - message_file = NULL; - } - else - { - message_size = st.st_size; - message_section = bfd_make_section_with_flags (outbfd, - ".nlmmessages", - SEC_HAS_CONTENTS); - if (message_section == NULL - || ! bfd_set_section_size (outbfd, message_section, message_size)) - bfd_fatal (_("message section")); - LITMEMCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); - } - } - if (modules != NULL) - { - struct string_list *l; - - module_size = 0; - for (l = modules; l != NULL; l = l->next) - module_size += strlen (l->string) + 1; - module_section = bfd_make_section_with_flags (outbfd, ".nlmmodules", - SEC_HAS_CONTENTS); - if (module_section == NULL - || ! bfd_set_section_size (outbfd, module_section, module_size)) - bfd_fatal (_("module section")); - } - if (rpc_file != NULL) - { - rpc_data = fopen (rpc_file, "r"); - if (rpc_data == NULL - || fstat (fileno (rpc_data), &st) < 0) - { - fprintf (stderr, "%s:%s: %s\n", program_name, rpc_file, - strerror (errno)); - rpc_file = NULL; - } - else - { - rpc_size = st.st_size; - rpc_section = bfd_make_section_with_flags (outbfd, ".nlmrpc", - SEC_HAS_CONTENTS); - if (rpc_section == NULL - || ! bfd_set_section_size (outbfd, rpc_section, rpc_size)) - bfd_fatal (_("rpc section")); - LITMEMCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); - } - } - if (sharelib_file != NULL) - { - sharedbfd = bfd_openr (sharelib_file, output_format); - if (sharedbfd == NULL - || ! bfd_check_format (sharedbfd, bfd_object)) - { - fprintf (stderr, "%s:%s: %s\n", program_name, sharelib_file, - bfd_errmsg (bfd_get_error ())); - sharelib_file = NULL; - } - else - { - sharedhdr = *nlm_fixed_header (sharedbfd); - bfd_close (sharedbfd); - shared_data = fopen (sharelib_file, "r"); - if (shared_data == NULL - || (fstat (fileno (shared_data), &st) < 0)) - { - fprintf (stderr, "%s:%s: %s\n", program_name, sharelib_file, - strerror (errno)); - sharelib_file = NULL; - } - else - { - /* If we were clever, we could just copy out the - sections of the shared library which we actually - need. However, we would have to figure out the sizes - of the external and public information, and that can - not be done without reading through them. */ - if (sharedhdr.uninitializedDataSize > 0) - { - /* There is no place to record this information. */ - non_fatal (_("%s: warning: shared libraries can not have uninitialized data"), - sharelib_file); - } - shared_offset = st.st_size; - if (shared_offset > (size_t) sharedhdr.codeImageOffset) - shared_offset = sharedhdr.codeImageOffset; - if (shared_offset > (size_t) sharedhdr.dataImageOffset) - shared_offset = sharedhdr.dataImageOffset; - if (shared_offset > (size_t) sharedhdr.relocationFixupOffset) - shared_offset = sharedhdr.relocationFixupOffset; - if (shared_offset > (size_t) sharedhdr.externalReferencesOffset) - shared_offset = sharedhdr.externalReferencesOffset; - if (shared_offset > (size_t) sharedhdr.publicsOffset) - shared_offset = sharedhdr.publicsOffset; - shared_size = st.st_size - shared_offset; - shared_section = bfd_make_section_with_flags (outbfd, - ".nlmshared", - SEC_HAS_CONTENTS); - if (shared_section == NULL - || ! bfd_set_section_size (outbfd, shared_section, - shared_size)) - bfd_fatal (_("shared section")); - LITMEMCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); - } - } - } - - /* Check whether a version was given. */ - if (!CONST_STRNEQ (version_hdr->stamp, "VeRsIoN#")) - non_fatal (_("warning: No version number given")); - - /* At least for now, always create an extended header, because that - is what NLMLINK does. */ - LITMEMCPY (nlm_extended_header (outbfd)->stamp, "MeSsAgEs"); - - LITMEMCPY (nlm_cygnus_ext_header (outbfd)->stamp, "CyGnUsEx"); - - /* If the date was not given, force it in. */ - if (nlm_version_header (outbfd)->month == 0 - && nlm_version_header (outbfd)->day == 0 - && nlm_version_header (outbfd)->year == 0) - { - time_t now; - struct tm *ptm; - - time (&now); - ptm = localtime (&now); - nlm_version_header (outbfd)->month = ptm->tm_mon + 1; - nlm_version_header (outbfd)->day = ptm->tm_mday; - nlm_version_header (outbfd)->year = ptm->tm_year + 1900; - LITMEMCPY (version_hdr->stamp, "VeRsIoN#"); - } - -#ifdef NLMCONV_POWERPC - /* Resolve the stubs we build for PowerPC NetWare. */ - if (bfd_get_arch (inbfd) == bfd_arch_powerpc) - powerpc_resolve_stubs (inbfd, outbfd); -#endif - - /* Copy over the sections. */ - bfd_map_over_sections (inbfd, copy_sections, (void *) outbfd); - - /* Finish up the header information. */ - if (custom_file != NULL) - { - void *data; - - data = xmalloc (custom_size); - if (fread (data, 1, custom_size, custom_data) != custom_size) - non_fatal (_("%s: read: %s"), custom_file, strerror (errno)); - else - { - if (! bfd_set_section_contents (outbfd, custom_section, data, - (file_ptr) 0, custom_size)) - bfd_fatal (_("custom section")); - nlm_fixed_header (outbfd)->customDataOffset = - custom_section->filepos; - nlm_fixed_header (outbfd)->customDataSize = custom_size; - } - free (data); - } - if (! debug_info) - { - /* As a special hack, the backend recognizes a debugInfoOffset - of -1 to mean that it should not output any debugging - information. This can not be handling by fiddling with the - symbol table because exported symbols appear in both the - export information and the debugging information. */ - nlm_fixed_header (outbfd)->debugInfoOffset = (file_ptr) -1; - } - if (full_map) - non_fatal (_("warning: FULLMAP is not supported; try ld -M")); - if (help_file != NULL) - { - void *data; - - data = xmalloc (help_size); - if (fread (data, 1, help_size, help_data) != help_size) - non_fatal (_("%s: read: %s"), help_file, strerror (errno)); - else - { - if (! bfd_set_section_contents (outbfd, help_section, data, - (file_ptr) 0, help_size)) - bfd_fatal (_("help section")); - nlm_extended_header (outbfd)->helpFileOffset = - help_section->filepos; - nlm_extended_header (outbfd)->helpFileLength = help_size; - } - free (data); - } - if (message_file != NULL) - { - void *data; - - data = xmalloc (message_size); - if (fread (data, 1, message_size, message_data) != message_size) - non_fatal (_("%s: read: %s"), message_file, strerror (errno)); - else - { - if (! bfd_set_section_contents (outbfd, message_section, data, - (file_ptr) 0, message_size)) - bfd_fatal (_("message section")); - nlm_extended_header (outbfd)->messageFileOffset = - message_section->filepos; - nlm_extended_header (outbfd)->messageFileLength = message_size; - - /* FIXME: Are these offsets correct on all platforms? Are - they 32 bits on all platforms? What endianness? */ - nlm_extended_header (outbfd)->languageID = - bfd_h_get_32 (outbfd, (bfd_byte *) data + 106); - nlm_extended_header (outbfd)->messageCount = - bfd_h_get_32 (outbfd, (bfd_byte *) data + 110); - } - free (data); - } - if (modules != NULL) - { - void *data; - unsigned char *set; - struct string_list *l; - bfd_size_type c; - - data = xmalloc (module_size); - c = 0; - set = (unsigned char *) data; - for (l = modules; l != NULL; l = l->next) - { - *set = strlen (l->string); - strncpy ((char *) set + 1, l->string, *set); - set += *set + 1; - ++c; - } - if (! bfd_set_section_contents (outbfd, module_section, data, - (file_ptr) 0, module_size)) - bfd_fatal (_("module section")); - nlm_fixed_header (outbfd)->moduleDependencyOffset = - module_section->filepos; - nlm_fixed_header (outbfd)->numberOfModuleDependencies = c; - } - if (rpc_file != NULL) - { - void *data; - - data = xmalloc (rpc_size); - if (fread (data, 1, rpc_size, rpc_data) != rpc_size) - non_fatal (_("%s: read: %s"), rpc_file, strerror (errno)); - else - { - if (! bfd_set_section_contents (outbfd, rpc_section, data, - (file_ptr) 0, rpc_size)) - bfd_fatal (_("rpc section")); - nlm_extended_header (outbfd)->RPCDataOffset = - rpc_section->filepos; - nlm_extended_header (outbfd)->RPCDataLength = rpc_size; - } - free (data); - } - if (sharelib_file != NULL) - { - void *data; - - data = xmalloc (shared_size); - if (fseek (shared_data, shared_offset, SEEK_SET) != 0 - || fread (data, 1, shared_size, shared_data) != shared_size) - non_fatal (_("%s: read: %s"), sharelib_file, strerror (errno)); - else - { - if (! bfd_set_section_contents (outbfd, shared_section, data, - (file_ptr) 0, shared_size)) - bfd_fatal (_("shared section")); - } - nlm_extended_header (outbfd)->sharedCodeOffset = - sharedhdr.codeImageOffset - shared_offset + shared_section->filepos; - nlm_extended_header (outbfd)->sharedCodeLength = - sharedhdr.codeImageSize; - nlm_extended_header (outbfd)->sharedDataOffset = - sharedhdr.dataImageOffset - shared_offset + shared_section->filepos; - nlm_extended_header (outbfd)->sharedDataLength = - sharedhdr.dataImageSize; - nlm_extended_header (outbfd)->sharedRelocationFixupOffset = - (sharedhdr.relocationFixupOffset - - shared_offset - + shared_section->filepos); - nlm_extended_header (outbfd)->sharedRelocationFixupCount = - sharedhdr.numberOfRelocationFixups; - nlm_extended_header (outbfd)->sharedExternalReferenceOffset = - (sharedhdr.externalReferencesOffset - - shared_offset - + shared_section->filepos); - nlm_extended_header (outbfd)->sharedExternalReferenceCount = - sharedhdr.numberOfExternalReferences; - nlm_extended_header (outbfd)->sharedPublicsOffset = - sharedhdr.publicsOffset - shared_offset + shared_section->filepos; - nlm_extended_header (outbfd)->sharedPublicsCount = - sharedhdr.numberOfPublics; - nlm_extended_header (outbfd)->sharedDebugRecordOffset = - sharedhdr.debugInfoOffset - shared_offset + shared_section->filepos; - nlm_extended_header (outbfd)->sharedDebugRecordCount = - sharedhdr.numberOfDebugRecords; - nlm_extended_header (outbfd)->SharedInitializationOffset = - sharedhdr.codeStartOffset; - nlm_extended_header (outbfd)->SharedExitProcedureOffset = - sharedhdr.exitProcedureOffset; - free (data); - } - - { - const int max_len = NLM_MODULE_NAME_SIZE - 2; - const char * filename = lbasename (output_file); - - len = strlen (filename); - if (len > max_len) - len = max_len; - nlm_fixed_header (outbfd)->moduleName[0] = len; - - strncpy (nlm_fixed_header (outbfd)->moduleName + 1, filename, max_len); - nlm_fixed_header (outbfd)->moduleName[max_len + 1] = '\0'; - - for (modname = nlm_fixed_header (outbfd)->moduleName; - *modname != '\0'; - modname++) - *modname = TOUPPER (*modname); - } - - strncpy (nlm_variable_header (outbfd)->oldThreadName, " LONG", - NLM_OLD_THREAD_NAME_LENGTH); - - nlm_cygnus_ext_header (outbfd)->offset = secsec->filepos; - nlm_cygnus_ext_header (outbfd)->length = bfd_section_size (outbfd, secsec); - - if (! bfd_close (outbfd)) - bfd_fatal (output_file); - if (! bfd_close (inbfd)) - bfd_fatal (input_file); - - if (unlink_on_exit != NULL) - unlink (unlink_on_exit); - - return 0; -} - - -/* Show a usage message and exit. */ - -static void -show_usage (FILE *file, int status) -{ - fprintf (file, _("Usage: %s [option(s)] [in-file [out-file]]\n"), program_name); - fprintf (file, _(" Convert an object file into a NetWare Loadable Module\n")); - fprintf (file, _(" The options are:\n\ - -I --input-target=<bfdname> Set the input binary file format\n\ - -O --output-target=<bfdname> Set the output binary file format\n\ - -T --header-file=<file> Read <file> for NLM header information\n\ - -l --linker=<linker> Use <linker> for any linking\n\ - -d --debug Display on stderr the linker command line\n\ - @<file> Read options from <file>.\n\ - -h --help Display this information\n\ - -v --version Display the program's version\n\ -")); - if (REPORT_BUGS_TO[0] && status == 0) - fprintf (file, _("Report bugs to %s\n"), REPORT_BUGS_TO); - exit (status); -} - -/* Select the output format based on the input architecture, machine, - and endianness. This chooses the appropriate NLM target. */ - -static const char * -select_output_format (enum bfd_architecture arch, unsigned long mach, - bfd_boolean bigendian ATTRIBUTE_UNUSED) -{ - switch (arch) - { -#ifdef NLMCONV_I386 - case bfd_arch_i386: - return "nlm32-i386"; -#endif -#ifdef NLMCONV_SPARC - case bfd_arch_sparc: - return "nlm32-sparc"; -#endif -#ifdef NLMCONV_ALPHA - case bfd_arch_alpha: - return "nlm32-alpha"; -#endif -#ifdef NLMCONV_POWERPC - case bfd_arch_powerpc: - return "nlm32-powerpc"; -#endif - default: - fatal (_("support not compiled in for %s"), - bfd_printable_arch_mach (arch, mach)); - } - /*NOTREACHED*/ -} - -/* The BFD sections are copied in two passes. This function selects - the output section for each input section, and sets up the section - name, size, etc. */ - -static void -setup_sections (bfd *inbfd ATTRIBUTE_UNUSED, asection *insec, void *data_ptr) -{ - bfd *outbfd = (bfd *) data_ptr; - flagword f; - const char *outname; - asection *outsec; - bfd_vma offset; - bfd_size_type align; - bfd_size_type add; - bfd_size_type secsecsize; - - f = bfd_get_section_flags (inbfd, insec); - if (f & SEC_CODE) - outname = NLM_CODE_NAME; - else if ((f & SEC_LOAD) && (f & SEC_HAS_CONTENTS)) - outname = NLM_INITIALIZED_DATA_NAME; - else if (f & SEC_ALLOC) - outname = NLM_UNINITIALIZED_DATA_NAME; - else - outname = bfd_section_name (inbfd, insec); - - outsec = bfd_get_section_by_name (outbfd, outname); - if (outsec == NULL) - { - outsec = bfd_make_section (outbfd, outname); - if (outsec == NULL) - bfd_fatal (_("make section")); - } - - insec->output_section = outsec; - - offset = bfd_section_size (outbfd, outsec); - align = 1 << bfd_section_alignment (inbfd, insec); - add = ((offset + align - 1) &~ (align - 1)) - offset; - insec->output_offset = offset + add; - - if (! bfd_set_section_size (outbfd, outsec, - (bfd_section_size (outbfd, outsec) - + bfd_section_size (inbfd, insec) - + add))) - bfd_fatal (_("set section size")); - - if ((bfd_section_alignment (inbfd, insec) - > bfd_section_alignment (outbfd, outsec)) - && ! bfd_set_section_alignment (outbfd, outsec, - bfd_section_alignment (inbfd, insec))) - bfd_fatal (_("set section alignment")); - - 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); - - /* For each input section we allocate space for an entry in - .nlmsections. */ - secsecsize = bfd_section_size (outbfd, secsec); - secsecsize += strlen (bfd_section_name (inbfd, insec)) + 1; - secsecsize = (secsecsize + 3) &~ 3; - secsecsize += 8; - if (! bfd_set_section_size (outbfd, secsec, secsecsize)) - bfd_fatal (_("set .nlmsections size")); -} - -/* Copy the section contents. */ - -static void -copy_sections (bfd *inbfd, asection *insec, void *data_ptr) -{ - static bfd_size_type secsecoff = 0; - bfd *outbfd = (bfd *) data_ptr; - const char *inname; - asection *outsec; - bfd_size_type size; - bfd_byte *contents; - long reloc_size; - bfd_byte buf[4]; - bfd_size_type add; - - inname = bfd_section_name (inbfd, insec); - - outsec = insec->output_section; - assert (outsec != NULL); - - size = bfd_get_section_size (insec); - - if ((bfd_get_section_flags (inbfd, insec) & SEC_HAS_CONTENTS) == 0) - contents = NULL; - else - { - if (!bfd_malloc_and_get_section (inbfd, insec, &contents)) - bfd_fatal (bfd_get_filename (inbfd)); - } - - reloc_size = bfd_get_reloc_upper_bound (inbfd, insec); - if (reloc_size < 0) - bfd_fatal (bfd_get_filename (inbfd)); - if (reloc_size != 0) - { - arelent **relocs; - long reloc_count; - - relocs = (arelent **) xmalloc (reloc_size); - reloc_count = bfd_canonicalize_reloc (inbfd, insec, relocs, symbols); - if (reloc_count < 0) - bfd_fatal (bfd_get_filename (inbfd)); - mangle_relocs (outbfd, insec, &relocs, &reloc_count, (char *) contents, - size); - - /* FIXME: refers to internal BFD fields. */ - if (outsec->orelocation != (arelent **) NULL) - { - bfd_size_type total_count; - arelent **combined; - - total_count = reloc_count + outsec->reloc_count; - combined = (arelent **) xmalloc (total_count * sizeof (arelent *)); - memcpy (combined, outsec->orelocation, - outsec->reloc_count * sizeof (arelent *)); - memcpy (combined + outsec->reloc_count, relocs, - (size_t) (reloc_count * sizeof (arelent *))); - free (outsec->orelocation); - reloc_count = total_count; - relocs = combined; - } - - bfd_set_reloc (outbfd, outsec, relocs, reloc_count); - } - - if (contents != NULL) - { - if (! bfd_set_section_contents (outbfd, outsec, contents, - insec->output_offset, size)) - bfd_fatal (bfd_get_filename (outbfd)); - free (contents); - } - - /* Add this section to .nlmsections. */ - if (! bfd_set_section_contents (outbfd, secsec, (void *) inname, secsecoff, - strlen (inname) + 1)) - bfd_fatal (_("set .nlmsection contents")); - secsecoff += strlen (inname) + 1; - - add = ((secsecoff + 3) &~ 3) - secsecoff; - if (add != 0) - { - bfd_h_put_32 (outbfd, (bfd_vma) 0, buf); - if (! bfd_set_section_contents (outbfd, secsec, buf, secsecoff, add)) - bfd_fatal (_("set .nlmsection contents")); - secsecoff += add; - } - - if (contents != NULL) - bfd_h_put_32 (outbfd, (bfd_vma) outsec->filepos, buf); - else - bfd_h_put_32 (outbfd, (bfd_vma) 0, buf); - if (! bfd_set_section_contents (outbfd, secsec, buf, secsecoff, 4)) - bfd_fatal (_("set .nlmsection contents")); - secsecoff += 4; - - bfd_h_put_32 (outbfd, (bfd_vma) size, buf); - if (! bfd_set_section_contents (outbfd, secsec, buf, secsecoff, 4)) - bfd_fatal (_("set .nlmsection contents")); - secsecoff += 4; -} - -/* Some, perhaps all, NetWare targets require changing the relocs used - by the input formats. */ - -static void -mangle_relocs (bfd *outbfd, asection *insec, arelent ***relocs_ptr, - long *reloc_count_ptr, char *contents, - bfd_size_type contents_size) -{ - switch (bfd_get_arch (outbfd)) - { -#ifdef NLMCONV_I386 - case bfd_arch_i386: - i386_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, - contents, contents_size); - break; -#endif -#ifdef NLMCONV_ALPHA - case bfd_arch_alpha: - alpha_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, - contents, contents_size); - break; -#endif -#ifdef NLMCONV_POWERPC - case bfd_arch_powerpc: - powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, - contents, contents_size); - break; -#endif - default: - default_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, - contents, contents_size); - break; - } -} - -/* By default all we need to do for relocs is change the address by - the output_offset. */ - -static void -default_mangle_relocs (bfd *outbfd ATTRIBUTE_UNUSED, asection *insec, - arelent ***relocs_ptr, long *reloc_count_ptr, - char *contents ATTRIBUTE_UNUSED, - bfd_size_type contents_size ATTRIBUTE_UNUSED) -{ - if (insec->output_offset != 0) - { - long reloc_count; - arelent **relocs; - long i; - - reloc_count = *reloc_count_ptr; - relocs = *relocs_ptr; - for (i = 0; i < reloc_count; i++, relocs++) - (*relocs)->address += insec->output_offset; - } -} - -#ifdef NLMCONV_I386 - -/* NetWare on the i386 supports a restricted set of relocs, which are - different from those used on other i386 targets. This routine - converts the relocs. It is, obviously, very target dependent. At - the moment, the nlm32-i386 backend performs similar translations; - however, it is more reliable and efficient to do them here. */ - -static reloc_howto_type nlm_i386_pcrel_howto = - HOWTO (1, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - TRUE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_signed, /* complain_on_overflow */ - 0, /* special_function */ - "DISP32", /* name */ - TRUE, /* partial_inplace */ - 0xffffffff, /* src_mask */ - 0xffffffff, /* dst_mask */ - TRUE); /* pcrel_offset */ - -static void -i386_mangle_relocs (bfd *outbfd, asection *insec, arelent ***relocs_ptr, - long *reloc_count_ptr, char *contents, - bfd_size_type contents_size) -{ - long reloc_count, i; - arelent **relocs; - - reloc_count = *reloc_count_ptr; - relocs = *relocs_ptr; - for (i = 0; i < reloc_count; i++) - { - arelent *rel; - asymbol *sym; - bfd_size_type address; - bfd_vma addend; - - rel = *relocs++; - /* PR 17512: file: 057f89c1. */ - if (rel->sym_ptr_ptr == NULL) - continue; - sym = *rel->sym_ptr_ptr; - - /* We're moving the relocs from the input section to the output - section, so we must adjust the address accordingly. */ - address = rel->address; - rel->address += insec->output_offset; - - /* Note that no serious harm will ensue if we fail to change a - reloc. The backend will fail when writing out the reloc. */ - - /* Make sure this reloc is within the data we have. We use only - 4 byte relocs here, so we insist on having 4 bytes. */ - if (address + 4 > contents_size) - continue; - - /* A PC relative reloc entirely within a single section is - completely unnecessary. This can be generated by ld -r. */ - if (sym == insec->symbol - && rel->howto != NULL - && rel->howto->pc_relative - && ! rel->howto->pcrel_offset) - { - --*reloc_count_ptr; - --relocs; - memmove (relocs, relocs + 1, - (size_t) ((reloc_count - i) * sizeof (arelent *))); - continue; - } - - /* Get the amount the relocation will add in. */ - addend = rel->addend + sym->value; - - /* NetWare doesn't support PC relative relocs against defined - symbols, so we have to eliminate them by doing the relocation - now. We can only do this if the reloc is within a single - section. */ - if (rel->howto != NULL - && rel->howto->pc_relative - && bfd_get_section (sym) == insec->output_section) - { - bfd_vma val; - - if (rel->howto->pcrel_offset) - addend -= address; - - val = bfd_get_32 (outbfd, (bfd_byte *) contents + address); - val += addend; - bfd_put_32 (outbfd, val, (bfd_byte *) contents + address); - - --*reloc_count_ptr; - --relocs; - memmove (relocs, relocs + 1, - (size_t) ((reloc_count - i) * sizeof (arelent *))); - continue; - } - - /* NetWare doesn't support reloc addends, so we get rid of them - here by simply adding them into the object data. We handle - the symbol value, if any, the same way. */ - if (addend != 0 - && rel->howto != NULL - && rel->howto->rightshift == 0 - && rel->howto->size == 2 - && rel->howto->bitsize == 32 - && rel->howto->bitpos == 0 - && rel->howto->src_mask == 0xffffffff - && rel->howto->dst_mask == 0xffffffff) - { - bfd_vma val; - - val = bfd_get_32 (outbfd, (bfd_byte *) contents + address); - val += addend; - bfd_put_32 (outbfd, val, (bfd_byte *) contents + address); - - /* Adjust the reloc for the changes we just made. */ - rel->addend = 0; - if (! bfd_is_und_section (bfd_get_section (sym))) - rel->sym_ptr_ptr = bfd_get_section (sym)->symbol_ptr_ptr; - } - - /* NetWare uses a reloc with pcrel_offset set. We adjust - pc_relative relocs accordingly. We are going to change the - howto field, so we can only do this if the current one is - compatible. We should check that special_function is NULL - here, but at the moment coff-i386 uses a special_function - which does not affect what we are doing here. */ - if (rel->howto != NULL - && rel->howto->pc_relative - && ! rel->howto->pcrel_offset - && rel->howto->rightshift == 0 - && rel->howto->size == 2 - && rel->howto->bitsize == 32 - && rel->howto->bitpos == 0 - && rel->howto->src_mask == 0xffffffff - && rel->howto->dst_mask == 0xffffffff) - { - bfd_vma val; - - /* When pcrel_offset is not set, it means that the negative - of the address of the memory location is stored in the - memory location. We must add it back in. */ - val = bfd_get_32 (outbfd, (bfd_byte *) contents + address); - val += address; - bfd_put_32 (outbfd, val, (bfd_byte *) contents + address); - - /* We must change to a new howto. */ - rel->howto = &nlm_i386_pcrel_howto; - } - } -} - -#endif /* NLMCONV_I386 */ - -#ifdef NLMCONV_ALPHA - -/* On the Alpha the first reloc for every section must be a special - relocs which hold the GP address. Also, the first reloc in the - file must be a special reloc which holds the address of the .lita - section. */ - -static reloc_howto_type nlm32_alpha_nw_howto = - HOWTO (ALPHA_R_NW_RELOC, /* type */ - 0, /* rightshift */ - 0, /* size (0 = byte, 1 = short, 2 = long) */ - 0, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_dont, /* complain_on_overflow */ - 0, /* special_function */ - "NW_RELOC", /* name */ - FALSE, /* partial_inplace */ - 0, /* src_mask */ - 0, /* dst_mask */ - FALSE); /* pcrel_offset */ - -static void -alpha_mangle_relocs (bfd *outbfd, asection *insec, - arelent ***relocs_ptr, long *reloc_count_ptr, - char *contents ATTRIBUTE_UNUSED, - bfd_size_type contents_size ATTRIBUTE_UNUSED) -{ - long old_reloc_count; - arelent **old_relocs; - arelent **relocs; - - old_reloc_count = *reloc_count_ptr; - old_relocs = *relocs_ptr; - relocs = (arelent **) xmalloc ((old_reloc_count + 3) * sizeof (arelent *)); - *relocs_ptr = relocs; - - if (nlm_alpha_backend_data (outbfd)->lita_address == 0) - { - bfd *inbfd; - asection *lita_section; - - inbfd = insec->owner; - lita_section = bfd_get_section_by_name (inbfd, _LITA); - if (lita_section != (asection *) NULL) - { - nlm_alpha_backend_data (outbfd)->lita_address = - bfd_get_section_vma (inbfd, lita_section); - nlm_alpha_backend_data (outbfd)->lita_size = - bfd_section_size (inbfd, lita_section); - } - else - { - /* Avoid outputting this reloc again. */ - nlm_alpha_backend_data (outbfd)->lita_address = 4; - } - - *relocs = (arelent *) xmalloc (sizeof (arelent)); - (*relocs)->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; - (*relocs)->address = nlm_alpha_backend_data (outbfd)->lita_address; - (*relocs)->addend = nlm_alpha_backend_data (outbfd)->lita_size + 1; - (*relocs)->howto = &nlm32_alpha_nw_howto; - ++relocs; - ++(*reloc_count_ptr); - } - - /* Get the GP value from bfd. */ - if (nlm_alpha_backend_data (outbfd)->gp == 0) - nlm_alpha_backend_data (outbfd)->gp = - bfd_ecoff_get_gp_value (insec->owner); - - *relocs = (arelent *) xmalloc (sizeof (arelent)); - (*relocs)->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; - (*relocs)->address = nlm_alpha_backend_data (outbfd)->gp; - (*relocs)->addend = 0; - (*relocs)->howto = &nlm32_alpha_nw_howto; - ++relocs; - ++(*reloc_count_ptr); - - memcpy (relocs, old_relocs, (size_t) old_reloc_count * sizeof (arelent *)); - relocs[old_reloc_count] = (arelent *) NULL; - - free (old_relocs); - - if (insec->output_offset != 0) - { - bfd_size_type i; - - for (i = 0; i < (bfd_size_type) old_reloc_count; i++, relocs++) - (*relocs)->address += insec->output_offset; - } -} - -#endif /* NLMCONV_ALPHA */ - -#ifdef NLMCONV_POWERPC - -/* We keep a linked list of stubs which we must build. Because BFD - requires us to know the sizes of all sections before we can set the - contents of any, we must figure out which stubs we want to build - before we can actually build any of them. */ - -struct powerpc_stub -{ - /* Next stub in linked list. */ - struct powerpc_stub *next; - - /* Symbol whose value is the start of the stub. This is a symbol - whose name begins with `.'. */ - asymbol *start; - - /* Symbol we are going to create a reloc against. This is a symbol - with the same name as START but without the leading `.'. */ - asymbol *reloc; - - /* The TOC index for this stub. This is the index into the TOC - section at which the reloc is created. */ - unsigned int toc_index; -}; - -/* The linked list of stubs. */ - -static struct powerpc_stub *powerpc_stubs; - -/* This is what a stub looks like. The first instruction will get - adjusted with the correct TOC index. */ - -static unsigned long powerpc_stub_insns[] = -{ - 0x81820000, /* lwz r12,0(r2) */ - 0x90410014, /* stw r2,20(r1) */ - 0x800c0000, /* lwz r0,0(r12) */ - 0x804c0004, /* lwz r2,r(r12) */ - 0x7c0903a6, /* mtctr r0 */ - 0x4e800420, /* bctr */ - 0, /* Traceback table. */ - 0xc8000, - 0 -}; - -#define POWERPC_STUB_INSN_COUNT \ - (sizeof powerpc_stub_insns / sizeof powerpc_stub_insns[0]) - -#define POWERPC_STUB_SIZE (4 * POWERPC_STUB_INSN_COUNT) - -/* Each stub uses a four byte TOC entry. */ -#define POWERPC_STUB_TOC_ENTRY_SIZE (4) - -/* The original size of the .got section. */ -static bfd_size_type powerpc_initial_got_size; - -/* Look for all undefined symbols beginning with `.', and prepare to - build a stub for each one. */ - -static void -powerpc_build_stubs (bfd *inbfd, bfd *outbfd ATTRIBUTE_UNUSED, - asymbol ***symbols_ptr, long *symcount_ptr) -{ - asection *stub_sec; - asection *got_sec; - unsigned int got_base; - long i; - long symcount; - long stubcount; - - /* Make a section to hold stubs. We don't set SEC_HAS_CONTENTS for - the section to prevent copy_sections from reading from it. */ - stub_sec = bfd_make_section_with_flags (inbfd, ".stubs", - (SEC_CODE - | SEC_RELOC - | SEC_ALLOC - | SEC_LOAD)); - if (stub_sec == (asection *) NULL - || ! bfd_set_section_alignment (inbfd, stub_sec, 2)) - bfd_fatal (".stubs"); - - /* Get the TOC section, which is named .got. */ - got_sec = bfd_get_section_by_name (inbfd, ".got"); - if (got_sec == (asection *) NULL) - { - got_sec = bfd_make_section_with_flags (inbfd, ".got", - (SEC_DATA - | SEC_RELOC - | SEC_ALLOC - | SEC_LOAD - | SEC_HAS_CONTENTS)); - if (got_sec == (asection *) NULL - || ! bfd_set_section_alignment (inbfd, got_sec, 2)) - bfd_fatal (".got"); - } - - powerpc_initial_got_size = bfd_section_size (inbfd, got_sec); - got_base = powerpc_initial_got_size; - got_base = (got_base + 3) &~ 3; - - stubcount = 0; - - symcount = *symcount_ptr; - for (i = 0; i < symcount; i++) - { - asymbol *sym; - asymbol *newsym; - char *newname; - struct powerpc_stub *item; - - sym = (*symbols_ptr)[i]; - - /* We must make a stub for every undefined symbol whose name - starts with '.'. */ - if (bfd_asymbol_name (sym)[0] != '.' - || ! bfd_is_und_section (bfd_get_section (sym))) - continue; - - /* Make a new undefined symbol with the same name but without - the leading `.'. */ - newsym = xmalloc (sizeof (asymbol)); - *newsym = *sym; - newname = xmalloc (strlen (bfd_asymbol_name (sym))); - strcpy (newname, bfd_asymbol_name (sym) + 1); - newsym->name = newname; - - /* Define the `.' symbol to be in the stub section. */ - sym->section = stub_sec; - sym->value = stubcount * POWERPC_STUB_SIZE; - /* We set the BSF_DYNAMIC flag here so that we can check it when - we are mangling relocs. FIXME: This is a hack. */ - sym->flags = BSF_LOCAL | BSF_DYNAMIC; - - /* Add this stub to the linked list. */ - item = (struct powerpc_stub *) xmalloc (sizeof (struct powerpc_stub)); - item->start = sym; - item->reloc = newsym; - item->toc_index = got_base + stubcount * POWERPC_STUB_TOC_ENTRY_SIZE; - - item->next = powerpc_stubs; - powerpc_stubs = item; - - ++stubcount; - } - - if (stubcount > 0) - { - asymbol **s; - struct powerpc_stub *l; - - /* Add the new symbols we just created to the symbol table. */ - *symbols_ptr = (asymbol **) xrealloc ((char *) *symbols_ptr, - ((symcount + stubcount) - * sizeof (asymbol))); - *symcount_ptr += stubcount; - s = &(*symbols_ptr)[symcount]; - for (l = powerpc_stubs; l != (struct powerpc_stub *) NULL; l = l->next) - *s++ = l->reloc; - - /* Set the size of the .stubs section and increase the size of - the .got section. */ - if (! bfd_set_section_size (inbfd, stub_sec, - stubcount * POWERPC_STUB_SIZE) - || ! bfd_set_section_size (inbfd, got_sec, - (got_base - + (stubcount - * POWERPC_STUB_TOC_ENTRY_SIZE)))) - bfd_fatal (_("stub section sizes")); - } -} - -/* Resolve all the stubs for PowerPC NetWare. We fill in the contents - of the output section, and create new relocs in the TOC. */ - -static void -powerpc_resolve_stubs (bfd *inbfd, bfd *outbfd) -{ - bfd_byte buf[POWERPC_STUB_SIZE]; - unsigned int i; - unsigned int stubcount; - arelent **relocs; - asection *got_sec; - arelent **r; - struct powerpc_stub *l; - - if (powerpc_stubs == (struct powerpc_stub *) NULL) - return; - - for (i = 0; i < POWERPC_STUB_INSN_COUNT; i++) - bfd_put_32 (outbfd, (bfd_vma) powerpc_stub_insns[i], buf + i * 4); - - got_sec = bfd_get_section_by_name (inbfd, ".got"); - assert (got_sec != (asection *) NULL); - assert (got_sec->output_section->orelocation == (arelent **) NULL); - - stubcount = 0; - for (l = powerpc_stubs; l != (struct powerpc_stub *) NULL; l = l->next) - ++stubcount; - relocs = (arelent **) xmalloc (stubcount * sizeof (arelent *)); - - r = relocs; - for (l = powerpc_stubs; l != (struct powerpc_stub *) NULL; l = l->next) - { - arelent *reloc; - - /* Adjust the first instruction to use the right TOC index. */ - bfd_put_32 (outbfd, (bfd_vma) powerpc_stub_insns[0] + l->toc_index, buf); - - /* Write this stub out. */ - if (! bfd_set_section_contents (outbfd, - bfd_get_section (l->start), - buf, - l->start->value, - POWERPC_STUB_SIZE)) - bfd_fatal (_("writing stub")); - - /* Create a new reloc for the TOC entry. */ - reloc = (arelent *) xmalloc (sizeof (arelent)); - reloc->sym_ptr_ptr = &l->reloc; - reloc->address = l->toc_index + got_sec->output_offset; - reloc->addend = 0; - reloc->howto = bfd_reloc_type_lookup (inbfd, BFD_RELOC_32); - - *r++ = reloc; - } - - bfd_set_reloc (outbfd, got_sec->output_section, relocs, stubcount); -} - -/* Adjust relocation entries for PowerPC NetWare. We do not output - TOC relocations. The object code already contains the offset from - the TOC pointer. When the function is called, the TOC register, - r2, will be set to the correct TOC value, so there is no need for - any further reloc. */ - -static void -powerpc_mangle_relocs (bfd *outbfd, asection *insec, - arelent ***relocs_ptr, - long *reloc_count_ptr, char *contents, - bfd_size_type contents_size ATTRIBUTE_UNUSED) -{ - reloc_howto_type *toc_howto; - long reloc_count; - arelent **relocs; - long i; - - toc_howto = bfd_reloc_type_lookup (insec->owner, BFD_RELOC_PPC_TOC16); - if (toc_howto == (reloc_howto_type *) NULL) - fatal (_("Unable to locate PPC_TOC16 reloc information")); - - /* If this is the .got section, clear out all the contents beyond - the initial size. We must do this here because copy_sections is - 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, - (size_t) (bfd_get_section_size (insec) - powerpc_initial_got_size)); - - reloc_count = *reloc_count_ptr; - relocs = *relocs_ptr; - for (i = 0; i < reloc_count; i++) - { - arelent *rel; - asymbol *sym; - 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; - } - } - - /* PR 17512: file: 70cfde95. */ - if (rel->howto == NULL) - continue; - - /* 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 - pointer to a function descriptor. */ - if (rel->howto->pc_relative) - { - /* This check for whether a symbol is in the same section as - the reloc will be wrong if there is a PC relative reloc - between two sections both of which were placed in the - same output section. This should not happen. */ - if (bfd_get_section (sym) != insec->output_section) - non_fatal (_("unresolved PC relative reloc against %s"), - bfd_asymbol_name (sym)); - else - { - bfd_vma val; - - if (rel->address > contents_size - 4) - { - non_fatal (_("Out of range relocation: %lx"), - (long) rel->address); - break; - } - - assert (rel->howto->size == 2 && rel->howto->pcrel_offset); - val = bfd_get_32 (outbfd, (bfd_byte *) contents + rel->address); - val = ((val &~ rel->howto->dst_mask) - | (((val & rel->howto->src_mask) - + (sym->value - rel->address) - + rel->addend) - & rel->howto->dst_mask)); - bfd_put_32 (outbfd, val, (bfd_byte *) contents + rel->address); - - /* If this reloc is against an stubbed symbol and the - next instruction is - cror 31,31,31 - then we replace the next instruction with - lwz r2,20(r1) - This reloads the TOC pointer after a stub call. */ - if (bfd_asymbol_name (sym)[0] == '.' - && (sym->flags & BSF_DYNAMIC) != 0 - && (bfd_get_32 (outbfd, - (bfd_byte *) contents + rel->address + 4) - == 0x4ffffb82)) /* cror 31,31,31 */ - bfd_put_32 (outbfd, (bfd_vma) 0x80410014, /* lwz r2,20(r1) */ - (bfd_byte *) contents + rel->address + 4); - - --*reloc_count_ptr; - --relocs; - memmove (relocs, relocs + 1, - (size_t) ((reloc_count - 1) * sizeof (arelent *))); - continue; - } - } - - /* When considering a TOC reloc, we do not want to include the - 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) - sym_value = 0; - else - 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 (sym_value + rel->addend != 0) - { - bfd_vma val; - - switch (rel->howto->size) - { - case 1: - if (rel->address > contents_size - 2) - { - non_fatal (_("Out of range relocation: %lx"), - (long) rel->address); - break; - } - - val = bfd_get_16 (outbfd, - (bfd_byte *) contents + rel->address); - val = ((val &~ rel->howto->dst_mask) - | (((val & rel->howto->src_mask) - + sym_value - + rel->addend) - & rel->howto->dst_mask)); - if ((bfd_signed_vma) val < - 0x8000 - || (bfd_signed_vma) val >= 0x8000) - non_fatal (_("overflow when adjusting relocation against %s"), - bfd_asymbol_name (sym)); - bfd_put_16 (outbfd, val, (bfd_byte *) contents + rel->address); - break; - - case 2: - /* PR 17512: file: 0455a112. */ - if (rel->address > contents_size - 4) - { - non_fatal (_("Out of range relocation: %lx"), - (long) rel->address); - break; - } - - val = bfd_get_32 (outbfd, - (bfd_byte *) contents + rel->address); - val = ((val &~ rel->howto->dst_mask) - | (((val & rel->howto->src_mask) - + sym_value - + rel->addend) - & rel->howto->dst_mask)); - bfd_put_32 (outbfd, val, (bfd_byte *) contents + rel->address); - break; - - default: - fatal (_("Unsupported relocation size: %d"), rel->howto->size); - } - - if (! bfd_is_und_section (bfd_get_section (sym))) - rel->sym_ptr_ptr = bfd_get_section (sym)->symbol_ptr_ptr; - rel->addend = 0; - } - - /* Now that we have incorporated the addend, remove any TOC - relocs. */ - if (rel->howto == toc_howto) - { - --*reloc_count_ptr; - --relocs; - memmove (relocs, relocs + 1, - (size_t) ((reloc_count - i) * sizeof (arelent *))); - continue; - } - - rel->address += insec->output_offset; - } -} - -#endif /* NLMCONV_POWERPC */ - -/* Name of linker. */ -#ifndef LD_NAME -#define LD_NAME "ld" -#endif - -/* The user has specified several input files. Invoke the linker to - link them all together, and convert and delete the resulting output - file. */ - -static char * -link_inputs (struct string_list *inputs, char *ld, char * mfile) -{ - size_t c; - struct string_list *q; - char **argv; - size_t i; - int pid; - int status; - char *errfmt; - char *errarg; - - c = 0; - for (q = inputs; q != NULL; q = q->next) - ++c; - - argv = (char **) xmalloc ((c + 7) * sizeof (char *)); - -#ifndef __MSDOS__ - if (ld == NULL) - { - char *p; - - /* Find the linker to invoke based on how nlmconv was run. */ - p = program_name + strlen (program_name); - while (p != program_name) - { - if (p[-1] == '/') - { - ld = (char *) xmalloc (p - program_name + strlen (LD_NAME) + 1); - memcpy (ld, program_name, p - program_name); - strcpy (ld + (p - program_name), LD_NAME); - break; - } - --p; - } - } -#endif - - if (ld == NULL) - ld = (char *) LD_NAME; - - unlink_on_exit = make_temp_file (".O"); - - argv[0] = ld; - argv[1] = (char *) "-Ur"; - argv[2] = (char *) "-o"; - argv[3] = unlink_on_exit; - /* If we have been given the name of a mapfile and that - name is not 'stderr' then pass it on to the linker. */ - if (mfile - && * mfile - && strcmp (mfile, "stderr") == 0) - { - argv[4] = (char *) "-Map"; - argv[5] = mfile; - i = 6; - } - else - i = 4; - - for (q = inputs; q != NULL; q = q->next, i++) - argv[i] = q->string; - argv[i] = NULL; - - if (debug) - { - for (i = 0; argv[i] != NULL; i++) - fprintf (stderr, " %s", argv[i]); - fprintf (stderr, "\n"); - } - - pid = pexecute (ld, argv, program_name, (char *) NULL, &errfmt, &errarg, - PEXECUTE_SEARCH | PEXECUTE_ONE); - free (argv); - - if (pid == -1) - { - 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); - } - - if (status != 0) - { - non_fatal (_("Execution of %s failed"), ld); - unlink (unlink_on_exit); - exit (1); - } - - return unlink_on_exit; -} diff --git a/binutils/nlmconv.h b/binutils/nlmconv.h deleted file mode 100644 index b2267d9..0000000 --- a/binutils/nlmconv.h +++ /dev/null @@ -1,86 +0,0 @@ -/* nlmconv.h -- header file for NLM conversion program - Copyright (C) 1993-2018 Free Software Foundation, Inc. - - This file is part of GNU Binutils. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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., 51 Franklin Street - Fifth Floor, Boston, - MA 02110-1301, USA. */ - - -/* Written by Ian Lance Taylor <ian@cygnus.com>. - - bfd.h, nlm/common.h and nlm/internal.h must be included before this - file. */ - -/* A linked list of strings. */ - -struct string_list -{ - struct string_list *next; - char *string; -}; - -/* The NLM header parser in nlmheader.y stores information in the - following variables. */ - -extern Nlm_Internal_Fixed_Header *fixed_hdr; -extern Nlm_Internal_Variable_Header *var_hdr; -extern Nlm_Internal_Version_Header *version_hdr; -extern Nlm_Internal_Copyright_Header *copyright_hdr; -extern Nlm_Internal_Extended_Header *extended_hdr; - -/* Procedure named by CHECK. */ -extern char *check_procedure; -/* File named by CUSTOM. */ -extern char *custom_file; -/* Whether to generate debugging information (DEBUG). */ -extern bfd_boolean debug_info; -/* Procedure named by EXIT. */ -extern char *exit_procedure; -/* Exported symbols (EXPORT). */ -extern struct string_list *export_symbols; -/* List of files from INPUT. */ -extern struct string_list *input_files; -/* Map file name (MAP, FULLMAP). */ -extern char *map_file; -/* Whether a full map has been requested (FULLMAP). */ -extern bfd_boolean full_map; -/* File named by HELP. */ -extern char *help_file; -/* Imported symbols (IMPORT). */ -extern struct string_list *import_symbols; -/* File named by MESSAGES. */ -extern char *message_file; -/* Autoload module list (MODULE). */ -extern struct string_list *modules; -/* File named by OUTPUT. */ -extern char *output_file; -/* File named by SHARELIB. */ -extern char *sharelib_file; -/* Start procedure name (START). */ -extern char *start_procedure; -/* VERBOSE. */ -extern bfd_boolean verbose; -/* RPC description file (XDCDATA). */ -extern char *rpc_file; - -/* The number of serious parse errors. */ -extern int parse_errors; - -/* The parser. */ -extern int yyparse (void); - -/* Tell the lexer what file to read. */ -extern bfd_boolean nlmlex_file (const char *); diff --git a/binutils/nlmheader.y b/binutils/nlmheader.y deleted file mode 100644 index 1bf01e0..0000000 --- a/binutils/nlmheader.y +++ /dev/null @@ -1,959 +0,0 @@ -%{/* nlmheader.y - parse NLM header specification keywords. - Copyright (C) 1993-2018 Free Software Foundation, Inc. - - This file is part of GNU Binutils. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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., 51 Franklin Street - Fifth Floor, Boston, - MA 02110-1301, USA. */ - -/* Written by Ian Lance Taylor <ian@cygnus.com>. - - This bison file parses the commands recognized by the NetWare NLM - linker, except for lists of object files. It stores the - information in global variables. - - This implementation is based on the description in the NetWare Tool - Maker Specification manual, edition 1.0. */ - -#include "sysdep.h" -#include "safe-ctype.h" -#include "bfd.h" -#include "nlm/common.h" -#include "nlm/internal.h" -#include "bucomm.h" -#include "nlmconv.h" - -/* Information is stored in the structures pointed to by these - variables. */ - -Nlm_Internal_Fixed_Header *fixed_hdr; -Nlm_Internal_Variable_Header *var_hdr; -Nlm_Internal_Version_Header *version_hdr; -Nlm_Internal_Copyright_Header *copyright_hdr; -Nlm_Internal_Extended_Header *extended_hdr; - -/* Procedure named by CHECK. */ -char *check_procedure; -/* File named by CUSTOM. */ -char *custom_file; -/* Whether to generate debugging information (DEBUG). */ -bfd_boolean debug_info; -/* Procedure named by EXIT. */ -char *exit_procedure; -/* Exported symbols (EXPORT). */ -struct string_list *export_symbols; -/* List of files from INPUT. */ -struct string_list *input_files; -/* Map file name (MAP, FULLMAP). */ -char *map_file; -/* Whether a full map has been requested (FULLMAP). */ -bfd_boolean full_map; -/* File named by HELP. */ -char *help_file; -/* Imported symbols (IMPORT). */ -struct string_list *import_symbols; -/* File named by MESSAGES. */ -char *message_file; -/* Autoload module list (MODULE). */ -struct string_list *modules; -/* File named by OUTPUT. */ -char *output_file; -/* File named by SHARELIB. */ -char *sharelib_file; -/* Start procedure name (START). */ -char *start_procedure; -/* VERBOSE. */ -bfd_boolean verbose; -/* RPC description file (XDCDATA). */ -char *rpc_file; - -/* The number of serious errors that have occurred. */ -int parse_errors; - -/* The current symbol prefix when reading a list of import or export - symbols. */ -static char *symbol_prefix; - -/* Parser error message handler. */ -#define yyerror(msg) nlmheader_error (msg); - -/* Local functions. */ -static int yylex (void); -static void nlmlex_file_push (const char *); -static bfd_boolean nlmlex_file_open (const char *); -static int nlmlex_buf_init (void); -static char nlmlex_buf_add (int); -static long nlmlex_get_number (const char *); -static void nlmheader_identify (void); -static void nlmheader_warn (const char *, int); -static void nlmheader_error (const char *); -static struct string_list * string_list_cons (char *, struct string_list *); -static struct string_list * string_list_append (struct string_list *, - struct string_list *); -static struct string_list * string_list_append1 (struct string_list *, - char *); -static char *xstrdup (const char *); - -%} - -%union -{ - char *string; - struct string_list *list; -}; - -/* The reserved words. */ - -%token CHECK CODESTART COPYRIGHT CUSTOM DATE DEBUG_K DESCRIPTION EXIT -%token EXPORT FLAG_ON FLAG_OFF FULLMAP HELP IMPORT INPUT MAP MESSAGES -%token MODULE MULTIPLE OS_DOMAIN OUTPUT PSEUDOPREEMPTION REENTRANT -%token SCREENNAME SHARELIB STACK START SYNCHRONIZE -%token THREADNAME TYPE VERBOSE VERSIONK XDCDATA - -/* Arguments. */ - -%token <string> STRING -%token <string> QUOTED_STRING - -/* Typed non-terminals. */ -%type <list> symbol_list_opt symbol_list string_list -%type <string> symbol - -%% - -/* Keywords must start in the leftmost column of the file. Arguments - may appear anywhere else. The lexer uses this to determine what - token to return, so we don't have to worry about it here. */ - -/* The entire file is just a list of commands. */ - -file: - commands - ; - -/* A possibly empty list of commands. */ - -commands: - /* May be empty. */ - | command commands - ; - -/* A single command. There is where most of the work takes place. */ - -command: - CHECK STRING - { - check_procedure = $2; - } - | CODESTART STRING - { - nlmheader_warn (_("CODESTART is not implemented; sorry"), -1); - free ($2); - } - | COPYRIGHT QUOTED_STRING - { - int len; - - strncpy (copyright_hdr->stamp, "CoPyRiGhT=", 10); - len = strlen ($2); - if (len >= NLM_MAX_COPYRIGHT_MESSAGE_LENGTH) - { - nlmheader_warn (_("copyright string is too long"), - NLM_MAX_COPYRIGHT_MESSAGE_LENGTH - 1); - len = NLM_MAX_COPYRIGHT_MESSAGE_LENGTH - 1; - } - copyright_hdr->copyrightMessageLength = len; - strncpy (copyright_hdr->copyrightMessage, $2, len); - copyright_hdr->copyrightMessage[len] = '\0'; - free ($2); - } - | CUSTOM STRING - { - custom_file = $2; - } - | DATE STRING STRING STRING - { - /* We don't set the version stamp here, because we use the - version stamp to detect whether the required VERSION - keyword was given. */ - version_hdr->month = nlmlex_get_number ($2); - version_hdr->day = nlmlex_get_number ($3); - version_hdr->year = nlmlex_get_number ($4); - free ($2); - free ($3); - free ($4); - if (version_hdr->month < 1 || version_hdr->month > 12) - nlmheader_warn (_("illegal month"), -1); - if (version_hdr->day < 1 || version_hdr->day > 31) - nlmheader_warn (_("illegal day"), -1); - if (version_hdr->year < 1900 || version_hdr->year > 3000) - nlmheader_warn (_("illegal year"), -1); - } - | DEBUG_K - { - debug_info = TRUE; - } - | DESCRIPTION QUOTED_STRING - { - int len; - - len = strlen ($2); - if (len > NLM_MAX_DESCRIPTION_LENGTH) - { - nlmheader_warn (_("description string is too long"), - NLM_MAX_DESCRIPTION_LENGTH); - len = NLM_MAX_DESCRIPTION_LENGTH; - } - var_hdr->descriptionLength = len; - strncpy (var_hdr->descriptionText, $2, len); - var_hdr->descriptionText[len] = '\0'; - free ($2); - } - | EXIT STRING - { - exit_procedure = $2; - } - | EXPORT - { - symbol_prefix = NULL; - } - symbol_list_opt - { - export_symbols = string_list_append (export_symbols, $3); - } - | FLAG_ON STRING - { - fixed_hdr->flags |= nlmlex_get_number ($2); - free ($2); - } - | FLAG_OFF STRING - { - fixed_hdr->flags &=~ nlmlex_get_number ($2); - free ($2); - } - | FULLMAP - { - map_file = ""; - full_map = TRUE; - } - | FULLMAP STRING - { - map_file = $2; - full_map = TRUE; - } - | HELP STRING - { - help_file = $2; - } - | IMPORT - { - symbol_prefix = NULL; - } - symbol_list_opt - { - import_symbols = string_list_append (import_symbols, $3); - } - | INPUT string_list - { - input_files = string_list_append (input_files, $2); - } - | MAP - { - map_file = ""; - } - | MAP STRING - { - map_file = $2; - } - | MESSAGES STRING - { - message_file = $2; - } - | MODULE string_list - { - modules = string_list_append (modules, $2); - } - | MULTIPLE - { - fixed_hdr->flags |= 0x2; - } - | OS_DOMAIN - { - fixed_hdr->flags |= 0x10; - } - | OUTPUT STRING - { - if (output_file == NULL) - output_file = $2; - else - nlmheader_warn (_("ignoring duplicate OUTPUT statement"), -1); - } - | PSEUDOPREEMPTION - { - fixed_hdr->flags |= 0x8; - } - | REENTRANT - { - fixed_hdr->flags |= 0x1; - } - | SCREENNAME QUOTED_STRING - { - int len; - - len = strlen ($2); - if (len >= NLM_MAX_SCREEN_NAME_LENGTH) - { - nlmheader_warn (_("screen name is too long"), - NLM_MAX_SCREEN_NAME_LENGTH); - len = NLM_MAX_SCREEN_NAME_LENGTH; - } - var_hdr->screenNameLength = len; - strncpy (var_hdr->screenName, $2, len); - var_hdr->screenName[NLM_MAX_SCREEN_NAME_LENGTH] = '\0'; - free ($2); - } - | SHARELIB STRING - { - sharelib_file = $2; - } - | STACK STRING - { - var_hdr->stackSize = nlmlex_get_number ($2); - free ($2); - } - | START STRING - { - start_procedure = $2; - } - | SYNCHRONIZE - { - fixed_hdr->flags |= 0x4; - } - | THREADNAME QUOTED_STRING - { - int len; - - len = strlen ($2); - if (len >= NLM_MAX_THREAD_NAME_LENGTH) - { - nlmheader_warn (_("thread name is too long"), - NLM_MAX_THREAD_NAME_LENGTH); - len = NLM_MAX_THREAD_NAME_LENGTH; - } - var_hdr->threadNameLength = len; - strncpy (var_hdr->threadName, $2, len); - var_hdr->threadName[len] = '\0'; - free ($2); - } - | TYPE STRING - { - fixed_hdr->moduleType = nlmlex_get_number ($2); - free ($2); - } - | VERBOSE - { - verbose = TRUE; - } - | VERSIONK STRING STRING STRING - { - long val; - - strncpy (version_hdr->stamp, "VeRsIoN#", 8); - version_hdr->majorVersion = nlmlex_get_number ($2); - val = nlmlex_get_number ($3); - if (val < 0 || val > 99) - nlmheader_warn (_("illegal minor version number (must be between 0 and 99)"), - -1); - else - version_hdr->minorVersion = val; - val = nlmlex_get_number ($4); - if (val < 0) - nlmheader_warn (_("illegal revision number (must be between 0 and 26)"), - -1); - else if (val > 26) - version_hdr->revision = 0; - else - version_hdr->revision = val; - free ($2); - free ($3); - free ($4); - } - | VERSIONK STRING STRING - { - long val; - - strncpy (version_hdr->stamp, "VeRsIoN#", 8); - version_hdr->majorVersion = nlmlex_get_number ($2); - val = nlmlex_get_number ($3); - if (val < 0 || val > 99) - nlmheader_warn (_("illegal minor version number (must be between 0 and 99)"), - -1); - else - version_hdr->minorVersion = val; - version_hdr->revision = 0; - free ($2); - free ($3); - } - | XDCDATA STRING - { - rpc_file = $2; - } - ; - -/* A possibly empty list of symbols. */ - -symbol_list_opt: - /* Empty. */ - { - $$ = NULL; - } - | symbol_list - { - $$ = $1; - } - ; - -/* A list of symbols in an import or export list. Prefixes may appear - in parentheses. We need to use left recursion here to avoid - building up a large import list on the parser stack. */ - -symbol_list: - symbol - { - $$ = string_list_cons ($1, NULL); - } - | symbol_prefix - { - $$ = NULL; - } - | symbol_list symbol - { - $$ = string_list_append1 ($1, $2); - } - | symbol_list symbol_prefix - { - $$ = $1; - } - ; - -/* A prefix for subsequent symbols. */ - -symbol_prefix: - '(' STRING ')' - { - if (symbol_prefix != NULL) - free (symbol_prefix); - symbol_prefix = $2; - } - ; - -/* A single symbol. */ - -symbol: - STRING - { - if (symbol_prefix == NULL) - $$ = $1; - else - { - $$ = xmalloc (strlen (symbol_prefix) + strlen ($1) + 2); - sprintf ($$, "%s@%s", symbol_prefix, $1); - free ($1); - } - } - ; - -/* A list of strings. */ - -string_list: - /* May be empty. */ - { - $$ = NULL; - } - | STRING string_list - { - $$ = string_list_cons ($1, $2); - } - ; - -%% - -/* If strerror is just a macro, we want to use the one from libiberty - since it will handle undefined values. */ -#undef strerror -extern char *strerror (int); - -/* The lexer is simple, too simple for flex. Keywords are only - recognized at the start of lines. Everything else must be an - argument. A comma is treated as whitespace. */ - -/* The states the lexer can be in. */ - -enum lex_state -{ - /* At the beginning of a line. */ - BEGINNING_OF_LINE, - /* In the middle of a line. */ - IN_LINE -}; - -/* We need to keep a stack of files to handle file inclusion. */ - -struct input -{ - /* The file to read from. */ - FILE *file; - /* The name of the file. */ - char *name; - /* The current line number. */ - int lineno; - /* The current state. */ - enum lex_state state; - /* The next file on the stack. */ - struct input *next; -}; - -/* The current input file. */ - -static struct input current; - -/* The character which introduces comments. */ -#define COMMENT_CHAR '#' - -/* Start the lexer going on the main input file. */ - -bfd_boolean -nlmlex_file (const char *name) -{ - current.next = NULL; - return nlmlex_file_open (name); -} - -/* Start the lexer going on a subsidiary input file. */ - -static void -nlmlex_file_push (const char *name) -{ - struct input *push; - - push = (struct input *) xmalloc (sizeof (struct input)); - *push = current; - if (nlmlex_file_open (name)) - current.next = push; - else - { - current = *push; - free (push); - } -} - -/* Start lexing from a file. */ - -static bfd_boolean -nlmlex_file_open (const char *name) -{ - current.file = fopen (name, "r"); - if (current.file == NULL) - { - fprintf (stderr, "%s:%s: %s\n", program_name, name, strerror (errno)); - ++parse_errors; - return FALSE; - } - current.name = xstrdup (name); - current.lineno = 1; - current.state = BEGINNING_OF_LINE; - return TRUE; -} - -/* Table used to turn keywords into tokens. */ - -struct keyword_tokens_struct -{ - const char *keyword; - int token; -}; - -static struct keyword_tokens_struct keyword_tokens[] = -{ - { "CHECK", CHECK }, - { "CODESTART", CODESTART }, - { "COPYRIGHT", COPYRIGHT }, - { "CUSTOM", CUSTOM }, - { "DATE", DATE }, - { "DEBUG", DEBUG_K }, - { "DESCRIPTION", DESCRIPTION }, - { "EXIT", EXIT }, - { "EXPORT", EXPORT }, - { "FLAG_ON", FLAG_ON }, - { "FLAG_OFF", FLAG_OFF }, - { "FULLMAP", FULLMAP }, - { "HELP", HELP }, - { "IMPORT", IMPORT }, - { "INPUT", INPUT }, - { "MAP", MAP }, - { "MESSAGES", MESSAGES }, - { "MODULE", MODULE }, - { "MULTIPLE", MULTIPLE }, - { "OS_DOMAIN", OS_DOMAIN }, - { "OUTPUT", OUTPUT }, - { "PSEUDOPREEMPTION", PSEUDOPREEMPTION }, - { "REENTRANT", REENTRANT }, - { "SCREENNAME", SCREENNAME }, - { "SHARELIB", SHARELIB }, - { "STACK", STACK }, - { "STACKSIZE", STACK }, - { "START", START }, - { "SYNCHRONIZE", SYNCHRONIZE }, - { "THREADNAME", THREADNAME }, - { "TYPE", TYPE }, - { "VERBOSE", VERBOSE }, - { "VERSION", VERSIONK }, - { "XDCDATA", XDCDATA } -}; - -#define KEYWORD_COUNT (sizeof (keyword_tokens) / sizeof (keyword_tokens[0])) - -/* The lexer accumulates strings in these variables. */ -static char *lex_buf; -static int lex_size; -static int lex_pos; - -/* Start accumulating strings into the buffer. */ -#define BUF_INIT() \ - ((void) (lex_buf != NULL ? lex_pos = 0 : nlmlex_buf_init ())) - -static int -nlmlex_buf_init (void) -{ - lex_size = 10; - lex_buf = xmalloc (lex_size + 1); - lex_pos = 0; - return 0; -} - -/* Finish a string in the buffer. */ -#define BUF_FINISH() ((void) (lex_buf[lex_pos] = '\0')) - -/* Accumulate a character into the buffer. */ -#define BUF_ADD(c) \ - ((void) (lex_pos < lex_size \ - ? lex_buf[lex_pos++] = (c) \ - : nlmlex_buf_add (c))) - -static char -nlmlex_buf_add (int c) -{ - if (lex_pos >= lex_size) - { - lex_size *= 2; - lex_buf = xrealloc (lex_buf, lex_size + 1); - } - - return lex_buf[lex_pos++] = c; -} - -/* The lexer proper. This is called by the bison generated parsing - code. */ - -static int -yylex (void) -{ - int c; - -tail_recurse: - - c = getc (current.file); - - /* Commas are treated as whitespace characters. */ - while (ISSPACE (c) || c == ',') - { - current.state = IN_LINE; - if (c == '\n') - { - ++current.lineno; - current.state = BEGINNING_OF_LINE; - } - c = getc (current.file); - } - - /* At the end of the file we either pop to the previous file or - finish up. */ - if (c == EOF) - { - fclose (current.file); - free (current.name); - if (current.next == NULL) - return 0; - else - { - struct input *next; - - next = current.next; - current = *next; - free (next); - goto tail_recurse; - } - } - - /* A comment character always means to drop everything until the - next newline. */ - if (c == COMMENT_CHAR) - { - do - { - c = getc (current.file); - } - while (c != '\n'); - ++current.lineno; - current.state = BEGINNING_OF_LINE; - goto tail_recurse; - } - - /* An '@' introduces an include file. */ - if (c == '@') - { - do - { - c = getc (current.file); - if (c == '\n') - ++current.lineno; - } - while (ISSPACE (c)); - BUF_INIT (); - while (! ISSPACE (c) && c != EOF) - { - BUF_ADD (c); - c = getc (current.file); - } - BUF_FINISH (); - - ungetc (c, current.file); - - nlmlex_file_push (lex_buf); - goto tail_recurse; - } - - /* A non-space character at the start of a line must be the start of - a keyword. */ - if (current.state == BEGINNING_OF_LINE) - { - BUF_INIT (); - while (ISALNUM (c) || c == '_') - { - BUF_ADD (TOUPPER (c)); - c = getc (current.file); - } - BUF_FINISH (); - - if (c != EOF && ! ISSPACE (c) && c != ',') - { - nlmheader_identify (); - fprintf (stderr, _("%s:%d: illegal character in keyword: %c\n"), - current.name, current.lineno, c); - } - else - { - unsigned int i; - - for (i = 0; i < KEYWORD_COUNT; i++) - { - if (lex_buf[0] == keyword_tokens[i].keyword[0] - && strcmp (lex_buf, keyword_tokens[i].keyword) == 0) - { - /* Pushing back the final whitespace avoids worrying - about \n here. */ - ungetc (c, current.file); - current.state = IN_LINE; - return keyword_tokens[i].token; - } - } - - nlmheader_identify (); - fprintf (stderr, _("%s:%d: unrecognized keyword: %s\n"), - current.name, current.lineno, lex_buf); - } - - ++parse_errors; - /* Treat the rest of this line as a comment. */ - ungetc (COMMENT_CHAR, current.file); - goto tail_recurse; - } - - /* Parentheses just represent themselves. */ - if (c == '(' || c == ')') - return c; - - /* Handle quoted strings. */ - if (c == '"' || c == '\'') - { - int quote; - int start_lineno; - - quote = c; - start_lineno = current.lineno; - - c = getc (current.file); - BUF_INIT (); - while (c != quote && c != EOF) - { - BUF_ADD (c); - if (c == '\n') - ++current.lineno; - c = getc (current.file); - } - BUF_FINISH (); - - if (c == EOF) - { - nlmheader_identify (); - fprintf (stderr, _("%s:%d: end of file in quoted string\n"), - current.name, start_lineno); - ++parse_errors; - } - - /* FIXME: Possible memory leak. */ - yylval.string = xstrdup (lex_buf); - return QUOTED_STRING; - } - - /* Gather a generic argument. */ - BUF_INIT (); - while (! ISSPACE (c) - && c != ',' - && c != COMMENT_CHAR - && c != '(' - && c != ')') - { - BUF_ADD (c); - c = getc (current.file); - } - BUF_FINISH (); - - ungetc (c, current.file); - - /* FIXME: Possible memory leak. */ - yylval.string = xstrdup (lex_buf); - return STRING; -} - -/* Get a number from a string. */ - -static long -nlmlex_get_number (const char *s) -{ - long ret; - char *send; - - ret = strtol (s, &send, 10); - if (*send != '\0') - nlmheader_warn (_("bad number"), -1); - return ret; -} - -/* Prefix the nlmconv warnings with a note as to where they come from. - We don't use program_name on every warning, because then some - versions of the emacs next-error function can't recognize the line - number. */ - -static void -nlmheader_identify (void) -{ - static int done; - - if (! done) - { - fprintf (stderr, _("%s: problems in NLM command language input:\n"), - program_name); - done = 1; - } -} - -/* Issue a warning. */ - -static void -nlmheader_warn (const char *s, int imax) -{ - nlmheader_identify (); - fprintf (stderr, "%s:%d: %s", current.name, current.lineno, s); - if (imax != -1) - fprintf (stderr, " (max %d)", imax); - fprintf (stderr, "\n"); -} - -/* Report an error. */ - -static void -nlmheader_error (const char *s) -{ - nlmheader_warn (s, -1); - ++parse_errors; -} - -/* Add a string to a string list. */ - -static struct string_list * -string_list_cons (char *s, struct string_list *l) -{ - struct string_list *ret; - - ret = (struct string_list *) xmalloc (sizeof (struct string_list)); - ret->next = l; - ret->string = s; - return ret; -} - -/* Append a string list to another string list. */ - -static struct string_list * -string_list_append (struct string_list *l1, struct string_list *l2) -{ - register struct string_list **pp; - - for (pp = &l1; *pp != NULL; pp = &(*pp)->next) - ; - *pp = l2; - return l1; -} - -/* Append a string to a string list. */ - -static struct string_list * -string_list_append1 (struct string_list *l, char *s) -{ - struct string_list *n; - register struct string_list **pp; - - n = (struct string_list *) xmalloc (sizeof (struct string_list)); - n->next = NULL; - n->string = s; - for (pp = &l; *pp != NULL; pp = &(*pp)->next) - ; - *pp = n; - return l; -} - -/* Duplicate a string in memory. */ - -static char * -xstrdup (const char *s) -{ - unsigned long len; - char *ret; - - len = strlen (s); - ret = xmalloc (len + 1); - strcpy (ret, s); - return ret; -} diff --git a/binutils/po/POTFILES.in b/binutils/po/POTFILES.in index 7bda4c3..2795582 100644 --- a/binutils/po/POTFILES.in +++ b/binutils/po/POTFILES.in @@ -33,8 +33,6 @@ is-strip.c maybe-ranlib.c maybe-strip.c mclex.c -nlmconv.c -nlmconv.h nm.c not-ranlib.c not-strip.c diff --git a/binutils/testsuite/binutils-all/nm.exp b/binutils/testsuite/binutils-all/nm.exp index f8779c1..f966323 100644 --- a/binutils/testsuite/binutils-all/nm.exp +++ b/binutils/testsuite/binutils-all/nm.exp @@ -44,7 +44,7 @@ if {![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o]} then { # This test does not work correctly on ECOFF targets, because ECOFF # stores most symbols twice, which messes up the nm output. - setup_xfail "alpha*-*-osf*" "alpha*-*-netware*" + setup_xfail "alpha*-*-osf*" setup_xfail "mips*-*-ultrix*" "mips*-*-ecoff*" "mips*-*-irix4*" setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" "mips*-sony-bsd*" @@ -102,7 +102,7 @@ if {![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o]} then { # This test does not work correctly on ECOFF targets, because ECOFF # stores most symbols twice, which messes up the nm output. - setup_xfail "alpha*-*-osf*" "alpha*-*-netware*" + setup_xfail "alpha*-*-osf*" setup_xfail "mips*-*-ultrix*" "mips*-*-ecoff*" "mips*-*-irix4*" setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" "mips*-sony-bsd*" @@ -135,7 +135,6 @@ if { [is_elf_format] || [istarget *-*-freebsd*] || [istarget *-*-lynxos*] || [istarget "mmix-knuth-mmixware"] - || [istarget *-*-netware*] || [istarget *-*-nto*] || [istarget *-*-rdos*] || [istarget *-*-tpf*] @@ -160,7 +159,7 @@ if {![binutils_assemble $srcdir/$subdir/$nm_1_src tmpdir/nm-1.o]} then { # This test does not work correctly on ECOFF targets, because ECOFF # stores most symbols twice, which messes up the nm output. - setup_xfail "alpha*-*-osf*" "alpha*-*-netware*" + setup_xfail "alpha*-*-osf*" setup_xfail "mips*-*-ultrix*" "mips*-*-ecoff*" "mips*-*-irix4*" setup_xfail "mips*-*-riscos*" "mips*-*-sysv3*" "mips*-sony-bsd*" |