Changeset b62a92c in rtems for c


Ignore:
Timestamp:
Oct 4, 1999, 6:20:14 PM (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
5a83ba2
Parents:
4f021c0
Message:

Patch from Ralf Corsepius <corsepiu@…>:

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 -Dmips=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)

Location:
c
Files:
12 deleted
32 edited

Legend:

Unmodified
Added
Removed
  • c/configure.in

    r4f021c0 rb62a92c  
    3333    # Is there code where there should be for this BSP?
    3434    # The bare bsp is a special case as it is not under the RTEMS_CPU path
    35     case $i in
     35    case $bspdir in
    3636      bare)
    3737        bspcpudir=
  • c/src/configure.in

    r4f021c0 rb62a92c  
    99
    1010RTEMS_ENABLE_CXX
     11RTEMS_ENABLE_NETWORKING
    1112
    1213RTEMS_CANONICAL_TARGET_CPU
     14RTEMS_CANONICAL_HOST
    1315
    1416AM_INIT_AUTOMAKE(rtems-c-src,$RTEMS_VERSION,no)
     
    1719RTEMS_ENV_RTEMSBSP
    1820RTEMS_CHECK_CPU
    19 RTEMS_CANONICAL_HOST
     21RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2022
    21 RTEMS_PROJECT_ROOT
    22 
    23 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
     23RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    2424
    2525## Note: the order of the directories below is essential
     
    2727AC_CONFIG_SUBDIRS(exec)
    2828AC_CONFIG_SUBDIRS(lib)
     29if test "$HAS_NETWORKING" = "yes"; then
     30cfg_subdirs="librpc"
     31fi
    2932if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
    30 cfg_subdirs="librtems++";
     33cfg_subdirs="$cfg_subdirs librtems++";
    3134fi
    3235AC_CONFIG_SUBDIRS($cfg_subdirs)
    3336AC_CONFIG_SUBDIRS(tests)
    3437
     38RTEMS_PROJECT_ROOT
     39
    3540AC_OUTPUT(
    3641Makefile
  • c/src/exec/libcsupport/Makefile.am

    r4f021c0 rb62a92c  
    77
    88if HAS_NETWORKING
    9 ## We only build the networking and the rpc library
     9## We only build the networking library
    1010## if HAS_NETWORKING was defined
    1111LIBNETWORKING = libnetworking
    12 LIBRPC = librpc
    1312
    1413if HAS_RDBG
     
    2322
    2423SUBDIRS = start include libmisc libc $(LIBNETWORKING) libcpu libbsp \
    25     $(LIBRPC) $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) wrapup
     24    $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) wrapup
    2625
    2726include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/lib/Makefile.am

    r4f021c0 rb62a92c  
    77
    88if HAS_NETWORKING
    9 ## We only build the networking and the rpc library
     9## We only build the networking library
    1010## if HAS_NETWORKING was defined
    1111LIBNETWORKING = libnetworking
    12 LIBRPC = librpc
    1312
    1413if HAS_RDBG
     
    2322
    2423SUBDIRS = start include libmisc libc $(LIBNETWORKING) libcpu libbsp \
    25     $(LIBRPC) $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) wrapup
     24    $(LIBRDBG) $(LIBCHIP) $(LIBHWAPI) wrapup
    2625
    2726include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/lib/configure.in

    r4f021c0 rb62a92c  
    3838RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    3939
    40 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    41 
    4240AM_CONDITIONAL(UNIX,test "$RTEMS_CPU" = "unix")
    4341
     
    4947if test "$HAS_NETWORKING" = "yes"; then
    5048  cfg_subdirs="$cfg_subdirs libnetworking"
    51   cfg_subdirs="$cfg_subdirs librpc"
    5249
    5350  if test "$RTEMS_HAS_RDBG" = "yes"; then
     
    10097include/motorola/Makefile
    10198include/zilog/Makefile
    102 include/rpc/Makefile
    10399include/rdbg/Makefile
    104100include/rdbg/i386/Makefile
  • c/src/lib/include/Makefile.am

    r4f021c0 rb62a92c  
    2323profile-am: $(TMPINSTALL_FILES)
    2424
    25 SUBDIRS = sys motorola zilog rpc rdbg
     25SUBDIRS = sys motorola zilog rdbg
    2626
    2727include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/lib/libbsp/configure.in

    r4f021c0 rb62a92c  
    4848# Is there code where there should be for this BSP?
    4949# The bare bsp is a special case as it is not under the RTEMS_CPU path
    50 case ${RTEMS_BSP} in
     50case $bspdir in
    5151  bare)
    5252    bspcpudir=
  • c/src/lib/libbsp/hppa1.1/simhppa/tools/configure.in

    r4f021c0 rb62a92c  
    44
    55AC_INIT(print_dump.c)
     6RTEMS_TOP(../../../../../../..)
    67AC_CONFIG_AUX_DIR(../../../../../../..)
    78
    8 RTEMS_TOP(../../../../../../..)
    99RTEMS_CANONICAL_TARGET_CPU
    1010
  • c/src/lib/libbsp/i386/pc386/tools/configure.in

    r4f021c0 rb62a92c  
    44
    55AC_INIT(Spec.doc)
     6RTEMS_TOP(../../../../../../..)
    67AC_CONFIG_AUX_DIR(../../../../../../..)
    78
    8 RTEMS_TOP(../../../../../../..)
    99RTEMS_CANONICAL_TARGET_CPU
    1010
  • c/src/lib/libbsp/i386/ts_386ex/tools/configure.in

    r4f021c0 rb62a92c  
    44
    55AC_INIT(coff2bin)
     6RTEMS_TOP(../../../../../../..)
    67AC_CONFIG_AUX_DIR(../../../../../../..)
    78
    8 RTEMS_TOP(../../../../../../..)
    99RTEMS_CANONICAL_TARGET_CPU
    1010
  • c/src/lib/libbsp/m68k/mvme162/tools/configure.in

    r4f021c0 rb62a92c  
    44
    55AC_INIT(sload.c)
     6RTEMS_TOP(../../../../../../..)
    67AC_CONFIG_AUX_DIR(../../../../../../..)
    78
    8 RTEMS_TOP(../../../../../../..)
    99RTEMS_CANONICAL_TARGET_CPU
    1010
  • c/src/lib/libbsp/powerpc/psim/tools/configure.in

    r4f021c0 rb62a92c  
    44
    55AC_INIT(psim)
     6RTEMS_TOP(../../../../../../..)
    67AC_CONFIG_AUX_DIR(../../../../../../..)
    78
    8 RTEMS_TOP(../../../../../../..)
    99RTEMS_CANONICAL_TARGET_CPU
    1010
  • c/src/lib/libbsp/sparc/erc32/tools/configure.in

    r4f021c0 rb62a92c  
    44
    55AC_INIT(runtest.in)
     6RTEMS_TOP(../../../../../../..)
    67AC_CONFIG_AUX_DIR(../../../../../../..)
    78
    8 RTEMS_TOP(../../../../../../..)
    99RTEMS_CANONICAL_TARGET_CPU
    1010
  • c/src/lib/libbsp/unix/posix/tools/configure.in

    r4f021c0 rb62a92c  
    44
    55AC_INIT(runtest.in)
     6RTEMS_TOP(../../../../../../..)
    67AC_CONFIG_AUX_DIR(../../../../../../..)
    78
    8 RTEMS_TOP(../../../../../../..)
    99RTEMS_CANONICAL_TARGET_CPU
    1010
  • c/src/lib/libchip/configure.in

    r4f021c0 rb62a92c  
    3030RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    3131
    32 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    33 
    3432# pick up all the Makefiles in required parts of the tree
    3533if test "$RTEMS_CPU" = "unix"; then
  • c/src/lib/libcpu/configure.in

    r4f021c0 rb62a92c  
    3131RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    3232
    33 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    34 
    3533# find all the CPU dependent library Makefiles
    3634RTEMS_CHECK_MAKEFILE($RTEMS_CPU)
  • c/src/lib/libnetworking/configure.in

    r4f021c0 rb62a92c  
    3131RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    3232
    33 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    34 
    3533# try to explicitly list a Makefile here
    3634AC_OUTPUT(
  • c/src/lib/librdbg/configure.in

    r4f021c0 rb62a92c  
    1616
    1717RTEMS_ENABLE_NETWORKING
     18RTEMS_ENABLE_RDBG
    1819RTEMS_ENABLE_LIBCDIR
    1920RTEMS_ENABLE_BARE
     
    4142
    4243RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
     44RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    4345RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    44 RTEMS_CHECK_RDBG(RTEMS_BSP)
    45 
    46 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
     46RTEMS_CHECK_RDBG(bspdir)
    4747
    4848# Try to explicitly list a Makefile here
  • c/src/lib/start/a29k/configure.in

    r4f021c0 rb62a92c  
    3030RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    3131
    32 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    33 
    3432# try to explicitly list a Makefile here
    3533AC_OUTPUT(
  • c/src/lib/start/i960/configure.in

    r4f021c0 rb62a92c  
    3030RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    3131
    32 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    33 
    3432# try to explicitly list a Makefile here
    3533AC_OUTPUT(
  • c/src/lib/start/m68k/configure.in

    r4f021c0 rb62a92c  
    2929
    3030RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    31 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    3231
    3332# try to explicitly list a Makefile here
  • c/src/lib/start/mips64orion/configure.in

    r4f021c0 rb62a92c  
    2929
    3030RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    31 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    3231
    3332# try to explicitly list a Makefile here
  • c/src/lib/start/sh/configure.in

    r4f021c0 rb62a92c  
    2929
    3030RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    31 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    3231
    3332# try to explicitly list a Makefile here
  • c/src/libchip/configure.in

    r4f021c0 rb62a92c  
    3030RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    3131
    32 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    33 
    3432# pick up all the Makefiles in required parts of the tree
    3533if test "$RTEMS_CPU" = "unix"; then
  • c/src/libnetworking/configure.in

    r4f021c0 rb62a92c  
    3131RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    3232
    33 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    34 
    3533# try to explicitly list a Makefile here
    3634AC_OUTPUT(
  • c/src/librdbg/src/configure.in

    r4f021c0 rb62a92c  
    1616
    1717RTEMS_ENABLE_NETWORKING
     18RTEMS_ENABLE_RDBG
    1819RTEMS_ENABLE_LIBCDIR
    1920RTEMS_ENABLE_BARE
     
    4142
    4243RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
     44RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
    4345RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    44 RTEMS_CHECK_RDBG(RTEMS_BSP)
    45 
    46 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
     46RTEMS_CHECK_RDBG(bspdir)
    4747
    4848# Try to explicitly list a Makefile here
  • c/src/librpc/src/Makefile.in

    r4f021c0 rb62a92c  
    66srcdir = @srcdir@
    77top_srcdir = @top_srcdir@
    8 top_builddir = .
     8top_builddir = ..
     9subdir = src
    910
    1011RTEMS_ROOT = @RTEMS_ROOT@
     
    5556Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    5657        cd $(top_builddir) \
    57          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
     58         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
  • c/src/librtems++/configure.in

    r4f021c0 rb62a92c  
    99
    1010RTEMS_CANONICAL_TARGET_CPU
    11 RTEMS_PROJECT_ROOT
    1211RTEMS_CANONICAL_HOST
    1312
     
    3433AC_SUBST(PROJECT_INCLUDE)
    3534
     35RTEMS_PROJECT_ROOT
     36
    3637AC_OUTPUT(
    3738Makefile
  • c/src/make/configure.in

    r4f021c0 rb62a92c  
    7171RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    7272RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
     73RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    7374RTEMS_CHECK_RDBG(RTEMS_BSP)
    7475RTEMS_CHECK_POSIX_API(RTEMS_BSP)
    7576RTEMS_CHECK_CXX(RTEMS_BSP)
    76 RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    7777
    7878AC_SUBST(rtems_cv_prog_cc_cross)
  • c/src/tests/support/configure.in

    r4f021c0 rb62a92c  
    1313AM_MAINTAINER_MODE
    1414
     15RTEMS_ENABLE_POSIX
    1516RTEMS_ENV_RTEMSBSP
    1617RTEMS_CHECK_CPU
     
    2122dnl check target cc
    2223RTEMS_PROG_CC_FOR_TARGET
    23 
    2424RTEMS_CANONICALIZE_TOOLS
    2525
  • c/src/tests/tools/configure.in

    r4f021c0 rb62a92c  
    44
    55AC_INIT(generic)
     6RTEMS_TOP(../../../..)
    67AC_CONFIG_AUX_DIR(../../../..)
    78
    8 RTEMS_TOP(../../../..)
    99RTEMS_CANONICAL_TARGET_CPU
    1010
  • c/src/tests/tools/generic/configure.in

    r4f021c0 rb62a92c  
    44
    55AC_INIT(sorttimes.in)
     6RTEMS_TOP(../../../../..)
    67AC_CONFIG_AUX_DIR(../../../../..)
    78
    8 RTEMS_TOP(../../../../..)
    99RTEMS_CANONICAL_TARGET_CPU
    1010
Note: See TracChangeset for help on using the changeset viewer.