diff options
Diffstat (limited to 'c/src/lib/libc')
| -rw-r--r-- | c/src/lib/libc/Makefile.in | 24 | ||||
| -rw-r--r-- | c/src/lib/libc/malloc.c | 4 |
2 files changed, 12 insertions, 16 deletions
diff --git a/c/src/lib/libc/Makefile.in b/c/src/lib/libc/Makefile.in index 7411a3cd28..59bee64a81 100644 --- a/c/src/lib/libc/Makefile.in +++ b/c/src/lib/libc/Makefile.in @@ -43,18 +43,6 @@ LIBC_GLUE_C_PIECES = __gettod __times truncate access stat lstat pathconf \ UNIX_LIBC_C_PIECES = unixlibc hosterr -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ -mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs - -INSTALLDIRS = $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/sys \ - $(PROJECT_INCLUDE) - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - # C and C++ source names, if any, go here -- minus the .c or .cc UNIX_C_PIECES = $(UNIX_LIBC_C_PIECES) $(BASE_FS_C_PIECES) $(MALLOC_C_PIECES) \ $(TERMIOS_C_PIECES) @@ -72,6 +60,18 @@ H_FILES = $(srcdir)/libcsupport.h SYS_H_FILES = RTEMS_H_FILES = $(srcdir)/libio.h +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(RTEMS_ROOT)/make/lib.cfg + +INSTALL_CHANGE = @INSTALL_CHANGE@ +mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs + +INSTALLDIRS = $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/sys \ + $(PROJECT_INCLUDE) + +$(INSTALLDIRS): + @$(mkinstalldirs) $(INSTALLDIRS) + SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libc/malloc.c b/c/src/lib/libc/malloc.c index f164e45f6c..30f74c89bb 100644 --- a/c/src/lib/libc/malloc.c +++ b/c/src/lib/libc/malloc.c @@ -27,10 +27,6 @@ #include <errno.h> #include <string.h> -/* for sbrk prototype in linux */ -#if defined(__linux__) -#define __USE_MISC -#endif #include <unistd.h> /* sbrk(2) */ rtems_id RTEMS_Malloc_Heap; |