Changeset 6fc973e in rtems


Ignore:
Timestamp:
Aug 18, 1999, 4:49:52 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
e8367362
Parents:
ea562ee9
Message:

Patch from Ralf Corsepius <corsepiu@…>:

Here is another fix, which addresses a few more or less severe bugs in
configuration and unix/posix:

  • Configuration fix: c/src/lib/configure.in didn't handle RDBG correctly
  • Configuration fix: make depend was non-functional in c/src/lib/libc/Makefile.in
  • Configuration fix: stray comment removed from aclocal/target.m4
  • RTEMS fix: termios support for unix/posix now uses the host's headers only (was completely broken).
  • Don't install RTEMS's newlib sys/termios.h for unix (sys/termios.h apparently is a newlib specific header)
  • To be able to compile RTEMS's termios.c with glibc2.1, glibc-2.1 needs USE_MISC, which is a private define from gcc's features.h, being defined only when _BSD_SOURCE of _SVID_SOURCE is defined. RTEMS's termios apparently implements BSD, thus -D_BSD_SOURCE was added to Linux-posix.cfg.
  • Conflicting definitions for USE_MISC and _BSD_SOURCE inside of RTEMS codes removed due to definition of _BSD_SOURCE on the toplevel.

This fix has been tested with linux/posix (primary glibc2.1 native),
linux/posix (secondary libc5 native), sh/gensh1, i386/pc386 and a couple
of other bsp's/CPU.

To apply:

cd <srcdir>
patch -p1 < rtems-rc-19990709-9.diff

and

aclocal -I aclocal && automake && autoconf
cd c/src/lib; autoconf

or

./autogen

Files:
15 edited

Legend:

