Changeset 7ab6fc2 in mainline

Timestamp:

2011-04-09T19:15:26Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

40ef3ed

Parents:

2e08dce

Message:

setting POSIX_COMPAT=1 in the makefile now makes compat headers preferred and links with libcompat

Location:

uspace

Files:

• Makefile.common (modified) (1 diff)
• app/pcc/cc/cpp/Makefile (modified) (1 diff)
• app/pcc/cc/cpp/cpp.c (modified) (2 diffs)
• app/pcc/cc/cpp/token.c (modified) (1 diff)
• lib/compat/compat (deleted)
• lib/compat/ctype.h (modified) (1 diff)
• lib/compat/sys/stat.h (modified) (1 diff)
• lib/compat/time.h (modified) (1 diff)
• lib/compat/unistd.h (modified) (1 diff)

uspace/Makefile.common

@@ -154 +154 @@
 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
+ifeq ($(POSIX_COMPAT),1)
+        CFLAGS = -I$(LIBCOMPAT_PREFIX)
+        LIBS += $(LIBCOMPAT_PREFIX)/libcompat.a
+endif
+
 ifeq ($(COMPILER),gcc_cross)
-        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_native)
-        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),icc)
-        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),clang)
-        CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif

uspace/app/pcc/cc/cpp/Makefile

@@ -27 +27 @@
 #
 
-# TODO: prefer libcompat headers to libc
-
 ARCH = i386  # FIXME: figure out the real arch
 
 USPACE_PREFIX = ../../../..
-LIBS = $(LIBCOMPAT_PREFIX)/libcompat.a
 MIPDIR = ../../mip
 ARCHDIR = ../../arch/$(ARCH)
-EXTRA_CFLAGS = -I$(LIBCOMPAT_PREFIX) -I$(MIPDIR) -I$(ARCHDIR)
+EXTRA_CFLAGS = -I$(MIPDIR) -I$(ARCHDIR)
 EXTRA_CLEAN = y.tab.c y.tab.h
 DEFS = -DCPP_DEBUG -Dfree=free -DCPPBUF=16384
 BINARY = cpp
+
+POSIX_COMPAT = 1
 
 YACC = yacc

uspace/app/pcc/cc/cpp/cpp.c

@@ -37 +37 @@
 #include <sys/wait.h>
 #endif
-#include <compat/sys/stat.h>
+#include <sys/stat.h>
 
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
-#include <compat/unistd.h>
+#include <unistd.h>
 #endif
 #include <stdio.h>
@@ -47 +47 @@
 #include <stdlib.h>
 #include <string.h>
-#include <compat/time.h>
+#include <time.h>
 #include <ctype.h>
 

uspace/app/pcc/cc/cpp/token.c

@@ -45 +45 @@
 #include <stdlib.h>
 #include <string.h>
-#include <compat/ctype.h>
+#include <ctype.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

uspace/lib/compat/ctype.h

@@ -30 +30 @@
 #define COMPAT_CTYPE_H
 
-#include <ctype.h>
+#include "../c/include/ctype.h"
 
 extern int isxdigit(int ch);

uspace/lib/compat/sys/stat.h

@@ -3 +3 @@
 #define COMPAT_STAT_H
 
-#include <sys/stat.h>
+#include "../../c/include/sys/stat.h"
 #include "time.h"
 

uspace/lib/compat/time.h

@@ -30 +30 @@
 #define COMPAT_TIME_H
 
-#include <time.h>
+#include "../c/include/time.h"
 
 struct tm {

uspace/lib/compat/unistd.h

@@ -30 +30 @@
 #define COMPAT_UNISTD_H
 
+#include "../c/include/unistd.h"
+
 //#include <getopt.h>