Changeset c2a4686 in network-demos

Timestamp:

06/22/07 19:54:58 (15 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, 57a009d5b89e72f488ab655184e6a33bb0fe6b7f, network-demos-4-10-branch, network-demos-4-8-branch, network-demos-4-9-branch

Children:

07e6684

Parents:

5e49d0d

Message:

2007-06-22 Joel Sherrill <joel.sherrill@…>

• Makefile, init.c: Clean up. Make name of TARFILE related symbols conditional based upon architecture. Change way desired object format is determined so all BSPs compile this test.

Location:

http

Files:

• ChangeLog (modified) (1 diff)
• Makefile (modified) (2 diffs)
• init.c (modified) (2 diffs)

http/ChangeLog

@@ +1 @@
+2007-06-22      Joel Sherrill <joel.sherrill@OARcorp.com>
+
+        * Makefile, init.c: Clean up. Make name of TARFILE related symbols
+        conditional based upon architecture. Change way desired object format
+        is determined so all BSPs compile this test.
+
 2007-06-21      Joel Sherrill <joel.sherrill@OARcorp.com>
 

http/Makefile

@@ -43 +43 @@
 LD_LIBS   += -lhttpd
 LD_LIBS   += -lftpd
-NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1  | grep copy: | cut -d':' -f3 | cut -d' ' -f2)
+#NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1  | grep copy: | cut -d':' -f3 | cut -d' ' -f2)
+OBJDUMP=$(OBJCOPY:copy=dump)
 
 #
@@ -52 +53 @@
 #
 
-CLEAN_ADDITIONS += tarfile
+CLEAN_ADDITIONS += tarfile obj_format
 CLOBBER_ADDITIONS +=
 
 all:    ${ARCH} $(SRCS) $(PGM)
 
-${PGM}: $(OBJS) $(LINK_FILES)
+obj_format:
+        $(OBJDUMP) -f $(ARCH)/init.o | grep .o: | \
+            sed -e 's/^.*format //' >obj_format
+
+${PGM}: $(OBJS) obj_format $(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
+        $(OBJCOPY) -I binary -O `cat obj_format` tarfile $(ARCH)/tarfile.o
+        $(LD) $(CPU_CFLAGS) -r -o $(ARCH)/temp.o \
+            $(ARCH)/init.o $(ARCH)/tarfile.o
         $(MV) $(ARCH)/temp.o  $(ARCH)/init.o
         $(RM) $(ARCH)/temp.o

http/init.c

@@ -57 +57 @@
 
 /*
- *  The tarfile is built in $(ARCH) so includes whether we were
- *  built optimized or debug.
+ *  The tarfile is built automatically externally so we need to account
+ *  for the leading symbol on the names.
  */
+#if defined(__sh__)
+  #define SYM(_x) _x
+#else
+  #define SYM(_x) _ ## _x
+#endif
 
-#if defined(USE_FTPD)
-/*
-#if defined(RTEMS_DEBUG)
-extern int _binary_o_debug_tarfile_start;
-extern int _binary_o_debug_tarfile_size;
-#define TARFILE_START _binary_o_debug_tarfile_start
-#define TARFILE_SIZE _binary_o_debug_tarfile_size
-#else
-extern int _binary_o_optimize_tarfile_start;
-extern int _binary_o_optimize_tarfile_size;
-#define TARFILE_START _binary_o_optimize_tarfile_start
-#define TARFILE_SIZE _binary_o_optimize_tarfile_size
-#endif
-*/
-extern int _binary_tarfile_start;
-extern int _binary_tarfile_size;
-#define TARFILE_START _binary_tarfile_start
-#define TARFILE_SIZE _binary_tarfile_size
-#endif
+extern int SYM(binary_tarfile_start);
+extern int SYM(binary_tarfile_size);
+#define TARFILE_START SYM(binary_tarfile_start)
+#define TARFILE_SIZE SYM(binary_tarfile_size)
 
 #if defined(USE_FTPD)
@@ -97 +87 @@
   printf("\n\n*** HTTP TEST ***\n\r" );
 
-  /* init_paging(); */
-
+  status = Untar_FromMemory((void *)(&TARFILE_START), (size_t)&TARFILE_SIZE);
+   
   rtems_bsdnet_initialize_network ();
 #if defined(USE_FTPD)
   rtems_initialize_ftpd();
+#endif
 
-  status = Untar_FromMemory((void *)(&TARFILE_START), (size_t)&TARFILE_SIZE);
-#endif
-   
 #if defined(USE_HTTPD)
   rtems_initialize_webserver();