From b62a92c804ea40e723864d1995edcb9075dd06c8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 4 Oct 1999 18:20:14 +0000 Subject: Patch from Ralf Corsepius : The patch below actuallly consists of two patches: 1) moving librpc to c/src/librpc similar to what has been done to librtems++ 2) reworked configure scripts, many safety and dependency checks added to aclocal/*.m4 macros + configuration fixes. To apply: mkdir c/src/librpc mkdir c/src/librpc/src cp c/src/lib/librpc/*.c c/src/librpc/src cp c/src/lib/librpc/Makefile.in c/src/librpc/src mkdir c/src/librpc/include mkdir c/src/librpc/include/rpc cp c/src/lib/include/rpc/* c/src/librpc/include/rpc patch -p1 < ../rtems-rc-19990820-7.diff rm -rf c/src/lib/librpc rm -rf c/src/lib/include/rpc ./autogen The additional checks in aclocal/*m4 macros add rather restrictive, sometimes unnecessarily restrictive constraints on the sequence of how macros can be used in a configure.in script. Adding them has let my problems with some more complicated configuration options vanish. Apparently some macros had not been in the required order . ---- Now I still get some linking errors for some cpus and bsps, esp when linking cdtest, but also at other locations: e.g. this happens for mips64orion/p4600: # make[5]: Entering directory `/lfs/poseidon/users/rtems/src/multi/build/mips64orion-rtems/c/p4600/tests/samples/hello' /opt/rtems/bin/mips64orion-rtems-gcc --pipe -B../../../../../../p4600/lib/ -specs bsp_specs -qrtems -DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3 -mcpu=4600 -G0 -I../../../../../../p4600/lib/include/networking -g -Wall -ansi -fasm -O4 -fomit-frame-pointer -o o-p4600/hello.exe o-p4600/init.o ../../../../../../p4600/lib/no-dpmem.rel ../../../../../../p4600/lib/no-event.rel ../../../../../../p4600/lib/no-msg.rel ../../../../../../p4600/lib/no-mp.rel ../../../../../../p4600/lib/no-part.rel ../../../../../../p4600/lib/no-signal.rel ../../../../../../p4600/lib/no-timer.rel ../../../../../../p4600/lib/no-rtmon.rel /opt/rtems/mips64orion-rtems/lib/libc.a(dtoa.o): In function `_dtoa_r': /opt/hermes/embedded/build/build-mips64orion-tools/mips64orion-rtems/newlib/libc/stdlib/../../../../../src/newlib/libc/stdlib/dtoa.c:348: relocation truncated to fit: R_MIPS_LITERAL no symbol /opt/hermes/embedded/build/build-mips64orion-tools/mips64orion-rtems/newlib/libc/stdlib/../../../../../src/newlib/libc/stdlib/dtoa.c:348: relocation truncated to fit: R_MIPS_LITERAL no symbol /opt/hermes/embedded/build/build-mips64orion-tools/mips64orion-rtems/newlib/libc/stdlib/../../../../../src/newlib/libc/stdlib/dtoa.c:348: relocation truncated to fit: R_MIPS_LITERAL no symbol collect2: ld returned 1 exit status # mips64orion-rtems-gcc -v Reading specs from /opt/rtems/lib/gcc-lib/mips64orion-rtems/2.95.1/specs gcc version 2.95.1 19990816 (release) # mips64orion-rtems-ld -v GNU ld version 2.9.5 (with BFD 2.9.5) --- tools/build/configure.in | 2 +- tools/cpu/configure.in | 2 +- tools/cpu/generic/configure.in | 2 +- tools/cpu/hppa1.1/configure.in | 2 +- tools/cpu/sh/configure.in | 2 +- tools/cpu/unix/configure.in | 2 +- tools/update/configure.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/build/configure.in b/tools/build/configure.in index ea8c342706..5369179bc2 100644 --- a/tools/build/configure.in +++ b/tools/build/configure.in @@ -4,8 +4,8 @@ AC_PREREQ(2.13) AC_INIT(install-if-change.in) -AC_CONFIG_AUX_DIR(../..) RTEMS_TOP(../..) +AC_CONFIG_AUX_DIR(../..) AC_CANONICAL_HOST diff --git a/tools/cpu/configure.in b/tools/cpu/configure.in index b469f1ea31..4ca1b1bf15 100644 --- a/tools/cpu/configure.in +++ b/tools/cpu/configure.in @@ -3,9 +3,9 @@ dnl dnl $Id$ AC_INIT(generic) +RTEMS_TOP(../..) AC_CONFIG_AUX_DIR(../..) -RTEMS_TOP(../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-tools-cpu,$RTEMS_VERSION,no) diff --git a/tools/cpu/generic/configure.in b/tools/cpu/generic/configure.in index ac8c82b0db..b1da0538ad 100644 --- a/tools/cpu/generic/configure.in +++ b/tools/cpu/generic/configure.in @@ -3,9 +3,9 @@ dnl dnl $Id$ AC_INIT(size_rtems.in) +RTEMS_TOP(../../..) AC_CONFIG_AUX_DIR(../../..) -RTEMS_TOP(../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-cpu-tools-generic,$RTEMS_VERSION,no) diff --git a/tools/cpu/hppa1.1/configure.in b/tools/cpu/hppa1.1/configure.in index ac742498f9..13c495bec1 100644 --- a/tools/cpu/hppa1.1/configure.in +++ b/tools/cpu/hppa1.1/configure.in @@ -3,9 +3,9 @@ dnl dnl $Id$ AC_INIT(genoffsets.c) +RTEMS_TOP(../../..) AC_CONFIG_AUX_DIR(../../..) -RTEMS_TOP(../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-cpu-tools-hppa,$RTEMS_VERSION,no) diff --git a/tools/cpu/sh/configure.in b/tools/cpu/sh/configure.in index 80a4b07cd7..1a152f7413 100644 --- a/tools/cpu/sh/configure.in +++ b/tools/cpu/sh/configure.in @@ -3,9 +3,9 @@ dnl dnl $Id$ AC_INIT(shgen.c) +RTEMS_TOP(../../..) AC_CONFIG_AUX_DIR(../../..) -RTEMS_TOP(../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-cpu-tools-sh,$RTEMS_VERSION,no) diff --git a/tools/cpu/unix/configure.in b/tools/cpu/unix/configure.in index fcf8d14ff0..b9460aaecb 100644 --- a/tools/cpu/unix/configure.in +++ b/tools/cpu/unix/configure.in @@ -3,9 +3,9 @@ dnl dnl $Id$ AC_INIT(gensize.c) +RTEMS_TOP(../../..) AC_CONFIG_AUX_DIR(../../..) -RTEMS_TOP(../../..) RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-cpu-tools-unix,$RTEMS_VERSION,no) diff --git a/tools/update/configure.in b/tools/update/configure.in index 737f99e296..19eeaa03a4 100644 --- a/tools/update/configure.in +++ b/tools/update/configure.in @@ -4,8 +4,8 @@ AC_PREREQ(2.13) AC_INIT(rtems-polish.sh) -AC_CONFIG_AUX_DIR(../..) RTEMS_TOP(../..) +AC_CONFIG_AUX_DIR(../..) AC_CANONICAL_HOST -- cgit v1.2.3