Context Navigation

← Previous Changeset
Next Changeset →

Changeset df217a6 in mainline

Timestamp:

2011-07-23T20:21:56Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

c62f2d0

Parents:

65b4aac1 (diff), b9a46fc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pcc changes.

Files:

: 229 added
: 11 edited

boot/Makefile.common (modified) (1 diff)
uspace/Makefile (modified) (1 diff)
uspace/app/cc (added)
uspace/app/ccom (added)
uspace/app/cpp (added)
uspace/app/pcc/DATESTAMP (added)
uspace/app/pcc/Makefile.in (added)
uspace/app/pcc/arch/amd64/code.c (added)
uspace/app/pcc/arch/amd64/local.c (added)
uspace/app/pcc/arch/amd64/local2.c (added)
uspace/app/pcc/arch/amd64/macdefs.h (added)
uspace/app/pcc/arch/amd64/order.c (added)
uspace/app/pcc/arch/amd64/table.c (added)
uspace/app/pcc/arch/arm/code.c (added)
uspace/app/pcc/arch/arm/local.c (added)
uspace/app/pcc/arch/arm/local2.c (added)
uspace/app/pcc/arch/arm/macdefs.h (added)
uspace/app/pcc/arch/arm/order.c (added)
uspace/app/pcc/arch/arm/table.c (added)
uspace/app/pcc/arch/arm32 (added)
uspace/app/pcc/arch/hppa/code.c (added)
uspace/app/pcc/arch/hppa/local.c (added)
uspace/app/pcc/arch/hppa/local2.c (added)
uspace/app/pcc/arch/hppa/macdefs.h (added)
uspace/app/pcc/arch/hppa/order.c (added)
uspace/app/pcc/arch/hppa/table.c (added)
uspace/app/pcc/arch/i386/code.c (added)
uspace/app/pcc/arch/i386/flocal.c (added)
uspace/app/pcc/arch/i386/local.c (added)
uspace/app/pcc/arch/i386/local2.c (added)
uspace/app/pcc/arch/i386/macdefs.h (added)
uspace/app/pcc/arch/i386/order.c (added)
uspace/app/pcc/arch/i386/table.c (added)
uspace/app/pcc/arch/ia32 (added)
uspace/app/pcc/arch/m16c/TODO (added)
uspace/app/pcc/arch/m16c/code.c (added)
uspace/app/pcc/arch/m16c/local.c (added)
uspace/app/pcc/arch/m16c/local2.c (added)
uspace/app/pcc/arch/m16c/macdefs.h (added)
uspace/app/pcc/arch/m16c/order.c (added)
uspace/app/pcc/arch/m16c/table.c (added)
uspace/app/pcc/arch/mips/TODO (added)
uspace/app/pcc/arch/mips/code.c (added)
uspace/app/pcc/arch/mips/local.c (added)
uspace/app/pcc/arch/mips/local2.c (added)
uspace/app/pcc/arch/mips/macdefs.h (added)
uspace/app/pcc/arch/mips/order.c (added)
uspace/app/pcc/arch/mips/table.c (added)
uspace/app/pcc/arch/mips32 (added)
uspace/app/pcc/arch/nova/README (added)
uspace/app/pcc/arch/nova/code.c (added)
uspace/app/pcc/arch/nova/local.c (added)
uspace/app/pcc/arch/nova/local2.c (added)
uspace/app/pcc/arch/nova/macdefs.h (added)
uspace/app/pcc/arch/nova/order.c (added)
uspace/app/pcc/arch/nova/table.c (added)
uspace/app/pcc/arch/pdp10/README (added)
uspace/app/pcc/arch/pdp10/code.c (added)
uspace/app/pcc/arch/pdp10/local.c (added)
uspace/app/pcc/arch/pdp10/local2.c (added)
uspace/app/pcc/arch/pdp10/macdefs.h (added)
uspace/app/pcc/arch/pdp10/order.c (added)
uspace/app/pcc/arch/pdp10/table.c (added)
uspace/app/pcc/arch/pdp11/code.c (added)
uspace/app/pcc/arch/pdp11/local.c (added)
uspace/app/pcc/arch/pdp11/local2.c (added)
uspace/app/pcc/arch/pdp11/macdefs.h (added)
uspace/app/pcc/arch/pdp11/order.c (added)
uspace/app/pcc/arch/pdp11/table.c (added)
uspace/app/pcc/arch/powerpc/README (added)
uspace/app/pcc/arch/powerpc/code.c (added)
uspace/app/pcc/arch/powerpc/local.c (added)
uspace/app/pcc/arch/powerpc/local2.c (added)
uspace/app/pcc/arch/powerpc/macdefs.h (added)
uspace/app/pcc/arch/powerpc/order.c (added)
uspace/app/pcc/arch/powerpc/table.c (added)
uspace/app/pcc/arch/ppc32 (added)
uspace/app/pcc/arch/sparc64/code.c (added)
uspace/app/pcc/arch/sparc64/local.c (added)
uspace/app/pcc/arch/sparc64/local2.c (added)
uspace/app/pcc/arch/sparc64/macdefs.h (added)
uspace/app/pcc/arch/sparc64/order.c (added)
uspace/app/pcc/arch/sparc64/table.c (added)
uspace/app/pcc/arch/vax/code.c (added)
uspace/app/pcc/arch/vax/local.c (added)
uspace/app/pcc/arch/vax/local2.c (added)
uspace/app/pcc/arch/vax/macdefs.h (added)
uspace/app/pcc/arch/vax/order.c (added)
uspace/app/pcc/arch/vax/table.c (added)
uspace/app/pcc/cc/Makefile.in (added)
uspace/app/pcc/cc/cc/Makefile (added)
uspace/app/pcc/cc/cc/Makefile.in (added)
uspace/app/pcc/cc/cc/cc.1 (added)
uspace/app/pcc/cc/cc/cc.c (added)
uspace/app/pcc/cc/ccom/Makefile (added)
uspace/app/pcc/cc/ccom/Makefile.in (added)
uspace/app/pcc/cc/ccom/arch/abs32le/external.c (added)
uspace/app/pcc/cc/ccom/arch/abs32le/external.h (added)
uspace/app/pcc/cc/ccom/arch/amd64/external.c (added)
uspace/app/pcc/cc/ccom/arch/amd64/external.h (added)
uspace/app/pcc/cc/ccom/arch/arm32/external.c (added)
uspace/app/pcc/cc/ccom/arch/arm32/external.h (added)
uspace/app/pcc/cc/ccom/arch/ia32/external.c (added)
uspace/app/pcc/cc/ccom/arch/ia32/external.h (added)
uspace/app/pcc/cc/ccom/arch/ia64/external.c (added)
uspace/app/pcc/cc/ccom/arch/ia64/external.h (added)
uspace/app/pcc/cc/ccom/arch/mips32/external.c (added)
uspace/app/pcc/cc/ccom/arch/mips32/external.h (added)
uspace/app/pcc/cc/ccom/arch/ppc32/external.c (added)
uspace/app/pcc/cc/ccom/arch/ppc32/external.h (added)
uspace/app/pcc/cc/ccom/arch/sparc64/external.c (added)
uspace/app/pcc/cc/ccom/arch/sparc64/external.h (added)
uspace/app/pcc/cc/ccom/builtins.c (added)
uspace/app/pcc/cc/ccom/ccom.1 (added)
uspace/app/pcc/cc/ccom/cgram.y (added)
uspace/app/pcc/cc/ccom/gcc_compat.c (added)
uspace/app/pcc/cc/ccom/init.c (added)
uspace/app/pcc/cc/ccom/inline.c (added)
uspace/app/pcc/cc/ccom/main.c (added)
uspace/app/pcc/cc/ccom/mkext/Makefile (added)
uspace/app/pcc/cc/ccom/mkext/ccom_mkext (added)
uspace/app/pcc/cc/ccom/optim.c (added)
uspace/app/pcc/cc/ccom/pass1.h (added)
uspace/app/pcc/cc/ccom/pftn.c (added)
uspace/app/pcc/cc/ccom/scan.l (added)
uspace/app/pcc/cc/ccom/softfloat.c (added)
uspace/app/pcc/cc/ccom/stabs.c (added)
uspace/app/pcc/cc/ccom/symtabs.c (added)
uspace/app/pcc/cc/ccom/trees.c (added)
uspace/app/pcc/cc/cpp/Makefile (added)
uspace/app/pcc/cc/cpp/Makefile.in (added)
uspace/app/pcc/cc/cpp/config.h (added)
uspace/app/pcc/cc/cpp/cpp.1 (added)
uspace/app/pcc/cc/cpp/cpp.c (added)
uspace/app/pcc/cc/cpp/cpp.h (added)
uspace/app/pcc/cc/cpp/cpy.y (added)
uspace/app/pcc/cc/cpp/scanner.l (added)
uspace/app/pcc/cc/cpp/tests/res1 (added)
uspace/app/pcc/cc/cpp/tests/res10 (added)
uspace/app/pcc/cc/cpp/tests/res11 (added)
uspace/app/pcc/cc/cpp/tests/res12 (added)
uspace/app/pcc/cc/cpp/tests/res13 (added)
uspace/app/pcc/cc/cpp/tests/res2 (added)
uspace/app/pcc/cc/cpp/tests/res3 (added)
uspace/app/pcc/cc/cpp/tests/res4 (added)
uspace/app/pcc/cc/cpp/tests/res5 (added)
uspace/app/pcc/cc/cpp/tests/res6 (added)
uspace/app/pcc/cc/cpp/tests/res7 (added)
uspace/app/pcc/cc/cpp/tests/res8 (added)
uspace/app/pcc/cc/cpp/tests/res9 (added)
uspace/app/pcc/cc/cpp/tests/test1 (added)
uspace/app/pcc/cc/cpp/tests/test10 (added)
uspace/app/pcc/cc/cpp/tests/test11 (added)
uspace/app/pcc/cc/cpp/tests/test12 (added)
uspace/app/pcc/cc/cpp/tests/test13 (added)
uspace/app/pcc/cc/cpp/tests/test2 (added)
uspace/app/pcc/cc/cpp/tests/test3 (added)
uspace/app/pcc/cc/cpp/tests/test4 (added)
uspace/app/pcc/cc/cpp/tests/test5 (added)
uspace/app/pcc/cc/cpp/tests/test6 (added)
uspace/app/pcc/cc/cpp/tests/test7 (added)
uspace/app/pcc/cc/cpp/tests/test8 (added)
uspace/app/pcc/cc/cpp/tests/test9 (added)
uspace/app/pcc/cc/cpp/token.c (added)
uspace/app/pcc/config.guess (added)
uspace/app/pcc/config.h (added)
uspace/app/pcc/config.h.in (added)
uspace/app/pcc/config.sub (added)
uspace/app/pcc/configure (added)
uspace/app/pcc/configure.ac (added)
uspace/app/pcc/f77/Makefile.in (added)
uspace/app/pcc/f77/f77/Makefile.in (added)
uspace/app/pcc/f77/f77/f77.1 (added)
uspace/app/pcc/f77/f77/f77.c (added)
uspace/app/pcc/f77/fcom/Makefile.in (added)
uspace/app/pcc/f77/fcom/data.c (added)
uspace/app/pcc/f77/fcom/defines.h (added)
uspace/app/pcc/f77/fcom/defs.h (added)
uspace/app/pcc/f77/fcom/equiv.c (added)
uspace/app/pcc/f77/fcom/error.c (added)
uspace/app/pcc/f77/fcom/exec.c (added)
uspace/app/pcc/f77/fcom/expr.c (added)
uspace/app/pcc/f77/fcom/ftypes.h (added)
uspace/app/pcc/f77/fcom/gram.dcl (added)
uspace/app/pcc/f77/fcom/gram.exec (added)
uspace/app/pcc/f77/fcom/gram.expr (added)
uspace/app/pcc/f77/fcom/gram.head (added)
uspace/app/pcc/f77/fcom/gram.io (added)
uspace/app/pcc/f77/fcom/init.c (added)
uspace/app/pcc/f77/fcom/intr.c (added)
uspace/app/pcc/f77/fcom/io.c (added)
uspace/app/pcc/f77/fcom/lex.c (added)
uspace/app/pcc/f77/fcom/main.c (added)
uspace/app/pcc/f77/fcom/misc.c (added)
uspace/app/pcc/f77/fcom/proc.c (added)
uspace/app/pcc/f77/fcom/put.c (added)
uspace/app/pcc/f77/fcom/putscj.c (added)
uspace/app/pcc/f77/fcom/scjdefs.h (added)
uspace/app/pcc/f77/fcom/tokens (added)
uspace/app/pcc/install-sh (added)
uspace/app/pcc/mip/common.c (added)
uspace/app/pcc/mip/compat.c (added)
uspace/app/pcc/mip/compat.h (added)
uspace/app/pcc/mip/config.h (added)
uspace/app/pcc/mip/manifest.h (added)
uspace/app/pcc/mip/match.c (added)
uspace/app/pcc/mip/mkext.c (added)
uspace/app/pcc/mip/node.h (added)
uspace/app/pcc/mip/optim2.c (added)
uspace/app/pcc/mip/pass2.h (added)
uspace/app/pcc/mip/reader.c (added)
uspace/app/pcc/mip/regs.c (added)
uspace/app/pcc/os/bsd/ccconfig.h (added)
uspace/app/pcc/os/darwin/ccconfig.h (added)
uspace/app/pcc/os/dragonfly/ccconfig.h (added)
uspace/app/pcc/os/freebsd/ccconfig.h (added)
uspace/app/pcc/os/helenos/ccconfig.h (added)
uspace/app/pcc/os/linux/ccconfig.h (added)
uspace/app/pcc/os/midnightbsd/ccconfig.h (added)
uspace/app/pcc/os/mirbsd/ccconfig.h (added)
uspace/app/pcc/os/netbsd/ccconfig.h (added)
uspace/app/pcc/os/nextstep/ccconfig.h (added)
uspace/app/pcc/os/none/ccconfig.h (added)
uspace/app/pcc/os/openbsd/ccconfig.h (added)
uspace/app/pcc/os/openbsd/f77config.h (added)
uspace/app/pcc/os/sunos/ccconfig.h (added)
uspace/app/pcc/os/win32/build.bat (added)
uspace/app/pcc/os/win32/build_installer.bat (added)
uspace/app/pcc/os/win32/ccconfig.h (added)
uspace/app/pcc/os/win32/config.h (added)
uspace/app/pcc/os/win32/pcc.iss (added)
uspace/lib/c/arch/abs32le/include/types.h (modified) (1 diff)
uspace/lib/c/arch/amd64/include/types.h (modified) (1 diff)
uspace/lib/c/arch/arm32/include/types.h (modified) (1 diff)
uspace/lib/c/arch/ia32/include/types.h (modified) (1 diff)
uspace/lib/c/arch/ia64/include/types.h (modified) (1 diff)
uspace/lib/c/arch/mips32/include/types.h (modified) (1 diff)
uspace/lib/c/arch/ppc32/include/types.h (modified) (1 diff)
uspace/lib/c/arch/sparc64/include/types.h (modified) (1 diff)
uspace/lib/posix/unistd.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