Unmodified
Added
Removed
  • aclocal.m4

    rea562ee9 r6fc973e  
    432432AC_DEFUN(RTEMS_OUTPUT_SUBDIRS,
    433433[
    434 # bla
    435434if test "$no_recursion" != yes; then
    436435  if test $target_alias != $host_alias; then
  • aclocal/target.m4

    rea562ee9 r6fc973e  
    1414AC_DEFUN(RTEMS_OUTPUT_SUBDIRS,
    1515[
    16 # bla
    1716if test "$no_recursion" != yes; then
    1817  if test $target_alias != $host_alias; then
  • c/src/exec/libcsupport/src/malloc.c

    rea562ee9 r6fc973e  
    2828#include <string.h>
    2929
    30 /* for sbrk prototype in linux */
    31 #if defined(__linux__)
    32 #define __USE_MISC
    33 #endif
    3430#include <unistd.h>    /* sbrk(2) */
    3531
  • c/src/lib/configure

    rea562ee9 r6fc973e  
    24432443
    24442444
    2445   if test "$HAS_RDBG" = "yes"; then
     2445  if test "$RTEMS_HAS_RDBG" = "yes"; then
    24462446    echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6
    24472447echo "configure:2448: checking whether BSP supports librdbg" >&5
  • c/src/lib/configure.in

    rea562ee9 r6fc973e  
    125125  RTEMS_CHECK_MAKEFILE(librpc)
    126126
    127   if test "$HAS_RDBG" = "yes"; then
     127  if test "$RTEMS_HAS_RDBG" = "yes"; then
    128128    RTEMS_CHECK_RDBG(RTEMS_BSP)
    129129
  • c/src/lib/include/Makefile.in

    rea562ee9 r6fc973e  
    3232SYS_H_PIECES_no_V = ioctl
    3333SYS_H_PIECES_yes_V =
    34 SYS_H_PIECES = termios utime $(SYS_H_PIECES_$(HAS_NETWORKING)_V)
     34@UNIX_FALSE@SYS_H_PIECES = termios
     35SYS_H_PIECES += utime $(SYS_H_PIECES_$(HAS_NETWORKING)_V)
    3536SYS_H_FILES = $(SYS_H_PIECES:%=$(srcdir)/sys/%.h)
    3637
  • c/src/lib/libbsp/unix/posix/startup/bspstart.c

    rea562ee9 r6fc973e  
    2121#include <stdlib.h>
    2222
    23 /* for sbrk prototype in linux */
    24 #if defined(__linux__)
    25 #define __USE_MISC
    26 #endif
    2723#include <unistd.h>
    2824
  • c/src/lib/libc/Makefile.in

    rea562ee9 r6fc973e  
    4444UNIX_LIBC_C_PIECES = unixlibc hosterr
    4545
    46 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    47 include $(RTEMS_ROOT)/make/lib.cfg
    48 
    49 INSTALL_CHANGE = @INSTALL_CHANGE@
    50 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
    51 
    52 INSTALLDIRS = $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/sys \
    53     $(PROJECT_INCLUDE)
    54 
    55 $(INSTALLDIRS):
    56         @$(mkinstalldirs) $(INSTALLDIRS)
    57 
    5846# C and C++ source names, if any, go here -- minus the .c or .cc
    5947UNIX_C_PIECES = $(UNIX_LIBC_C_PIECES) $(BASE_FS_C_PIECES) $(MALLOC_C_PIECES) \
     
    7260SYS_H_FILES =
    7361RTEMS_H_FILES = $(srcdir)/libio.h
     62
     63include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     64include $(RTEMS_ROOT)/make/lib.cfg
     65
     66INSTALL_CHANGE = @INSTALL_CHANGE@
     67mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
     68
     69INSTALLDIRS = $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/sys \
     70    $(PROJECT_INCLUDE)
     71
     72$(INSTALLDIRS):
     73        @$(mkinstalldirs) $(INSTALLDIRS)
    7474
    7575SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES)
  • c/src/lib/libc/malloc.c

    rea562ee9 r6fc973e  
    2828#include <string.h>
    2929
    30 /* for sbrk prototype in linux */
    31 #if defined(__linux__)
    32 #define __USE_MISC
    33 #endif
    3430#include <unistd.h>    /* sbrk(2) */
    3531
  • c/src/lib/libmisc/monitor/mon-symbols.c

    rea562ee9 r6fc973e  
    1313
    1414/* for strcasecmp in linux and solaris */
    15 #if defined(__linux__)
    16 #include <features.h>
    17 #define __USE_BSD
    18 #endif
    1915#include <string.h>
    2016
  • c/src/libmisc/monitor/mon-symbols.c

    rea562ee9 r6fc973e  
    1313
    1414/* for strcasecmp in linux and solaris */
    15 #if defined(__linux__)
    16 #include <features.h>
    17 #define __USE_BSD
    18 #endif
    1915#include <string.h>
    2016
  • configure

    rea562ee9 r6fc973e  
    15841584
    15851585
    1586 # bla
    15871586if test "$no_recursion" != yes; then
    15881587  if test $target_alias != $host_alias; then
  • cpukit/libcsupport/src/malloc.c

    rea562ee9 r6fc973e  
    2828#include <string.h>
    2929
    30 /* for sbrk prototype in linux */
    31 #if defined(__linux__)
    32 #define __USE_MISC
    33 #endif
    3430#include <unistd.h>    /* sbrk(2) */
    3531
  • cpukit/libmisc/monitor/mon-symbols.c

    rea562ee9 r6fc973e  
    1313
    1414/* for strcasecmp in linux and solaris */
    15 #if defined(__linux__)
    16 #include <features.h>
    17 #define __USE_BSD
    18 #endif
    1915#include <string.h>
    2016
  • make/custom/Linux-posix.cfg

    rea562ee9 r6fc973e  
    2525LIBC_DEFINES += -DHEAPSPACE_MB=1
    2626
     27DEFINES += -D_BSD_SOURCE
    2728
    2829# Define this to yes if C++ is included in the development environment
Note: See TracChangeset for help on using the changeset viewer.