diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-12-02 19:13:38 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-12-02 19:13:38 +0000 |
| commit | 36ea4c2a7c0993b9e4577cb5597ee3e265d84ca8 (patch) | |
| tree | a8972ceeadf2c64dd08dc6dc5e7fc2e31fc9437f /c | |
| parent | 2002-12-02 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-36ea4c2a7c0993b9e4577cb5597ee3e265d84ca8.tar.bz2 | |
2002-12-02 Joel Sherrill <joel@OARcorp.com>
* configure.ac, network/Makefile.am: Don't build if networking disabled.
* startup/linkcmds: Add sections to remove warnings.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/arm/edb7312/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/edb7312/configure.ac | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/edb7312/network/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/edb7312/startup/linkcmds | 3 |
4 files changed, 12 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index ab642d7ceb..def10ed23e 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,8 @@ +2002-12-02 Joel Sherrill <joel@OARcorp.com> + + * configure.ac, network/Makefile.am: Don't build if networking disabled. + * startup/linkcmds: Add sections to remove warnings. + 2002-11-17 Joel Sherrill <joel@OARcorp.com> * network/network.c: Fix inconsistency in prototyping. diff --git a/c/src/lib/libbsp/arm/edb7312/configure.ac b/c/src/lib/libbsp/arm/edb7312/configure.ac index a01bff0c94..966358c6c3 100644 --- a/c/src/lib/libbsp/arm/edb7312/configure.ac +++ b/c/src/lib/libbsp/arm/edb7312/configure.ac @@ -15,7 +15,8 @@ RTEMS_BSP_CONFIGURE RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS - +RTEMS_CHECK_NETWORKING +AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile diff --git a/c/src/lib/libbsp/arm/edb7312/network/Makefile.am b/c/src/lib/libbsp/arm/edb7312/network/Makefile.am index fb06ff5e5b..eaca84fdfb 100644 --- a/c/src/lib/libbsp/arm/edb7312/network/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/network/Makefile.am @@ -34,7 +34,9 @@ $(PGM): $(OBJS) # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile +if HAS_NETWORKING all-local: $(ARCH) $(OBJS) $(PGM) +endif .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/arm/edb7312/startup/linkcmds b/c/src/lib/libbsp/arm/edb7312/startup/linkcmds index c88c9da52f..57ee03b36c 100644 --- a/c/src/lib/libbsp/arm/edb7312/startup/linkcmds +++ b/c/src/lib/libbsp/arm/edb7312/startup/linkcmds @@ -92,6 +92,9 @@ SECTIONS CREATE_OBJECT_SYMBOLS *(.text) *(.text.*) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t*) *(.glue_7) *(.glue_7t) |