boot/Makefile.common

-              r65b4aac1
+              rdf217a6
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
+        $(USPACE_PATH)/app/cc/cc \
+        $(USPACE_PATH)/app/ccom/ccom \
+        $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
+        $(USPACE_PATH)/app/cpp/cpp \
         $(USPACE_PATH)/app/dltest/dltest \
         $(USPACE_PATH)/app/dltest2/dltest2 \

uspace/Makefile

-              r65b4aac1
+              rdf217a6
         app/blkdump \
         app/bnchmark \
+        app/cc \
+        app/ccom \
+        app/ccom/mkext \
+        app/cpp \
         app/edit \
         app/ext2info \

uspace/lib/c/arch/abs32le/include/types.h

r65b4aac1	rdf217a6
51	51	typedef uint32_t size_t;
52	52
	53	typedef int32_t intptr_t;
53	54	typedef uint32_t uintptr_t;
54	55	typedef uint32_t atomic_count_t;

uspace/lib/c/arch/amd64/include/types.h

r65b4aac1	rdf217a6
51	51	typedef uint64_t size_t;
52	52
	53	typedef int64_t intptr_t;
53	54	typedef uint64_t uintptr_t;
54	55	typedef uint64_t atomic_count_t;

uspace/lib/c/arch/arm32/include/types.h

