http demo in network-demos

[Jay Monkman]

> Can you build t his one now?  I just noticed that the test script builds 
> all of the stuff in the
> main tarball, rtems-add-ons, and the examples but not the network demos.  :)

No, not with binutils 2.13.2. (I haven't tried 2.14). Ralf's
suggestion of using "-B arm" on objcopy did get rid of the warning
from objcopy:
    arm-rtems-objcopy: Warning: Output file cannot represent architecture UNKNOWN!

But it didn't get rid of the error from ld
    arm-rtems-ld: ERROR: o-debug/tarfile.o uses hardware FP, whereas o-debug/temp.o uses software FP
    File format not recognized: failed to merge target specific data of file o-debug/tarfile.o

It appears that object file objcopy creates is marked as using hardware
floating point, even though it doesn't even have any instructions in
it. The file is just a tar file with symbols marking the start, end,
and size of the tar file data.

If I change the makefile, and link in the tarfile directly, instead of
linking in the output of objcopy, it works fine. It gets the symbols
right for the tar file and everything. It even runs!

I submitted a PR, but now it looks like you (Joel) did too. Oops.

Here's my patch. 

diff -Naur http/ChangeLog http-new/ChangeLog
--- http/ChangeLog      2000-12-14 08:15:04.000000000 -0600
+++ http-new/ChangeLog  2003-09-18 10:58:23.000000000 -0500
@@ -1,3 +1,11 @@
+2003-09-18     Jay Monkman <jtm at smoothsmoothie.com>
+
+       * Removed unecessary lines from system.h
+
+       * Changed Makefile to not use objcopy to create a linkable
+          object file from the tar file. Instead, ld links it in
+          directly.
+
 2000-12-14     Joel Sherrill <joel at OARcorp.com>

        * ChangeLog: New file.
diff -Naur http/Makefile http-new/Makefile
--- http/Makefile       2001-08-31 13:11:44.000000000 -0500
+++ http-new/Makefile   2003-09-18 10:59:07.000000000 -0500
@@ -58,8 +58,8 @@
 ${PGM}: $(OBJS) $(LINK_FILES)
        cd rootfs ; tar cf ../$(ARCH)/tarfile web etc
        cp $(ARCH)/tarfile .
-       $(OBJCOPY) -I binary -O $(NATIVE_OBJ) tarfile
$(ARCH)/tarfile.o
-       $(LD) -r -o $(ARCH)/temp.o  $(ARCH)/init.o $(ARCH)/tarfile.o
+       $(LD) -r -o $(ARCH)/temp.o  $(ARCH)/init.o \
+               -b binary tarfile
        $(MV) $(ARCH)/temp.o  $(ARCH)/init.o
        $(RM) $(ARCH)/temp.o
        $(make-exe)
diff -Naur http/init.c http-new/init.c
--- http/init.c 2001-08-31 13:11:44.000000000 -0500
+++ http-new/init.c     2003-09-18 10:02:45.000000000 -0500
@@ -4,7 +4,7 @@
  *
  *  Don't forget to change the IP addresses
  */
-
+#include <bsp.h>
 #define USE_HTTPD
 #define USE_FTPD
 #define TEST_INIT
diff -Naur http/system.h http-new/system.h
--- http/system.h       1999-10-28 13:55:25.000000000 -0500
+++ http-new/system.h   2003-09-18 10:00:04.000000000 -0500
@@ -14,7 +14,9 @@
  *  system.h,v 1.1 1999/10/28 18:55:25 joel Exp
  */

-#include <tmacros.h>
+#ifndef __SYSTEM_H__
+#define __SYSTEM_H__
+

 /* functions */

@@ -22,12 +24,5 @@
   rtems_task_argument argument
 );

-/* configuration information */
-
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id Global_variable;    /* example global variable
-*/
-
+#endif
 /* end of include file */


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.rtems.org/pipermail/users/attachments/20030918/5ef6aa00/attachment-0001.bin>