Changeset 7ab6fc2 in mainline
- Timestamp:
- 2011-04-09T19:15:26Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 40ef3ed
- Parents:
- 2e08dce
- Location:
- uspace
- Files:
-
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/Makefile.common
r2e08dce r7ab6fc2 154 154 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py 155 155 156 ifeq ($(POSIX_COMPAT),1) 157 CFLAGS = -I$(LIBCOMPAT_PREFIX) 158 LIBS += $(LIBCOMPAT_PREFIX)/libcompat.a 159 endif 160 156 161 ifeq ($(COMPILER),gcc_cross) 157 CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)162 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS) 158 163 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 159 164 endif 160 165 161 166 ifeq ($(COMPILER),gcc_native) 162 CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)167 CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS) 163 168 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 164 169 endif 165 170 166 171 ifeq ($(COMPILER),icc) 167 CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)172 CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS) 168 173 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 169 174 endif 170 175 171 176 ifeq ($(COMPILER),clang) 172 CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)177 CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS) 173 178 DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS) 174 179 endif -
uspace/app/pcc/cc/cpp/Makefile
r2e08dce r7ab6fc2 27 27 # 28 28 29 # TODO: prefer libcompat headers to libc30 31 29 ARCH = i386 # FIXME: figure out the real arch 32 30 33 31 USPACE_PREFIX = ../../../.. 34 LIBS = $(LIBCOMPAT_PREFIX)/libcompat.a35 32 MIPDIR = ../../mip 36 33 ARCHDIR = ../../arch/$(ARCH) 37 EXTRA_CFLAGS = -I$( LIBCOMPAT_PREFIX) -I$(MIPDIR) -I$(ARCHDIR)34 EXTRA_CFLAGS = -I$(MIPDIR) -I$(ARCHDIR) 38 35 EXTRA_CLEAN = y.tab.c y.tab.h 39 36 DEFS = -DCPP_DEBUG -Dfree=free -DCPPBUF=16384 40 37 BINARY = cpp 38 39 POSIX_COMPAT = 1 41 40 42 41 YACC = yacc -
uspace/app/pcc/cc/cpp/cpp.c
r2e08dce r7ab6fc2 37 37 #include <sys/wait.h> 38 38 #endif 39 #include < compat/sys/stat.h>39 #include <sys/stat.h> 40 40 41 41 #include <fcntl.h> 42 42 #ifdef HAVE_UNISTD_H 43 #include < compat/unistd.h>43 #include <unistd.h> 44 44 #endif 45 45 #include <stdio.h> … … 47 47 #include <stdlib.h> 48 48 #include <string.h> 49 #include < compat/time.h>49 #include <time.h> 50 50 #include <ctype.h> 51 51 -
uspace/app/pcc/cc/cpp/token.c
r2e08dce r7ab6fc2 45 45 #include <stdlib.h> 46 46 #include <string.h> 47 #include <c ompat/ctype.h>47 #include <ctype.h> 48 48 #ifdef HAVE_UNISTD_H 49 49 #include <unistd.h> -
uspace/lib/compat/ctype.h
r2e08dce r7ab6fc2 30 30 #define COMPAT_CTYPE_H 31 31 32 #include <ctype.h>32 #include "../c/include/ctype.h" 33 33 34 34 extern int isxdigit(int ch); -
uspace/lib/compat/sys/stat.h
r2e08dce r7ab6fc2 3 3 #define COMPAT_STAT_H 4 4 5 #include <sys/stat.h>5 #include "../../c/include/sys/stat.h" 6 6 #include "time.h" 7 7 -
uspace/lib/compat/time.h
r2e08dce r7ab6fc2 30 30 #define COMPAT_TIME_H 31 31 32 #include <time.h>32 #include "../c/include/time.h" 33 33 34 34 struct tm { -
uspace/lib/compat/unistd.h
r2e08dce r7ab6fc2 30 30 #define COMPAT_UNISTD_H 31 31 32 #include "../c/include/unistd.h" 33 32 34 //#include <getopt.h> 33 35
Note:
See TracChangeset
for help on using the changeset viewer.