r65b4aac1	rdf217a6
52	52	typedef uint32_t size_t;
53	53
	54	typedef int32_t intptr_t;
54	55	typedef uint32_t uintptr_t;
55	56	typedef uint32_t atomic_count_t;

uspace/lib/c/arch/ia32/include/types.h

r65b4aac1	rdf217a6
51	51	typedef uint32_t size_t;
52	52
	53	typedef int32_t intptr_t;
53	54	typedef uint32_t uintptr_t;
54	55	typedef uint32_t atomic_count_t;

uspace/lib/c/arch/ia64/include/types.h

r65b4aac1	rdf217a6
61	61	typedef uint64_t size_t;
62	62
	63	typedef int64_t intptr_t;
63	64	typedef uint64_t uintptr_t;
64	65	typedef uint64_t atomic_count_t;

uspace/lib/c/arch/mips32/include/types.h

r65b4aac1	rdf217a6
52	52	typedef uint32_t size_t;
53	53
	54	typedef int32_t intptr_t;
54	55	typedef uint32_t uintptr_t;
55	56	typedef uint32_t atomic_count_t;

uspace/lib/c/arch/ppc32/include/types.h

r65b4aac1	rdf217a6
51	51	typedef uint32_t size_t;
52	52
	53	typedef int32_t intptr_t;
53	54	typedef uint32_t uintptr_t;
54	55	typedef uint32_t atomic_count_t;

uspace/lib/c/arch/sparc64/include/types.h

r65b4aac1	rdf217a6
51	51	typedef uint64_t size_t;
52	52
	53	typedef int64_t intptr_t;
53	54	typedef uint64_t uintptr_t;
54	55	typedef uint64_t atomic_count_t;

uspace/lib/posix/unistd.c

-              r65b4aac1
+              rdf217a6
+{
         /* Always returns false, because there is no easy way to find
+<<<<<<< TREE
      * out under HelenOS. */
         return 0;
+=======
+         * out under HelenOS. */
+        return false;
+>>>>>>> MERGE-SOURCE
+}

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset df217a6 in mainline

Legend:

Download in other formats: