source: rtems/contrib/crossrpms/patches/newlib-1.17.0-rtems4.10-20090906.diff @ d7467d4

4.104.11
Last change on this file since d7467d4 was d7467d4, checked in by Ralf Corsepius <ralf.corsepius@…>, on Sep 6, 2009 at 2:15:40 PM

New.

  • Property mode set to 100644
File size: 46.8 KB
  • newlib/ChangeLog.rtems

    diff -Naur newlib-1.17.0.orig/newlib/ChangeLog.rtems newlib-1.17.0/newlib/ChangeLog.rtems
    old new  
     12009-07-27      Ralf Corsépius <ralf.corsepius@rtems.org>
     2
     3        * libc/sys/rtems/crt0.c: Add _isatty_r.
     4
     52009-07-06      Joel Sherrill <joel.sherrill@oarcorp.com>
     6
     7        * libc/include/sys/features.h: Define _UNIX98_THREAD_MUTEX_ATTRIBUTES.
     8
     92009-05-05      Ralf Corsépius <ralf.corsepius@rtems.org>
     10
     11        * configure.host: Remove -DMISSING_SYSCALL_NAMES.
     12
     132009-03-11      Ralf Corsépius <ralf.corsepius@rtems.org>
     14
     15        * libc/stdlib/assert.c: Don't build __assert_func.
     16        * libc/sys/rtems/crt0.c: Add __assert_func.
     17
     182009-03-09      Ralf Corsépius <ralf.corsepius@rtems.org>
     19
     20        * libc/machine/powerpc/times.c: Remove.
     21        * libc/machine/powerpc/Makefile.am: Remove times.c.
     22        * libc/machine/powerpc/Makefile.in: Regenerate.
     23
     242009-02-24      Ralf Corsépius <ralf.corsepius@rtems.org>
     25
     26        * libc/unix/ttyname.c: Sync with newlib-cvs.
     27        * configure.host: Add -DHAVE_BLKSIZE to newlib_cflags.
     28
     292009-02-22      Ralf Corsépius <ralf.corsepius@rtems.org>
     30
     31        * libc/sys/rtems/machine/stdint.h: Add __lm32__.
     32        * libc/machine/lm32/configure.in: Set AC_CONFIG_SRC to setjmp.S.
     33        * libc/machine/lm32/configure: Regenerate.
     34
     352009-02-20      Ralf Corsépius <ralf.corsepius@rtems.org>
     36
     37        * libc/unix/Makefile.in: Regenerate.
     38
     392009-02-20  Craig Howland <howland@LGSInnovations.com> on behalf of
     40        Sebastian Huber <sebastian.huber@embedded-brains.de>
     41
     42        * libc/unix/ttyname.c:  Remove ttyname_r() (to a new file to avoid
     43        coupling ttyname_r() and ttyname() due to the latter's large buffer).
     44        * libc/unix/ttyname_r.c:  New file to hold ttyname_r(), previously in
     45        ttyname.c.
     46        * libc/unix/ttyname.h:  New file (common size definition for the 2
     47        ttyname*c files that are now split).
     48        * libc/unix/Makefile.am (ELIX_2_SOURCES):  Add ttyname_r.c.
     49
     502009-02-16      Ralf Corsépius <ralf.corsepius@rtems.org>
     51
     52        * libc/sys/rtems/sys/param.h:
     53        Update copyright notice from FreeBSD.
     54        Remove HZ.
     55        Add #include <sys/priority.h>
     56        Remove priority handling (moved to sys/priority.h).
     57        Remove CLBYTES (Unused, abandoned in BSD).
     58
     592009-02-06      Ralf Corsépius <ralf.corsepius@rtems.org>
     60
     61        * libc/include/sched.h:
     62        Remove (collides with RTEMS's schedul.h).
     63
  • newlib/configure.host

    diff -Naur newlib-1.17.0.orig/newlib/configure.host newlib-1.17.0/newlib/configure.host
    old new  
    537537  *-*-rtems*)
    538538        default_newlib_io_long_long="yes"
    539539        default_newlib_io_c99_formats="yes"
    540         newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DMISSING_SYSCALL_NAMES -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_FCNTL"
     540        newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_BLKSIZE -DHAVE_FCNTL"
    541541        # turn off unsupported items in posix directory
    542542        newlib_cflags="${newlib_cflags} -D_NO_GETLOGIN -D_NO_GETPWENT -D_NO_GETUT -D_NO_GETPASS -D_NO_SIGSET"
    543543        ;;
  • newlib/libc/include/inttypes.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/include/inttypes.h newlib-1.17.0/newlib/libc/include/inttypes.h
    old new  
    163163
    164164
    165165/* 64-bit types */
    166 #if __have_longlong64
    167 #define __PRI64(x) __STRINGIFY(ll##x)
    168 #define __SCN64(x) __STRINGIFY(ll##x)
    169 #elif __have_long64
     166#if __have_long64
    170167#define __PRI64(x) __STRINGIFY(l##x)
    171168#define __SCN64(x) __STRINGIFY(l##x)
     169#elif __have_longlong64
     170#define __PRI64(x) __STRINGIFY(ll##x)
     171#define __SCN64(x) __STRINGIFY(ll##x)
    172172#else
    173173#define __PRI64(x) __STRINGIFY(x)
    174174#define __SCN64(x) __STRINGIFY(x)
     
    217217#endif
    218218
    219219/* max-bit types */
    220 #if __have_longlong64
    221 #define __PRIMAX(x) __STRINGIFY(ll##x)
    222 #define __SCNMAX(x) __STRINGIFY(ll##x)
    223 #elif __have_long64
     220#if __have_long64
    224221#define __PRIMAX(x) __STRINGIFY(l##x)
    225222#define __SCNMAX(x) __STRINGIFY(l##x)
     223#elif __have_longlong64
     224#define __PRIMAX(x) __STRINGIFY(ll##x)
     225#define __SCNMAX(x) __STRINGIFY(ll##x)
    226226#else
    227227#define __PRIMAX(x) __STRINGIFY(x)
    228228#define __SCNMAX(x) __STRINGIFY(x)
     
    242242#define SCNxMAX         __SCNMAX(x)
    243243
    244244/* ptr types */
    245 #if __have_longlong64
    246 #define __PRIPTR(x) __STRINGIFY(ll##x)
    247 #define __SCNPTR(x) __STRINGIFY(ll##x)
    248 #elif __have_long64
     245#if __have_long64
    249246#define __PRIPTR(x) __STRINGIFY(l##x)
    250247#define __SCNPTR(x) __STRINGIFY(l##x)
     248#elif __have_longlong64
     249#define __PRIPTR(x) __STRINGIFY(ll##x)
     250#define __SCNPTR(x) __STRINGIFY(ll##x)
    251251#else
    252252#define __PRIPTR(x) __STRINGIFY(x)
    253253#define __SCNPTR(x) __STRINGIFY(x)
  • newlib/libc/include/machine/ieeefp.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/include/machine/ieeefp.h newlib-1.17.0/newlib/libc/include/machine/ieeefp.h
    old new  
    6262#  define __IEEE_BIG_ENDIAN
    6363# endif
    6464#else
    65 # define __IEEE_BIG_ENDIAN
    6665# ifdef __ARMEL__
     66#  define __IEEE_LITTLE_ENDIAN
     67# else
     68#  define __IEEE_BIG_ENDIAN
     69# endif
     70# ifdef __ARMWEL__
    6771#  define __IEEE_BYTES_LITTLE_ENDIAN
    6872# endif
    6973#endif
  • newlib/libc/include/machine/setjmp.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/include/machine/setjmp.h newlib-1.17.0/newlib/libc/include/machine/setjmp.h
    old new  
    2727
    2828/* necv70 was 9 as well. */
    2929
    30 #ifdef __mc68000__
     30#if defined(__m68k__) || defined(__mc68000__)
    3131/*
    3232 * onsstack,sigmask,sp,pc,psl,d2-d7,a2-a6,
    3333 * fp2-fp7      for 68881.
  • newlib/libc/include/sched.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/include/sched.h newlib-1.17.0/newlib/libc/include/sched.h
    old new  
    1 #ifndef _SCHED_H_
    2 #define _SCHED_H_
    3 
    4 #ifdef __cplusplus
    5 extern "C" {
    6 #endif
    7 
    8 #include <sys/sched.h>
    9 
    10 #ifdef __cplusplus
    11 }
    12 #endif
    13 
    14 #endif /* _SCHED_H_ */
  • newlib/libc/include/stdint.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/include/stdint.h newlib-1.17.0/newlib/libc/include/stdint.h
    old new  
    475475#define UINTMAX_C(x)    x##UL
    476476#endif
    477477
     478#ifdef __rtems__
     479#include <machine/stdint.h>
     480#endif
    478481
    479482#ifdef __cplusplus
    480483}
  • newlib/libc/include/sys/features.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/include/sys/features.h newlib-1.17.0/newlib/libc/include/sys/features.h
    old new  
    7373#define _POSIX_INTERRUPT_CONTROL                1
    7474#define _POSIX_ADVISORY_INFO                    1
    7575
     76/* UNIX98 added some new pthread mutex attributes */
     77#define _UNIX98_THREAD_MUTEX_ATTRIBUTES         1
     78
    7679#endif
    7780
    7881#ifdef __svr4__
  • newlib/libc/include/sys/_types.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/include/sys/_types.h newlib-1.17.0/newlib/libc/include/sys/_types.h
    old new  
    8484typedef void *_iconv_t;
    8585#endif
    8686
     87typedef long * __intptr_t;
     88typedef unsigned long* __uintptr_t;
     89
    8790#endif  /* _SYS__TYPES_H */
  • newlib/libc/machine/arm/machine/endian.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/machine/arm/machine/endian.h newlib-1.17.0/newlib/libc/machine/arm/machine/endian.h
    old new  
    1 /* ARM configuration file */
    2 
    3 #ifndef _MACHINE_ENDIAN_H
    4 # define _MACHINE_ENDIAN_H
    5 
    6 #ifdef __ARMEB__
    7 #define BYTE_ORDER BIG_ENDIAN
    8 #else
    9 #define BYTE_ORDER LITTLE_ENDIAN
    10 #endif
    11 
    12 #endif
  • newlib/libc/machine/lm32/configure

    diff -Naur newlib-1.17.0.orig/newlib/libc/machine/lm32/configure newlib-1.17.0/newlib/libc/machine/lm32/configure
    old new  
    271271PACKAGE_STRING='newlib 1.17.0'
    272272PACKAGE_BUGREPORT=''
    273273
    274 ac_unique_file="setjmp.s"
     274ac_unique_file="setjmp.S"
    275275ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAY_SUPPLY_SYSCALLS_TRUE MAY_SUPPLY_SYSCALLS_FALSE newlib_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB READELF ac_ct_READELF MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CCAS CCASFLAGS NEWLIB_CFLAGS LDFLAGS ELIX_LEVEL_0_TRUE ELIX_LEVEL_0_FALSE ELIX_LEVEL_1_TRUE ELIX_LEVEL_1_FALSE ELIX_LEVEL_2_TRUE ELIX_LEVEL_2_FALSE ELIX_LEVEL_3_TRUE ELIX_LEVEL_3_FALSE ELIX_LEVEL_4_TRUE ELIX_LEVEL_4_FALSE USE_LIBTOOL_TRUE USE_LIBTOOL_FALSE OBJEXT oext aext lpfx libm_machine_dir machine_dir sys_dir LIBOBJS LTLIBOBJS'
    276276ac_subst_files=''
    277277
  • newlib/libc/machine/lm32/configure.in

    diff -Naur newlib-1.17.0.orig/newlib/libc/machine/lm32/configure.in newlib-1.17.0/newlib/libc/machine/lm32/configure.in
    old new  
    33
    44AC_PREREQ(2.59)
    55AC_INIT([newlib],[NEWLIB_VERSION])
    6 AC_CONFIG_SRCDIR([setjmp.s])
     6AC_CONFIG_SRCDIR([setjmp.S])
    77
    88dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake.
    99AC_CONFIG_AUX_DIR(../../../..)
  • newlib/libc/machine/powerpc/Makefile.am

    diff -Naur newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.am newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.am
    old new  
    1010
    1111AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
    1212
    13 lib_a_SOURCES = setjmp.S times.c
     13lib_a_SOURCES = setjmp.S
    1414lib_a_CCASFLAGS=$(AM_CCASFLAGS)
    1515lib_a_CFLAGS=$(AM_CFLAGS)
    1616lib_a_LIBADD = @extra_objs@
  • newlib/libc/machine/powerpc/Makefile.in

    diff -Naur newlib-1.17.0.orig/newlib/libc/machine/powerpc/Makefile.in newlib-1.17.0/newlib/libc/machine/powerpc/Makefile.in
    old new  
    3939DIST_COMMON = $(srcdir)/../../../../config.guess \
    4040        $(srcdir)/../../../../config.sub $(srcdir)/Makefile.in \
    4141        $(srcdir)/Makefile.am $(top_srcdir)/configure \
    42         $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs \
    43         $(srcdir)/../../../../compile
     42        $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs
    4443subdir = .
    4544ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4645am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \
     
    5453LIBRARIES = $(noinst_LIBRARIES)
    5554ARFLAGS = cru
    5655lib_a_AR = $(AR) $(ARFLAGS)
    57 am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT)
     56am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT)
    5857lib_a_OBJECTS = $(am_lib_a_OBJECTS)
    5958DEFAULT_INCLUDES = -I. -I$(srcdir)
    6059depcomp =
     
    128127USE_LIBTOOL_FALSE = @USE_LIBTOOL_FALSE@
    129128USE_LIBTOOL_TRUE = @USE_LIBTOOL_TRUE@
    130129VERSION = @VERSION@
    131 ac_ct_AR = @ac_ct_AR@
    132 ac_ct_AS = @ac_ct_AS@
    133 ac_ct_RANLIB = @ac_ct_RANLIB@
    134 ac_ct_READELF = @ac_ct_READELF@
    135 ac_ct_STRIP = @ac_ct_STRIP@
    136130aext = @aext@
    137131am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    138132am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    148142build_os = @build_os@
    149143build_vendor = @build_vendor@
    150144datadir = @datadir@
     145datarootdir = @datarootdir@
     146docdir = @docdir@
     147dvidir = @dvidir@
    151148exec_prefix = @exec_prefix@
    152149extra_objs = @extra_objs@
    153150extra_sources = @extra_sources@
     
    156153host_cpu = @host_cpu@
    157154host_os = @host_os@
    158155host_vendor = @host_vendor@
     156htmldir = @htmldir@
    159157includedir = @includedir@
    160158infodir = @infodir@
    161159install_sh = @install_sh@
    162160libdir = @libdir@
    163161libexecdir = @libexecdir@
    164162libm_machine_dir = @libm_machine_dir@
     163localedir = @localedir@
    165164localstatedir = @localstatedir@
    166165lpfx = @lpfx@
    167166machine_dir = @machine_dir@
     
    170169newlib_basedir = @newlib_basedir@
    171170oext = @oext@
    172171oldincludedir = @oldincludedir@
     172pdfdir = @pdfdir@
    173173prefix = @prefix@
    174174program_transform_name = @program_transform_name@
     175psdir = @psdir@
    175176sbindir = @sbindir@
    176177sharedstatedir = @sharedstatedir@
    177178sys_dir = @sys_dir@
     
    182183AM_CCASFLAGS = $(INCLUDES)
    183184noinst_LIBRARIES = lib.a
    184185AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
    185 lib_a_SOURCES = setjmp.S times.c
     186lib_a_SOURCES = setjmp.S
    186187lib_a_CCASFLAGS = $(AM_CCASFLAGS)
    187188lib_a_CFLAGS = $(AM_CFLAGS)
    188189lib_a_LIBADD = @extra_objs@
     
    193194all: all-am
    194195
    195196.SUFFIXES:
    196 .SUFFIXES: .S .c .o .obj
     197.SUFFIXES: .S .o .obj
    197198am--refresh:
    198199        @:
    199200$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     
    252253
    253254lib_a-setjmp.obj: setjmp.S
    254255        $(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi`
    255 
    256 .c.o:
    257         $(COMPILE) -c $<
    258 
    259 .c.obj:
    260         $(COMPILE) -c `$(CYGPATH_W) '$<'`
    261 
    262 lib_a-times.o: times.c
    263         $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c
    264 
    265 lib_a-times.obj: times.c
    266         $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi`
    267256uninstall-info-am:
    268257
    269258ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  • newlib/libc/machine/powerpc/times.c

    diff -Naur newlib-1.17.0.orig/newlib/libc/machine/powerpc/times.c newlib-1.17.0/newlib/libc/machine/powerpc/times.c
    old new  
    1 /* Time support routines for PowerPC.
    2  *
    3  * Written by Aldy Hernandez.
    4  */
    5 
    6 #include <_ansi.h>
    7 #include <reent.h>
    8 #include <sys/time.h>
    9 #include <sys/times.h>
    10 #include <sys/resource.h>
    11 
    12 clock_t
    13 times (struct tms *tp)
    14 {
    15   struct rusage usage;
    16   union {
    17     struct rusage r;
    18     /* Newlib's rusage has only 2 fields.  We need to make room for
    19        when we call the system's rusage.  This should be enough.  */
    20     int filler[32];
    21   } host_ru;
    22 
    23   getrusage (RUSAGE_SELF, (void *)&host_ru);
    24 
    25   if (tp)
    26     {
    27       tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000
    28         + host_ru.r.ru_utime.tv_usec;
    29       tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000
    30         + host_ru.r.ru_stime.tv_usec;
    31       tp->tms_cutime = 0;       /* user time, children */
    32       tp->tms_cstime = 0;       /* system time, children */
    33     }
    34 
    35   return tp->tms_utime;
    36 }
  • newlib/libc/stdlib/assert.c

    diff -Naur newlib-1.17.0.orig/newlib/libc/stdlib/assert.c newlib-1.17.0/newlib/libc/stdlib/assert.c
    old new  
    4747#include <stdlib.h>
    4848#include <stdio.h>
    4949
     50#if !defined(__rtems__)
     51/* RTEMS has a version of its own */
     52
    5053/* func can be NULL, in which case no function information is given.  */
    5154void
    5255_DEFUN (__assert_func, (file, line, func, failedexpr),
     
    6265  abort();
    6366  /* NOTREACHED */
    6467}
     68#endif
    6569
    6670void
    6771_DEFUN (__assert, (file, line, failedexpr),
  • newlib/libc/sys/rtems/crt0.c

    diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/crt0.c newlib-1.17.0/newlib/libc/sys/rtems/crt0.c
    old new  
    1212
    1313#include <reent.h>
    1414
     15#include <signal.h> // sigset_t
     16#include <time.h> // struct timespec
     17
    1518void rtems_provides_crt0( void ) {}  /* dummy symbol so file always has one */
    1619
    17 /* RTEMS provides some of its own routines including a Malloc family */
     20#define RTEMS_STUB(ret, func) \
     21ret rtems_stub_##func {}; \
     22ret func
    1823
    19 void *malloc() { return 0; }
    20 void *realloc() { return 0; }
    21 void free() { ; }
    22 void abort() { ; }
    23 int raise() { return -1; }
     24/* RTEMS provides some of its own routines including a Malloc family */
     25RTEMS_STUB(void *,malloc(size_t s)) { return 0; }
     26RTEMS_STUB(void *,realloc(void* p, size_t s)) { return 0; }
     27RTEMS_STUB(void, free(void)) { ; }
     28RTEMS_STUB(_PTR, calloc(struct _reent *r, size_t s1, size_t s2)) {}
    2429
    2530#if defined(__GNUC__)
    2631/*
     
    4348int rtems_gxx_recursive_mutex_unlock() { return -1; }
    4449#endif
    4550
     51/* stubs for functions RTEMS provides */
     52RTEMS_STUB(int, close (int fd)) { return -1; }
     53RTEMS_STUB(int, dup2(int oldfd, int newfd)) { return -1; }
     54RTEMS_STUB(int, fcntl( int fd, int cmd, ... /* arg */ )) { return -1; }
     55RTEMS_STUB(pid_t, fork(void)) { return -1; }
     56RTEMS_STUB(int, fstat(int fd, struct stat *buf)) { return -1; }
     57RTEMS_STUB(int, getdents(int fd, void *dp, int count)) { return -1; }
     58RTEMS_STUB(char *, getlogin(void)) { return 0; }
     59RTEMS_STUB(struct passwd *, getpwnam(const char *name)) { return 0; }
     60RTEMS_STUB(struct passwd *, getpwuid(uid_t uid)) { return 0; }
     61RTEMS_STUB(uid_t, getuid(void)) { return 0; }
     62RTEMS_STUB(int, nanosleep(const struct timespec *req, struct timespec *rem)) { return -1; }
     63RTEMS_STUB(_off_t, lseek(int fd, _off_t offset, int whence)) { return -1; }
     64RTEMS_STUB(int, lstat(const char *path, struct stat *buf)) { return -1; }
     65RTEMS_STUB(int, open(const char *pathname, int flags, int mode)) { return -1; }
     66RTEMS_STUB(int, pipe(int pipefd[2])) { return -1; }
     67RTEMS_STUB(_ssize_t, read(int fd, void *buf, size_t count)) { return -1; }
     68RTEMS_STUB(int, sigfillset(sigset_t *set)) { return -1; }
     69RTEMS_STUB(int, sigprocmask(int how, const sigset_t *set, sigset_t *oldset)) { return -1; }
     70RTEMS_STUB(int, stat(const char *path, struct stat *buf)) { return -1; }
     71RTEMS_STUB(int, unlink(const char *pathname)) { return -1; }
     72RTEMS_STUB(pid_t, vfork(void)) { return -1; }
     73RTEMS_STUB(int, waitpid (pid_t pid, int *status, int options)) { return -1; }
     74RTEMS_STUB(_ssize_t, write (int fd, const void *buf, size_t nbytes)) { return -1; }
     75
    4676/* stubs for functions from reent.h */
    47 int _close_r (struct _reent *r, int fd) { return -1; }
    48 #if NOT_USED_BY_RTEMS
    49 int _execve_r (struct _reent *r, char *, char **, char **) { return -1; }
    50 #endif
    51 int _fcntl_r (  struct _reent *ptr, int fd, int cmd, int arg ) { return -1;}
    52 #if NOT_USED_BY_RTEMS
    53 int _fork_r (struct _reent *r) { return -1; }
    54 #endif
    55 int _fstat_r (struct _reent *r, int fd, struct stat *buf) { return -1; }
    56 int _getpid_r (struct _reent *r) { return -1; }
    57 int _kill_r ( struct _reent *r, int pid, int sig ) { return -1; }
    58 int _link_r ( struct _reent *ptr, const char *existing, const char *new) { return -1; }
    59 _off_t _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence ) { return -1; }
    60 int _open_r (struct _reent *r, const char *buf, int flags, int mode) { return -1; }
    61 _ssize_t _read_r (struct _reent *r, int fd, void *buf, size_t nbytes) { return -1; }
    62 #if NOT_USED_BY_RTEMS
    63 void *_sbrk_r (struct _reent *r, ptrdiff_t) { return -1; }
    64 #endif
    65 int _stat_r (struct _reent *r, const char *path, struct stat *buf) { return -1; }
    66 _CLOCK_T_ _times_r (struct _reent *r, struct tms *ptms) { return -1; }
    67 int _unlink_r (struct _reent *r, const char *path) { return -1; }
    68 #if NOT_USED_BY_RTEMS
    69 int _wait_r (struct _reent *r, int *) { return -1; }
    70 #endif
    71 _ssize_t _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes) { return -1; }
    72 
    73 int isatty( int fd ) { return -1; }
    74 
    75 _realloc_r() {}
    76 _calloc_r() {}
    77 _malloc_r() {}
    78 _free_r() {}
    79 
    80 /* stubs for functions required by libc/posix */
    81 int getdents(int fd, void *dp, int count) { return -1; }
    82 struct timespec;
    83 int nanosleep(const struct timespec *req, struct timespec *rem) { return -1; }
    84 int _execve(const char *path, char * const *argv, char * const *envp) { return -1; }
    85 int _exit(int status) { return -1; }
    86 
    87 /* gcc can implicitly generate references to these */
    88 /* strcmp() {} */
    89 /* strcpy() {} */
    90 /* strlen() {} */
    91 /* memcmp() {} */
    92 /* memcpy() {} */
    93 /* memset() {} */
     77RTEMS_STUB(int, _close_r (struct _reent *r, int fd)) { return -1; }
     78#if defined(_NO_EXECVE)
     79RTEMS_STUB(int, _execve_r (struct _reent *r, char *, char **, char **)) { return -1; }
     80#endif
     81RTEMS_STUB(int, _fcntl_r (struct _reent *ptr, int fd, int cmd, int arg )) { return -1; }
     82#if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC))
     83#ifndef NO_FORK
     84/* cf. newlib/libc/reent/execr.c */
     85RTEMS_STUB(int, _fork_r (struct _reent *r)) { return -1; }
     86#endif
     87#endif
     88RTEMS_STUB(int, _fstat_r (struct _reent *r, int fd, struct stat *buf)) { return -1; }
     89RTEMS_STUB(int, _getpid_r (struct _reent *r)) { return -1; }
     90RTEMS_STUB(int, _gettimeofday_r(struct _reent *r, struct timeval *tp, void *tzp)) { return 0; }
     91RTEMS_STUB(int, _isatty_r (struct _reent *r, int fd)) { return isatty( fd ); }
     92RTEMS_STUB(int, _kill_r (struct _reent *r, int pid, int sig )) { return -1; }
     93#if !defined(REENTRANT_SYSCALLS_PROVIDED)
     94/* cf. newlib/libc/reent/linkr.c */
     95RTEMS_STUB(int, _link_r (struct _reent *, const char *, const char *)) { return -1; }
     96#endif
     97RTEMS_STUB(_off_t, _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence )) { return -1; }
     98RTEMS_STUB(int, _open_r (struct _reent *r, const char *buf, int flags, int mode)) { return -1; }
     99RTEMS_STUB(_ssize_t, _read_r (struct _reent *r, int fd, void *buf, size_t nbytes)) { return -1; }
     100RTEMS_STUB(int, _rename_r (struct _reent *r, const char *a, const char *b)){ return -1; }
     101#if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED))
     102/* cf. newlib/libc/reent/sbrkr.c */
     103RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t)) { return -1; }
     104#endif
     105RTEMS_STUB(int, _stat_r (struct _reent *r, const char *path, struct stat *buf)) { return -1; }
     106RTEMS_STUB(_CLOCK_T_, _times_r (struct _reent *r, struct tms *ptms)) { return -1; }
     107RTEMS_STUB(int, _unlink_r (struct _reent *r, const char *path)) { return -1; }
     108#if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC))
     109/* cf. newlib/libc/reent/execr.c */
     110RTEMS_STUB(int, _wait_r (struct _reent *r, int *)) { return -1; }
     111#endif
     112RTEMS_STUB(_ssize_t, _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes)) { return -1; }
     113
     114
     115RTEMS_STUB(int, _execve(const char *path, char * const *argv, char * const *envp)) { return -1; }
     116RTEMS_STUB(void, _exit(int status)) { return ; }
     117
     118/* Pulled in by newlib/libc/posix/glob.c */
     119#ifndef _NO_GLOB
     120#ifndef __NETBSD_SYSCALLS
     121RTEMS_STUB(int, issetugid (void)) { return 0; }
     122#endif
     123#endif
     124
     125/* stdlib.h */
     126RTEMS_STUB(_PTR, _realloc_r(struct _reent *r, _PTR p, size_t s)) {}
     127RTEMS_STUB(_PTR, _calloc_r(struct _reent *r, size_t s1, size_t s2)) {}
     128RTEMS_STUB(_PTR, _malloc_r(struct _reent *r, size_t s)) {}
     129RTEMS_STUB(_VOID, _free_r(struct _reent *r, _PTR p)) {}
     130
     131/* stubs for functions required by libc/stdlib */
     132RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr)) {}
    94133
    95134/* The PowerPC expects certain symbols to be defined in the linker script. */
    96135
  • newlib/libc/sys/rtems/crt0.c~

    diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/crt0.c~ newlib-1.17.0/newlib/libc/sys/rtems/crt0.c~
    old new  
     1/*
     2 *  RTEMS Fake crt0
     3 *
     4 *  Each RTEMS BSP provides its own crt0 and linker script.  Unfortunately
     5 *  this means that crt0 and the linker script are not available as
     6 *  each tool is configured.  Without a crt0 and linker script, some
     7 *  targets do not successfully link "conftest.c" during the configuration
     8 *  process.  So this fake crt0.c provides all the symbols required to
     9 *  successfully link a program.  The resulting program will not run
     10 *  but this is enough to satisfy the autoconf macro AC_PROG_CC.
     11 */
     12
     13#include <reent.h>
     14
     15#include <signal.h> // sigset_t
     16#include <time.h> // struct timespec
     17
     18void rtems_provides_crt0( void ) {}  /* dummy symbol so file always has one */
     19
     20#define RTEMS_STUB(ret, func) \
     21ret rtems_stub_##func {}; \
     22ret func
     23
     24/* RTEMS provides some of its own routines including a Malloc family */
     25RTEMS_STUB(void *,malloc(size_t s)) { return 0; }
     26RTEMS_STUB(void *,realloc(void* p, size_t s)) { return 0; }
     27RTEMS_STUB(void, free(void)) { ; }
     28RTEMS_STUB(_PTR, calloc(struct _reent *r, size_t s1, size_t s2)) {}
     29
     30#if defined(__GNUC__)
     31/*
     32 * stubs for libstdc++ rtems-threads support functions from gcc/gthr-rtems.h
     33 */
     34int rtems_gxx_once() { return -1; }
     35int rtems_gxx_key_create() { return -1; }
     36int rtems_gxx_key_delete() { return -1; }
     37void *rtems_gxx_getspecific() { return 0; }
     38int rtems_gxx_setspecific() { return -1; }
     39
     40void rtems_gxx_mutex_init() { }
     41int rtems_gxx_mutex_lock() { return -1; }
     42int rtems_gxx_mutex_trylock() { return -1; }
     43int rtems_gxx_mutex_unlock() { return -1; }
     44
     45void rtems_gxx_recursive_mutex_init() { }
     46int rtems_gxx_recursive_mutex_lock() { return -1; }
     47int rtems_gxx_recursive_mutex_trylock() { return -1; }
     48int rtems_gxx_recursive_mutex_unlock() { return -1; }
     49#endif
     50
     51/* stubs for functions RTEMS provides */
     52RTEMS_STUB(int, close (int fd)) { return -1; }
     53RTEMS_STUB(int, dup2(int oldfd, int newfd)) { return -1; }
     54RTEMS_STUB(int, fcntl( int fd, int cmd, ... /* arg */ )) { return -1; }
     55RTEMS_STUB(pid_t, fork(void)) { return -1; }
     56RTEMS_STUB(int, fstat(int fd, struct stat *buf)) { return -1; }
     57RTEMS_STUB(int, getdents(int fd, void *dp, int count)) { return -1; }
     58RTEMS_STUB(char *, getlogin(void)) { return 0; }
     59RTEMS_STUB(struct passwd *, getpwnam(const char *name)) { return 0; }
     60RTEMS_STUB(struct passwd *, getpwuid(uid_t uid)) { return 0; }
     61RTEMS_STUB(uid_t, getuid(void)) { return 0; }
     62RTEMS_STUB(int, nanosleep(const struct timespec *req, struct timespec *rem)) { return -1; }
     63RTEMS_STUB(_off_t, lseek(int fd, _off_t offset, int whence)) { return -1; }
     64RTEMS_STUB(int, lstat(const char *path, struct stat *buf)) { return -1; }
     65RTEMS_STUB(int, open(const char *pathname, int flags, int mode)) { return -1; }
     66RTEMS_STUB(int, pipe(int pipefd[2])) { return -1; }
     67RTEMS_STUB(_ssize_t, read(int fd, void *buf, size_t count)) { return -1; }
     68RTEMS_STUB(int, sigfillset(sigset_t *set)) { return -1; }
     69RTEMS_STUB(int, sigprocmask(int how, const sigset_t *set, sigset_t *oldset)) { return -1; }
     70RTEMS_STUB(int, stat(const char *path, struct stat *buf)) { return -1; }
     71RTEMS_STUB(int, unlink(const char *pathname)) { return -1; }
     72RTEMS_STUB(pid_t, vfork(void)) { return -1; }
     73RTEMS_STUB(int, waitpid (pid_t pid, int *status, int options)) { return -1; }
     74RTEMS_STUB(_ssize_t, write (int fd, const void *buf, size_t nbytes)) { return -1; }
     75
     76/* stubs for functions from reent.h */
     77RTEMS_STUB(int, _close_r (struct _reent *r, int fd)) { return -1; }
     78#if defined(_NO_EXECVE)
     79RTEMS_STUB(int, _execve_r (struct _reent *r, char *, char **, char **)) { return -1; }
     80#endif
     81RTEMS_STUB(int, _fcntl_r (struct _reent *ptr, int fd, int cmd, int arg )) { return -1; }
     82#if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC))
     83#ifndef NO_FORK
     84/* cf. newlib/libc/reent/execr.c */
     85RTEMS_STUB(int, _fork_r (struct _reent *r)) { return -1; }
     86#endif
     87#endif
     88RTEMS_STUB(int, _fstat_r (struct _reent *r, int fd, struct stat *buf)) { return -1; }
     89RTEMS_STUB(int, _getpid_r (struct _reent *r)) { return -1; }
     90RTEMS_STUB(int, _gettimeofday_r(struct _reent *r, struct timeval *tp, void *tzp)) { return 0; }
     91RTEMS_STUB(int, _isatty_r (struct _reent *r, int fd)) { return isatty( fd ); }
     92RTEMS_STUB(int, _kill_r (struct _reent *r, int pid, int sig )) { return -1; }
     93#if !defined(REENTRANT_SYSCALLS_PROVIDED)
     94/* cf. newlib/libc/reent/linkr.c */
     95RTEMS_STUB(int, _link_r (struct _reent *, const char *, const char *)) { return -1; }
     96#endif
     97RTEMS_STUB(_off_t, _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence )) { return -1; }
     98RTEMS_STUB(int, _open_r (struct _reent *r, const char *buf, int flags, int mode)) { return -1; }
     99RTEMS_STUB(_ssize_t, _read_r (struct _reent *r, int fd, void *buf, size_t nbytes)) { return -1; }
     100RTEMS_STUB(int, _rename_r (struct _reent *r, const char *a, const char *b)){ return -1; }
     101#if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (MALLOC_PROVIDED))
     102/* cf. newlib/libc/reent/sbrkr.c */
     103RTEMS_STUB(void *,_sbrk_r (struct _reent *r, ptrdiff_t)) { return -1; }
     104#endif
     105RTEMS_STUB(int, _stat_r (struct _reent *r, const char *path, struct stat *buf)) { return -1; }
     106RTEMS_STUB(_CLOCK_T_, _times_r (struct _reent *r, struct tms *ptms)) { return -1; }
     107RTEMS_STUB(int, _unlink_r (struct _reent *r, const char *path)) { return -1; }
     108#if !(defined (REENTRANT_SYSCALLS_PROVIDED) || defined (NO_EXEC))
     109/* cf. newlib/libc/reent/execr.c */
     110RTEMS_STUB(int, _wait_r (struct _reent *r, int *)) { return -1; }
     111#endif
     112RTEMS_STUB(_ssize_t, _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes)) { return -1; }
     113
     114
     115RTEMS_STUB(int, _execve(const char *path, char * const *argv, char * const *envp)) { return -1; }
     116RTEMS_STUB(void, _exit(int status)) { return ; }
     117
     118/* Pulled in by newlib/libc/posix/glob.c */
     119#ifndef __NETBSD_SYSCALLS
     120RTEMS_STUB(int, issetugid (void)) { return 0; }
     121#endif
     122
     123
     124/* stdlib.h */
     125RTEMS_STUB(_PTR, _realloc_r(struct _reent *r, _PTR p, size_t s)) {}
     126RTEMS_STUB(_PTR, _calloc_r(struct _reent *r, size_t s1, size_t s2)) {}
     127RTEMS_STUB(_PTR, _malloc_r(struct _reent *r, size_t s)) {}
     128RTEMS_STUB(_VOID, _free_r(struct _reent *r, _PTR p)) {}
     129
     130/* stubs for functions required by libc/stdlib */
     131RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr)) {}
     132
     133/* The PowerPC expects certain symbols to be defined in the linker script. */
     134
     135#if defined(__PPC__)
     136  int __SDATA_START__;  int __SDATA2_START__;
     137  int __GOT_START__;    int __GOT_END__;
     138  int __GOT2_START__;   int __GOT2_END__;
     139  int __SBSS_END__;     int __SBSS2_END__;
     140  int __FIXUP_START__;  int __FIXUP_END__;
     141  int __EXCEPT_START__; int __EXCEPT_END__;
     142  int __init;           int __fini;
     143  int __CTOR_LIST__;    int __CTOR_END__;
     144  int __DTOR_LIST__;    int __DTOR_END__;
     145#endif
     146
     147/* The SH expects certain symbols to be defined in the linker script. */
     148
     149#if defined(__sh__)
     150int __EH_FRAME_BEGIN__;
     151#endif
     152
     153/*  The hppa expects this to be defined in the real crt0.s.
     154 *  Also for some reason, the hppa1.1 does not find atexit()
     155 *  during the AC_PROG_CC tests.
     156 */
     157
     158#if defined(__hppa__)
     159/*
     160  asm ( ".subspa \$GLOBAL\$,QUAD=1,ALIGN=8,ACCESS=0x1f,SORT=40");
     161  asm ( ".export \$global\$" );
     162  asm ( "\$global\$:");
     163*/
     164
     165  asm (".text");
     166  asm (".global");
     167  asm (".EXPORT $$dyncall,ENTRY");
     168  asm ("$$dyncall:");
     169  int atexit(void (*function)(void)) { return 0; }
     170#endif
     171
     172
     173/*
     174 *  The AMD a29k generates code expecting the following.
     175 */
     176
     177#if defined(_AM29000) || defined(_AM29K)
     178asm (".global V_SPILL, V_FILL" );
     179asm (".global V_EPI_OS, V_BSD_OS" );
     180
     181asm (".equ    V_SPILL, 64" );
     182asm (".equ    V_FILL, 65" );
     183
     184asm (".equ    V_BSD_OS, 66" );
     185asm (".equ    V_EPI_OS, 69" );
     186#endif
     187
     188#if defined(__AVR__)
     189/*
     190 * Initial stack pointer address "__stack"
     191 *  hard coded into GCC instead of providing it through ldscripts
     192 */
     193const char* __stack ;
     194#endif
  • newlib/libc/sys/rtems/machine/stdint.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/machine/stdint.h newlib-1.17.0/newlib/libc/sys/rtems/machine/stdint.h
    old new  
     1/*
     2 *
     3 */
     4#ifndef _MACHINE_STDINT_H
     5#define _MACHINE_STDINT_H
     6
     7#ifndef _STDINT_H
     8#error machine/stdint.h is an internal file and must not be directly included
     9#endif
     10
     11#ifndef __rtems__
     12#error machine/stdint.h is an RTEMS specific internal file and must not be used otherwise
     13#endif
     14
     15#if defined(__m32c__) || defined(__m32r__) || defined(__lm32__)
     16#if (__SIZEOF_PTRDIFF_T__ == __SIZEOF_LONG__)
     17#define __ptrint_t_long_defined 1
     18#endif
     19#if (__SIZEOF_PTRDIFF_T__ == __SIZEOF_INT__)
     20#define __ptrint_t_int_defined 1
     21#endif
     22#endif
     23
     24#if defined(__sparc__) \
     25  || defined(__powerpc__) || defined(__PPC__) \
     26  || defined(__mips__) \
     27  || defined(__sh__) \
     28  || defined(__AVR__) \
     29  || defined(_C4x) || defined(_C3x) \
     30  || defined(__H8300__)
     31/* PTRDIFF_TYPE = int */
     32#define __ptrint_t_int_defined 1
     33#endif
     34
     35#if defined(__i386__) \
     36  || defined(__m68k__) \
     37  || defined(__bfin__) \
     38  || defined(__arm__) \
     39  || defined(__H8300S__) || defined(__H8300H__) || defined(__H8300SX__) \
     40/* PTRDIFF_TYPE = long */
     41#define __ptrint_t_long_defined 1
     42#endif
     43
     44#if !defined(__ptrint_t_int_defined) && !defined(__ptrint_t_long_defined)
     45#error Failed to determine ptrint_t
     46#endif
     47
     48#endif
  • newlib/libc/sys/rtems/sys/param.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/sys/rtems/sys/param.h newlib-1.17.0/newlib/libc/sys/rtems/sys/param.h
    old new  
    1515 * 2. Redistributions in binary form must reproduce the above copyright
    1616 *    notice, this list of conditions and the following disclaimer in the
    1717 *    documentation and/or other materials provided with the distribution.
    18  * 3. All advertising materials mentioning features or use of this software
    19  *    must display the following acknowledgement:
    20  *      This product includes software developed by the University of
    21  *      California, Berkeley and its contributors.
    2218 * 4. Neither the name of the University nor the names of its contributors
    2319 *    may be used to endorse or promote products derived from this software
    2420 *    without specific prior written permission.
     
    4743#include <sys/config.h>
    4844#include <machine/endian.h>
    4945
    50 # define HZ (60)
    5146# define PATHSIZE (1024)
    5247
    5348/* end of from newlib's <sys/param.h> */
     
    8681#define MAXHOSTNAMELEN  256             /* max hostname size */
    8782
    8883/* More types and definitions used throughout the kernel. */
    89 #ifdef KERNEL
     84#if defined(KERNEL) || defined(_KERNEL)
    9085#include <sys/cdefs.h>
    9186#include <sys/errno.h>
    9287#include <sys/time.h>
    9388#include <sys/resource.h>
    94 #include <sys/ucred.h>
    9589#include <sys/uio.h>
     90#include <sys/priority.h>
    9691
    9792#ifndef FALSE
    9893#define FALSE   0
     
    109104#include <machine/param.h>
    110105#include <machine/limits.h>
    111106
    112 /*
    113  * Priorities.  Note that with 32 run queues, differences less than 4 are
    114  * insignificant.
    115  */
    116 #define PSWP    0
    117 #define PVM     4
    118 #define PINOD   8
    119 #define PRIBIO  16
    120 #define PVFS    20
    121 #define PZERO   22              /* No longer magic, shouldn't be here.  XXX */
    122 #define PSOCK   24
    123 #define PWAIT   32
    124 #define PLOCK   36
    125 #define PPAUSE  40
    126 #define PUSER   50
    127 #define MAXPRI  127             /* Priorities range from 0 through MAXPRI. */
    128 
    129107#define PRIMASK 0x0ff
    130108#define PCATCH  0x100           /* OR'd with pri for tsleep to check signals */
    131109
     
    136114#define CMASK   022             /* default file mask: S_IWGRP|S_IWOTH */
    137115#define NODEV   (dev_t)(-1)     /* non-existent device */
    138116
    139 /*
    140  * Clustering of hardware pages on machines with ridiculously small
    141  * page sizes is done here.  The paging subsystem deals with units of
    142  * CLSIZE pte's describing PAGE_SIZE (from machine/machparam.h) pages each.
    143  */
    144 #if 0
    145 #define CLBYTES         (CLSIZE*PAGE_SIZE)
    146 #endif
    147 
    148117#define CBLOCK  128             /* Clist block size, must be a power of 2. */
    149118#define CBQSIZE (CBLOCK/NBBY)   /* Quote bytes/cblock - can do better. */
    150119                                /* Data chars/clist. */
     
    200169#define powerof2(x)     ((((x)-1)&(x))==0)
    201170
    202171/* Macros for min/max. */
    203 #ifndef KERNEL
     172#if !(defined(KERNEL) || defined(_KERNEL))
    204173#define MIN(a,b) (((a)<(b))?(a):(b))
    205174#define MAX(a,b) (((a)>(b))?(a):(b))
    206175#endif
  • newlib/libc/unix/Makefile.am

    diff -Naur newlib-1.17.0.orig/newlib/libc/unix/Makefile.am newlib-1.17.0/newlib/libc/unix/Makefile.am
    old new  
    1212
    1313## Distinguish different EL/IX level interfaces
    1414ELIX_2_SOURCES = \
    15         ttyname.c
     15        ttyname.c \
     16        ttyname_r.c
    1617
    1718ELIX_4_SOURCES = \
    1819        basename.c      \
  • newlib/libc/unix/Makefile.in

    diff -Naur newlib-1.17.0.orig/newlib/libc/unix/Makefile.in newlib-1.17.0/newlib/libc/unix/Makefile.in
    old new  
    5959lib_a_LIBADD =
    6060am__objects_1 = lib_a-getcwd.$(OBJEXT) lib_a-pread.$(OBJEXT) \
    6161        lib_a-pwrite.$(OBJEXT) lib_a-sigset.$(OBJEXT)
    62 am__objects_2 = lib_a-ttyname.$(OBJEXT)
     62am__objects_2 = lib_a-ttyname.$(OBJEXT) lib_a-ttyname_r.$(OBJEXT)
    6363am__objects_3 = lib_a-basename.$(OBJEXT) lib_a-dirname.$(OBJEXT) \
    6464        lib_a-getlogin.$(OBJEXT) lib_a-getpass.$(OBJEXT) \
    6565        lib_a-getpwent.$(OBJEXT) lib_a-getut.$(OBJEXT)
     
    7474LTLIBRARIES = $(noinst_LTLIBRARIES)
    7575libunix_la_LIBADD =
    7676am__objects_5 = getcwd.lo pread.lo pwrite.lo sigset.lo
    77 am__objects_6 = ttyname.lo
     77am__objects_6 = ttyname.lo ttyname_r.lo
    7878am__objects_7 = basename.lo dirname.lo getlogin.lo getpass.lo \
    7979        getpwent.lo getut.lo
    8080@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_8 = $(am__objects_6) \
     
    278278        sigset.c
    279279
    280280ELIX_2_SOURCES = \
    281         ttyname.c
     281        ttyname.c \
     282        ttyname_r.c
    282283
    283284ELIX_4_SOURCES = \
    284285        basename.c      \
     
    402403lib_a-ttyname.obj: ttyname.c
    403404        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname.obj `if test -f 'ttyname.c'; then $(CYGPATH_W) 'ttyname.c'; else $(CYGPATH_W) '$(srcdir)/ttyname.c'; fi`
    404405
     406lib_a-ttyname_r.o: ttyname_r.c
     407        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname_r.o `test -f 'ttyname_r.c' || echo '$(srcdir)/'`ttyname_r.c
     408
     409lib_a-ttyname_r.obj: ttyname_r.c
     410        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-ttyname_r.obj `if test -f 'ttyname_r.c'; then $(CYGPATH_W) 'ttyname_r.c'; else $(CYGPATH_W) '$(srcdir)/ttyname_r.c'; fi`
     411
    405412lib_a-basename.o: basename.c
    406413        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-basename.o `test -f 'basename.c' || echo '$(srcdir)/'`basename.c
    407414
  • newlib/libc/unix/ttyname.c

    diff -Naur newlib-1.17.0.orig/newlib/libc/unix/ttyname.c newlib-1.17.0/newlib/libc/unix/ttyname.c
    old new  
    2828 * SUCH DAMAGE.
    2929 */
    3030
    31 #include <sys/types.h>
    32 #include <sys/stat.h>
    33 #include <fcntl.h>
     31#include "ttyname.h"
     32
    3433#include <dirent.h>
    3534#include <unistd.h>
    36 #include <string.h>
    3735#include <paths.h>
    38 #include <_syslist.h>
    3936#include <errno.h>
    4037
    41 static char ttyname_buf[sizeof (_PATH_DEV) + MAXNAMLEN] = _PATH_DEV;
    42 
    43 /*
    44  *  ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
    45  */
    46 int
    47 _DEFUN( ttyname_r,(fd, name, namesize),
    48         int fd _AND
    49         char   *name _AND
    50         size_t  namesize)
    51 {
    52   struct stat sb;
    53   struct dirent *dirp;
    54   DIR *dp;
    55   struct stat dsb;
    56   char buf[sizeof(ttyname_buf)];
    57 
    58   /* Must be a terminal. */
    59   if (!isatty(fd))
    60     return ENOTTY;
    61 
    62   /* Must be a character device. */
    63   if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
    64     return ENOTTY;
    65 
    66   if ((dp = opendir (_PATH_DEV)) == NULL)
    67     return EBADF;
    68 
    69   strcpy(buf, _PATH_DEV);
    70   while ((dirp = readdir (dp)) != NULL)
    71     {
    72       if (dirp->d_ino != sb.st_ino)
    73         continue;
    74       strcpy (buf + sizeof (_PATH_DEV) - 1, dirp->d_name);
    75       if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
    76           sb.st_ino != dsb.st_ino)
    77         continue;
    78       (void) closedir (dp);
    79       if(strlen(buf) < namesize)  /* < to account for terminating null */
    80         {
    81         strcpy(name, buf);
    82         return 0;
    83         }
    84       else
    85         {
    86         return ERANGE;
    87         }
    88     }
    89   (void) closedir (dp);
    90   return EBADF;
    91 }
     38static char ttyname_buf[TTYNAME_BUFSIZE] = _PATH_DEV;
    9239
    9340/*
    9441 *  ttyname() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
  • newlib/libc/unix/ttyname.h

    diff -Naur newlib-1.17.0.orig/newlib/libc/unix/ttyname.h newlib-1.17.0/newlib/libc/unix/ttyname.h
    old new  
     1/* Common defines for ttyname.c and ttyname_r.c */
     2 
     3#include <dirent.h>     /* For MAXNAMLEN */
     4#include <paths.h>      /* For _PATH_DEV */
     5
     6#define TTYNAME_BUFSIZE (sizeof (_PATH_DEV) + MAXNAMLEN)
  • newlib/libc/unix/ttyname_r.c

    diff -Naur newlib-1.17.0.orig/newlib/libc/unix/ttyname_r.c newlib-1.17.0/newlib/libc/unix/ttyname_r.c
    old new  
     1#ifndef _NO_TTYNAME
     2/*
     3 * Copyright (c) 1988 The Regents of the University of California.
     4 * All rights reserved.
     5 *
     6 * Redistribution and use in source and binary forms, with or without
     7 * modification, are permitted provided that the following conditions
     8 * are met:
     9 * 1. Redistributions of source code must retain the above copyright
     10 *    notice, this list of conditions and the following disclaimer.
     11 * 2. Redistributions in binary form must reproduce the above copyright
     12 *    notice, this list of conditions and the following disclaimer in the
     13 *    documentation and/or other materials provided with the distribution.
     14 * 4. Neither the name of the University nor the names of its contributors
     15 *    may be used to endorse or promote products derived from this software
     16 *    without specific prior written permission.
     17 *
     18 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
     19 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     20 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     21 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
     22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
     23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
     24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
     25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
     26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
     27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     28 * SUCH DAMAGE.
     29 */
     30
     31#include "ttyname.h"
     32
     33#include <sys/types.h>
     34#include <sys/stat.h>
     35#include <fcntl.h>
     36#include <dirent.h>
     37#include <unistd.h>
     38#include <string.h>
     39#include <paths.h>
     40#include <_syslist.h>
     41#include <errno.h>
     42
     43/*
     44 *  ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
     45 */
     46int
     47_DEFUN( ttyname_r,(fd, name, namesize),
     48        int fd _AND
     49        char   *name _AND
     50        size_t  namesize)
     51{
     52  struct stat sb;
     53  struct dirent *dirp;
     54  DIR *dp;
     55  struct stat dsb;
     56  char buf[TTYNAME_BUFSIZE];
     57
     58  /* Must be a terminal. */
     59  if (!isatty(fd))
     60    return ENOTTY;
     61
     62  /* Must be a character device. */
     63  if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
     64    return ENOTTY;
     65
     66  if ((dp = opendir (_PATH_DEV)) == NULL)
     67    return EBADF;
     68
     69  strcpy(buf, _PATH_DEV);
     70  while ((dirp = readdir (dp)) != NULL)
     71    {
     72      if (dirp->d_ino != sb.st_ino)
     73        continue;
     74      strcpy (buf + sizeof (_PATH_DEV) - 1, dirp->d_name);
     75      if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
     76          sb.st_ino != dsb.st_ino)
     77        continue;
     78      (void) closedir (dp);
     79      if(strlen(buf) < namesize)  /* < to account for terminating null */
     80        {
     81        strcpy(name, buf);
     82        return 0;
     83        }
     84      else
     85        {
     86        return ERANGE;
     87        }
     88    }
     89  (void) closedir (dp);
     90  return EBADF;
     91}
     92
     93#endif /* !_NO_TTYNAME  */
  • newlib/Makefile.am

    diff -Naur newlib-1.17.0.orig/newlib/Makefile.am newlib-1.17.0/newlib/Makefile.am
    old new  
    8181        libc.a
    8282endif
    8383
    84 noinst_DATA = stmp-targ-include
     84BUILT_SOURCES = stmp-targ-include
    8585
    8686toollib_DATA = $(CRT0) $(CRT1)
    8787
     
    186186
    187187$(CRT1_DIR)$(CRT1): ; @true
    188188
    189 
    190 all-recursive: stmp-targ-include
    191 
    192189# The targ-include directory just holds the includes files for the
    193190# particular system and machine we have been configured for.  It is
    194191# used while building.
  • newlib/Makefile.in

    diff -Naur newlib-1.17.0.orig/newlib/Makefile.in newlib-1.17.0/newlib/Makefile.in
    old new  
    106106        pdf-recursive ps-recursive uninstall-info-recursive \
    107107        uninstall-recursive
    108108toollibDATA_INSTALL = $(INSTALL_DATA)
    109 DATA = $(noinst_DATA) $(toollib_DATA)
     109DATA = $(toollib_DATA)
    110110ETAGS = etags
    111111CTAGS = ctags
    112112DEJATOOL = $(PACKAGE)
     
    350350@USE_LIBTOOL_FALSE@toollib_LIBRARIES = libm.a \
    351351@USE_LIBTOOL_FALSE@     libc.a
    352352
    353 noinst_DATA = stmp-targ-include
     353BUILT_SOURCES = stmp-targ-include
    354354toollib_DATA = $(CRT0) $(CRT1)
    355355
    356356# The functions ldexp, frexp and modf are traditionally supplied in
     
    409409
    410410# dejagnu support
    411411RUNTESTFLAGS =
    412 all: newlib.h
     412all: $(BUILT_SOURCES) newlib.h
    413413        $(MAKE) $(AM_MAKEFLAGS) all-recursive
    414414
    415415.SUFFIXES:
     
    714714        done
    715715check-am:
    716716        $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
    717 check: check-recursive
     717check: $(BUILT_SOURCES)
     718        $(MAKE) $(AM_MAKEFLAGS) check-recursive
    718719all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h
    719720installdirs: installdirs-recursive
    720721installdirs-am:
    721722        for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \
    722723          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    723724        done
    724 install: install-recursive
     725install: $(BUILT_SOURCES)
     726        $(MAKE) $(AM_MAKEFLAGS) install-recursive
    725727install-exec: install-exec-recursive
    726728install-data: install-data-recursive
    727729uninstall: uninstall-recursive
     
    746748maintainer-clean-generic:
    747749        @echo "This command is intended for maintainers to use"
    748750        @echo "it deletes files that may require special tools to rebuild."
     751        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
    749752clean: clean-recursive
    750753
    751754clean-am: clean-generic clean-libtool clean-toollibLIBRARIES \
     
    864867
    865868$(CRT1_DIR)$(CRT1): ; @true
    866869
    867 all-recursive: stmp-targ-include
    868 
    869870# The targ-include directory just holds the includes files for the
    870871# particular system and machine we have been configured for.  It is
    871872# used while building.
Note: See TracBrowser for help on using the repository browser.