X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fnlm.c;h=89c6baa64ef72e2f1a435fb56dc53c15e5cc8f41;hb=5608e05bb4ef95fdd0051137ed7db8d1a29ee5ea;hp=c941f72c4bc12e5e3c7151cd0e2004eb80cdf589;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/nlm.c b/bfd/nlm.c
index c941f72c4b..89c6baa64e 100644
--- a/bfd/nlm.c
+++ b/bfd/nlm.c
@@ -15,26 +15,41 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
-#define ARCH_SIZE 0
 #include "libnlm.h"
 
+/* Make an NLM object.  We just need to allocate the backend
+   information.  */
+
 boolean
-DEFUN (nlm_mkobject, (abfd), bfd * abfd)
+nlm_mkobject (abfd)
+     bfd * abfd;
 {
-#if 0	/* nlm_object_p does the nlm_tdata allocation */
   nlm_tdata (abfd) =
     (struct nlm_obj_tdata *) bfd_zalloc (abfd, sizeof (struct nlm_obj_tdata));
   if (nlm_tdata (abfd) == NULL)
-    {
-      bfd_error = no_memory;
-      return (false);
-    }
-#endif
+    return (false);
+
+  if (nlm_architecture (abfd) != bfd_arch_unknown)
+    bfd_default_set_arch_mach (abfd, nlm_architecture (abfd),
+			       nlm_machine (abfd));
+
   /* since everything is done at close time, do we need any initialization? */
   return (true);
 }
+
+/* Set the architecture and machine for an NLM object.  */
+
+boolean
+nlm_set_arch_mach (abfd, arch, machine)
+     bfd * abfd;
+     enum bfd_architecture arch;
+     unsigned long machine;
+{
+  bfd_default_set_arch_mach (abfd, arch, machine);
+  return arch == nlm_architecture (abfd);
+}