From 03890535ff1f191ddfc1bb43a70e424348c05a06 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 07 Jul 2009 10:30:09 +0000 Subject: [PATCH] * merged 32bit-wchar_t branches of buildtools and haiku back into the respective trunk git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@31443 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- gcc/gcc/config/haiku.h | 33 ++++++++++++++++++++++----------- legacy/binutils/bfd/version.h | 2 +- legacy/gcc/gcc/version.c | 2 +- gcc/gcc/config/arm/haiku.h | 16 ++-------------- gcc/gcc/config/i386/haiku.h | 12 ------------ gcc/gcc/config/m68k/haiku.h | 14 +------------- gcc/gcc/config/mips/haiku.h | 12 ------------ gcc/gcc/config/rs6000/haiku.h | 12 ------------ legacy/gcc/gcc/config/i386/haiku.h | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------- 9 files changed, 80 insertions(+), 144 deletions(-) diff --git a/gcc/gcc/config/haiku.h b/gcc/gcc/config/haiku.h index 95605e2..a9aa67c 100644 --- a/gcc/gcc/config/haiku.h +++ b/gcc/gcc/config/haiku.h @@ -28,41 +28,45 @@ #undef ASM_COMMENT_START #define ASM_COMMENT_START " #" -/* Output assembler code to FILE to increment profiler label # LABELNO - for profiling a function entry. */ - #undef MCOUNT_NAME #define MCOUNT_NAME "_mcount" #define TARGET_DECLSPEC 1 + +#undef SIZE_TYPE +#define SIZE_TYPE "long unsigned int" + +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE "long int" + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE 32 /* Haiku uses lots of multichars, so don't warn about them unless the user explicitly asks for the warnings with -Wmultichar. Note that CC1_SPEC is used for both cc1 and cc1plus. */ - #undef CC1_SPEC #define CC1_SPEC "%{!no-fpic:%{!fno-pic:%{!fno-pie:%{!fpie:%{!fPIC:%{!fPIE:-fpic}}}}}} %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}" #undef CC1PLUS_SPEC #define CC1PLUS_SPEC "%{!Wctor-dtor-privacy:-Wno-ctor-dtor-privacy}" -/* Provide start and end file specs appropriate to glibc. */ - /* LIB_SPEC for Haiku */ #undef LIB_SPEC #define LIB_SPEC "-lroot" /* gcc runtime lib is built into libroot.so on Haiku */ -/* ??? This is gonna be lovely when the next release of gcc has +/* ??? This is gonna be lovely when the next release of gcc has some new symbol in, so that links start failing. */ #undef LIBGCC_SPEC #define LIBGCC_SPEC "" -/* Note: There currently is no mcount.o on Haiku. In the BeOS specification - it was i386-mcount.o, but that doesn't exist in gcc 2.95.3 either. */ #undef STARTFILE_SPEC -#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!shared:%{!nostart:start_dyn.o%s}} init_term_dyn.o%s %{p:mcount.o%s}" +#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!shared:%{!nostart:start_dyn.o%s}} init_term_dyn.o%s" #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend.o%s crtn.o%s" @@ -83,7 +87,6 @@ { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \ { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 }, \ - { "/boot/home/config/include", 0, 0, 0, 0, 0 }, \ { "/boot/common/include", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/app", 0, 0, 0, 0, 0 }, \ @@ -92,6 +95,7 @@ { "/boot/develop/headers/os/game", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/interface", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/kernel", 0, 0, 0, 0, 0 }, \ + { "/boot/develop/headers/os/locale", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/mail", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/media", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/midi", 0, 0, 0, 0, 0 }, \ @@ -108,9 +112,10 @@ { "/boot/develop/headers/os/be_apps/Deskbar", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/be_apps/NetPositive", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/be_apps/Tracker", 0, 0, 0, 0, 0 }, \ - { "/boot/develop/headers/3rdparty", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/cpp", 0, 0, 0, 0, 0 }, \ + { "/boot/develop/headers/3rdparty", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/bsd", 0, 0, 0, 0, 0 }, \ + { "/boot/develop/headers/glibc", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/posix", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers", 0, 0, 0, 0, 0 }, \ { 0, 0, 0, 0, 0, 0 } \ @@ -132,6 +137,7 @@ { CROSS_INCLUDE_DIR "/os/game", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/os/interface", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/os/kernel", 0, 0, 0, 1, 0 }, \ + { CROSS_INCLUDE_DIR "/os/locale", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/os/mail", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/os/media", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/os/midi", 0, 0, 0, 1, 0 }, \ @@ -148,9 +154,10 @@ { CROSS_INCLUDE_DIR "/os/be_apps/Deskbar", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/os/be_apps/NetPositive", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/os/be_apps/Tracker", 0, 0, 0, 1, 0 }, \ - { CROSS_INCLUDE_DIR "/3rdparty", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/cpp", 0, 0, 0, 1, 0 }, \ + { CROSS_INCLUDE_DIR "/3rdparty", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/bsd", 0, 0, 0, 1, 0 }, \ + { CROSS_INCLUDE_DIR "/glibc", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/posix", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR , 0, 0, 0, 1, 0 }, \ { 0, 0, 0, 0, 0, 0 } \ diff --git a/legacy/binutils/bfd/version.h b/legacy/binutils/bfd/version.h index bf23684..85ca495 100644 --- a/legacy/binutils/bfd/version.h +++ b/legacy/binutils/bfd/version.h @@ -1,3 +1,3 @@ -#define BFD_VERSION_DATE 20081024 +#define BFD_VERSION_DATE 20090629 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_string@ diff --git a/legacy/gcc/gcc/version.c b/legacy/gcc/gcc/version.c index 4f0be95..bd67dac 100644 --- a/legacy/gcc/gcc/version.c +++ b/legacy/gcc/gcc/version.c @@ -1,1 +1,1 @@ -char *version_string = "2.95.3-haiku-081024"; +char *version_string = "2.95.3-haiku-090629"; diff --git a/gcc/gcc/config/arm/haiku.h b/gcc/gcc/config/arm/haiku.h index 1a21890..79a2683 100644 --- a/gcc/gcc/config/arm/haiku.h +++ b/gcc/gcc/config/arm/haiku.h @@ -1,9 +1,9 @@ /* Definitions for ARM running Haiku systems using ELF Copyright (C) 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - + This file is part of GCC. - + GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) @@ -38,18 +38,6 @@ #undef SUBTARGET_CPU_DEFAULT #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm920t - -#undef SIZE_TYPE -#define SIZE_TYPE "long unsigned int" - -#undef PTRDIFF_TYPE -#define PTRDIFF_TYPE "long int" - -#undef WCHAR_TYPE -#define WCHAR_TYPE "short unsigned int" - -#undef WCHAR_TYPE_SIZE -#define WCHAR_TYPE_SIZE 16 /* Now we define the strings used to build the spec file. */ diff --git a/gcc/gcc/config/i386/haiku.h b/gcc/gcc/config/i386/haiku.h index 84d3c07..335c414 100644 --- a/gcc/gcc/config/i386/haiku.h +++ b/gcc/gcc/config/i386/haiku.h @@ -31,18 +31,6 @@ #define DBX_REGISTER_NUMBER(n) \ (TARGET_64BIT ? dbx64_register_map[n] : svr4_dbx_register_map[n]) -#undef SIZE_TYPE -#define SIZE_TYPE "long unsigned int" - -#undef PTRDIFF_TYPE -#define PTRDIFF_TYPE "long int" - -#undef WCHAR_TYPE -#define WCHAR_TYPE "short unsigned int" - -#undef WCHAR_TYPE_SIZE -#define WCHAR_TYPE_SIZE 16 - #define TARGET_OS_CPP_BUILTINS() \ do \ { \ diff --git a/gcc/gcc/config/m68k/haiku.h b/gcc/gcc/config/m68k/haiku.h index 946d9b4..c587983 100644 --- a/gcc/gcc/config/m68k/haiku.h +++ b/gcc/gcc/config/m68k/haiku.h @@ -62,18 +62,6 @@ #undef ASM_COMMENT_START #define ASM_COMMENT_START "|" -#undef SIZE_TYPE -#define SIZE_TYPE "long unsigned int" - -#undef PTRDIFF_TYPE -#define PTRDIFF_TYPE "long int" - -#undef WCHAR_TYPE -#define WCHAR_TYPE "short unsigned int" - -#undef WCHAR_TYPE_SIZE -#define WCHAR_TYPE_SIZE 16 - /* Target OS builtins. */ #undef TARGET_OS_CPP_BUILTINS @@ -134,7 +122,7 @@ /* Currently, JUMP_TABLES_IN_TEXT_SECTION must be defined in order to keep switch tables in the text section. */ - + #define JUMP_TABLES_IN_TEXT_SECTION 1 /* This is how to output an assembler line that says to advance the diff --git a/gcc/gcc/config/mips/haiku.h b/gcc/gcc/config/mips/haiku.h index b80da14..c4029b2 100644 --- a/gcc/gcc/config/mips/haiku.h +++ b/gcc/gcc/config/mips/haiku.h @@ -23,18 +23,6 @@ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (MIPSEL Haiku/ELF)"); -#undef SIZE_TYPE -#define SIZE_TYPE "long unsigned int" - -#undef PTRDIFF_TYPE -#define PTRDIFF_TYPE "long int" - -#undef WCHAR_TYPE -#define WCHAR_TYPE "short unsigned int" - -#undef WCHAR_TYPE_SIZE -#define WCHAR_TYPE_SIZE 16 - #define TARGET_OS_CPP_BUILTINS() \ do \ { \ diff --git a/gcc/gcc/config/rs6000/haiku.h b/gcc/gcc/config/rs6000/haiku.h index 6053596..d306faa 100644 --- a/gcc/gcc/config/rs6000/haiku.h +++ b/gcc/gcc/config/rs6000/haiku.h @@ -23,18 +23,6 @@ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (PowerPC Haiku/ELF)"); -#undef SIZE_TYPE -#define SIZE_TYPE "long unsigned int" - -#undef PTRDIFF_TYPE -#define PTRDIFF_TYPE "long int" - -#undef WCHAR_TYPE -#define WCHAR_TYPE "short unsigned int" - -#undef WCHAR_TYPE_SIZE -#define WCHAR_TYPE_SIZE 16 - /* long double is 128 bits wide; the documentation claims LIBGCC2_LONG_DOUBLE_TYPE_SIZE to default to LONG_DOUBLE_TYPE_SIZE, but it apparently does not */ diff --git a/legacy/gcc/gcc/config/i386/haiku.h b/legacy/gcc/gcc/config/i386/haiku.h index 17d9388..558a8e4 100644 --- a/legacy/gcc/gcc/config/i386/haiku.h +++ b/legacy/gcc/gcc/config/i386/haiku.h @@ -149,13 +149,10 @@ #define PTRDIFF_TYPE "long int" #undef WCHAR_TYPE -#define WCHAR_TYPE "short unsigned int" +#define WCHAR_TYPE "int" -#undef WCHAR_UNSIGNED -#define WCHAR_UNSIGNED 1 - #undef WCHAR_TYPE_SIZE -#define WCHAR_TYPE_SIZE 16 +#define WCHAR_TYPE_SIZE 32 #undef CPP_PREDEFINES #define CPP_PREDEFINES "-D__ELF__ -D__HAIKU__ -D__INTEL__ -D_X86_=1 \ @@ -201,7 +198,7 @@ #define LIBGCC_SPEC "" #undef STARTFILE_SPEC -#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!nostart: %{!shared: start_dyn.o%s}} init_term_dyn.o%s %{p:i386-mcount.o%s}" +#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!nostart: %{!shared: start_dyn.o%s}} init_term_dyn.o%s" #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend.o%s crtn.o%s" @@ -366,38 +363,34 @@ { GCC_INCLUDE_DIR, "GCC", 0, 0 },\ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1}, \ { "/boot/common/include", 0, 0, 0 },\ - { "/boot/develop/headers/be/add-ons/graphics", 0, 0, 0 },\ - { "/boot/develop/headers/be/devel", 0, 0, 0 },\ - { "/boot/develop/headers/be/translation", 0, 0, 0 },\ - { "/boot/develop/headers/be/mail", 0, 0, 0 },\ - { "/boot/develop/headers/be/drivers", 0, 0, 0 },\ - { "/boot/develop/headers/be/opengl", 0, 0, 0 },\ - { "/boot/develop/headers/be/game", 0, 0, 0 },\ - { "/boot/develop/headers/be/support", 0, 0, 0 },\ - { "/boot/develop/headers/be/storage", 0, 0, 0 },\ - { "/boot/develop/headers/be/kernel", 0, 0, 0 },\ - { "/boot/develop/headers/be/net", 0, 0, 0 },\ - { "/boot/develop/headers/be/midi", 0, 0, 0 },\ - { "/boot/develop/headers/be/midi2", 0, 0, 0 },\ - { "/boot/develop/headers/be/media", 0, 0, 0 },\ - { "/boot/develop/headers/be/interface", 0, 0, 0 },\ - { "/boot/develop/headers/be/device", 0, 0, 0 },\ - { "/boot/develop/headers/be/app", 0, 0, 0 },\ - { "/boot/develop/headers/be/precompiled", 0, 0, 0 },\ - { "/boot/develop/headers/be/add-ons/input_server", 0, 0, 0 },\ - { "/boot/develop/headers/be/add-ons/net_server", 0, 0, 0 },\ - { "/boot/develop/headers/be/add-ons/screen_saver", 0, 0, 0 },\ - { "/boot/develop/headers/be/add-ons/tracker", 0, 0, 0 },\ - { "/boot/develop/headers/be/be_apps/Deskbar", 0, 0, 0 },\ - { "/boot/develop/headers/be/be_apps/NetPositive", 0, 0, 0 },\ - { "/boot/develop/headers/be/be_apps/Tracker", 0, 0, 0 },\ - { "/boot/develop/headers/be/drivers/tty", 0, 0, 0 },\ - { "/boot/develop/headers/be/net/netinet", 0, 0, 0 },\ - { "/boot/develop/headers/be/storage", 0, 0, 0 },\ - { "/boot/develop/headers/be", 0, 0, 0 },\ + { "/boot/develop/headers/os", 0, 0, 0 },\ + { "/boot/develop/headers/os/app", 0, 0, 0 },\ + { "/boot/develop/headers/os/device", 0, 0, 0 },\ + { "/boot/develop/headers/os/drivers", 0, 0, 0 },\ + { "/boot/develop/headers/os/game", 0, 0, 0 },\ + { "/boot/develop/headers/os/interface", 0, 0, 0 },\ + { "/boot/develop/headers/os/kernel", 0, 0, 0 },\ + { "/boot/develop/headers/os/locale", 0, 0, 0 },\ + { "/boot/develop/headers/os/mail", 0, 0, 0 },\ + { "/boot/develop/headers/os/media", 0, 0, 0 },\ + { "/boot/develop/headers/os/midi", 0, 0, 0 },\ + { "/boot/develop/headers/os/midi2", 0, 0, 0 },\ + { "/boot/develop/headers/os/net", 0, 0, 0 },\ + { "/boot/develop/headers/os/opengl", 0, 0, 0 },\ + { "/boot/develop/headers/os/storage", 0, 0, 0 },\ + { "/boot/develop/headers/os/support", 0, 0, 0 },\ + { "/boot/develop/headers/os/translation", 0, 0, 0 },\ + { "/boot/develop/headers/os/add-ons/graphics", 0, 0, 0 },\ + { "/boot/develop/headers/os/add-ons/input_server", 0, 0, 0 },\ + { "/boot/develop/headers/os/add-ons/screen_saver", 0, 0, 0 },\ + { "/boot/develop/headers/os/add-ons/tracker", 0, 0, 0 },\ + { "/boot/develop/headers/os/be_apps/Deskbar", 0, 0, 0 },\ + { "/boot/develop/headers/os/be_apps/NetPositive", 0, 0, 0 },\ + { "/boot/develop/headers/os/be_apps/Tracker", 0, 0, 0 },\ + { "/boot/develop/headers/cpp", 0, 0, 0 },\ { "/boot/develop/headers/3rdparty", 0, 0, 0 },\ { "/boot/develop/headers/bsd", 0, 0, 0 },\ - { "/boot/develop/headers/cpp", 0, 0, 0 },\ + { "/boot/develop/headers/glibc", 0, 0, 0 },\ { "/boot/develop/headers/posix", 0, 0, 0 },\ { "/boot/develop/headers", 0, 0, 0 }, \ { 0, 0, 0, 0 } \ @@ -409,38 +402,34 @@ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\ { GCC_INCLUDE_DIR, "GCC", 0, 0 },\ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1}, \ - { CROSS_INCLUDE_DIR "/be/add-ons/graphics", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/devel", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/translation", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/mail", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/drivers", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/opengl", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/game", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/support", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/storage", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/kernel", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/net", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/midi", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/midi2", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/media", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/interface", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/device", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/app", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/precompiled", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/add-ons/input_server", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/add-ons/net_server", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/add-ons/screen_saver", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/add-ons/tracker", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/be_apps/Deskbar", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/be_apps/NetPositive", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/be_apps/Tracker", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/drivers/tty", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/net/netinet", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be/storage", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/be", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/app", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/device", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/drivers", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/game", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/interface", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/kernel", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/locale", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/mail", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/media", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/midi", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/midi2", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/net", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/opengl", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/storage", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/support", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/translation", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/add-ons/graphics", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/add-ons/input_server", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/add-ons/screen_saver", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/add-ons/tracker", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/be_apps/Deskbar", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/be_apps/NetPositive", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/os/be_apps/Tracker", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/cpp", 0, 0, 0 },\ { CROSS_INCLUDE_DIR "/3rdparty", 0, 0, 0 },\ { CROSS_INCLUDE_DIR "/bsd", 0, 0, 0 },\ - { CROSS_INCLUDE_DIR "/cpp", 0, 0, 0 },\ + { CROSS_INCLUDE_DIR "/glibc", 0, 0, 0 },\ { CROSS_INCLUDE_DIR "/posix", 0, 0, 0 },\ { CROSS_INCLUDE_DIR , 0, 0, 0 }, \ { 0, 0, 0, 0 } \ -- gitore 0.2.2