[haiku-commits] BRANCH BuildtoolsPM-github.package-management [2d0a2c6] gcc/gcc/config legacy/gcc/gcc/config/i386 legacy/gcc/gcc
- From: BuildtoolsPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 12 Aug 2013 13:15:33 +0200 (CEST)
added 3 changesets to branch
'refs/remotes/BuildtoolsPM-github/package-management'
old head: 7a87db2a172a406b79540188a23e52491ad3b741
new head: 2d0a2c6404ffae1a46eb7e74daab08099b45af2c
overview: https://github.com/haiku/BuildtoolsPM/compare/7a87db2...2d0a2c6
----------------------------------------------------------------------------
b98135e: gcc 4: Fix the library search paths
Due to the use of STARTFILE_PREFIX_SPEC the path containing the
libraries gcc provides (libstdc++ and friends) was missing. So
revert to the previously used STANDARD_STARTFILE_PREFIX_{1,2},
MD_STARTFILE_PREFIX method.
e369b8e: gcc 2: Remove obsolete library and include search paths
Also clean up a few comments.
2d0a2c6: Bump legacy compiler version
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 15 insertions(+), 23 deletions(-)
gcc/gcc/config/haiku.h | 21 +++++++++++++--------
legacy/gcc/gcc/config/i386/haiku.h | 15 +--------------
legacy/gcc/gcc/version.c | 2 +-
############################################################################
Commit: b98135ed3af141eef903e08e7b4871bf940d217f
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Mon Aug 12 11:00:44 2013 UTC
gcc 4: Fix the library search paths
Due to the use of STARTFILE_PREFIX_SPEC the path containing the
libraries gcc provides (libstdc++ and friends) was missing. So
revert to the previously used STANDARD_STARTFILE_PREFIX_{1,2},
MD_STARTFILE_PREFIX method.
----------------------------------------------------------------------------
diff --git a/gcc/gcc/config/haiku.h b/gcc/gcc/config/haiku.h
index e8a98de..8265616 100644
--- a/gcc/gcc/config/haiku.h
+++ b/gcc/gcc/config/haiku.h
@@ -158,6 +158,7 @@ Boston, MA 02111-1307, USA. */
{ "/boot/system/develop/headers/os/be_apps/NetPositive", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/os/be_apps/Tracker", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/3rdparty", 0, 0, 0, 1, 0 }, \
+ /* TODO: To be removed when libtiff has been outsourced. */\
{ "/boot/system/develop/headers/bsd", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/glibc", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/gnu", 0, 0, 1, 1, 0 }, \
@@ -174,18 +175,22 @@ Boston, MA 02111-1307, USA. */
/* With STANDARD_STARTFILE_PREFIX_{1,2} set to "/boot/common/develop/lib/"
and "/boot/system/develop/lib/", MD_STARTFILE_PREFIX adds the last one of
the
standard paths. The user specific paths are set via LIBRARY_PATH_ENV. */
+#undef STANDARD_STARTFILE_PREFIX_1
+#undef STANDARD_STARTFILE_PREFIX_2
+#undef MD_STARTFILE_PREFIX
#undef STARTFILE_PREFIX_SPEC
#ifdef HYBRID_SECONDARY
/* For a secondary compiler on a hybrid system, use alternative search paths.*/
-#define STARTFILE_PREFIX_SPEC \
- "/boot/common/non-packaged/develop/lib/" HYBRID_SECONDARY "/" \
- " /boot/common/develop/lib/" HYBRID_SECONDARY "/" \
- " /boot/system/develop/lib/" HYBRID_SECONDARY "/"
+#define STANDARD_STARTFILE_PREFIX_1 \
+ "/boot/common/develop/lib/" HYBRID_SECONDARY "/"
+#define STANDARD_STARTFILE_PREFIX_2 \
+ "/boot/system/develop/lib/" HYBRID_SECONDARY "/"
+#define MD_STARTFILE_PREFIX \
+ "/boot/common/non-packaged/develop/lib/" HYBRID_SECONDARY "/"
#else /* HYBRID_SECONDARY */
-#define STARTFILE_PREFIX_SPEC \
- "/boot/common/non-packaged/develop/lib/ \
- /boot/common/develop/lib/ \
- /boot/system/develop/lib/"
+#define STANDARD_STARTFILE_PREFIX_1 "/boot/common/develop/lib/"
+#define STANDARD_STARTFILE_PREFIX_2 "/boot/system/develop/lib/"
+#define MD_STARTFILE_PREFIX "/boot/common/non-packaged/develop/lib/"
#endif /* HYBRID_SECONDARY */
/* Haiku doesn't have a separate math library. */
############################################################################
Commit: e369b8e0bb9f1e91c96530f6dcf44ab2a0868790
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Mon Aug 12 11:06:01 2013 UTC
gcc 2: Remove obsolete library and include search paths
Also clean up a few comments.
----------------------------------------------------------------------------
diff --git a/legacy/gcc/gcc/config/i386/haiku.h
b/legacy/gcc/gcc/config/i386/haiku.h
index c12b3a5..33d5a95 100644
--- a/legacy/gcc/gcc/config/i386/haiku.h
+++ b/legacy/gcc/gcc/config/i386/haiku.h
@@ -362,11 +362,7 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
{ GCC_INCLUDE_DIR, "GCC", 0, 0 },\
{ "/boot/common/non-packaged/develop/headers", 0, 0, 0 },\
- { "/boot/common/non-packaged/include", 0, 0, 0 },\
- /* TODO: To be removed. */\
{ "/boot/common/develop/headers", 0, 0, 0 },\
- { "/boot/common/include", 0, 0, 0 },\
- /* TODO: To be removed. */\
{ "/boot/system/develop/headers/os", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/app", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/device", 0, 0, 1 },\
@@ -392,6 +388,7 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
{ "/boot/system/develop/headers/os/be_apps/NetPositive", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/be_apps/Tracker", 0, 0, 1 },\
{ "/boot/system/develop/headers/3rdparty", 0, 0, 0 },\
+ /* TODO: To be removed when libtiff has been outsourced. */\
{ "/boot/system/develop/headers/bsd", 0, 0, 0 },\
{ "/boot/system/develop/headers/glibc", 0, 0, 0 },\
{ "/boot/system/develop/headers/gnu", 0, 0, 0 },\
@@ -449,10 +446,6 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
#undef MD_STARTFILE_PREFIX
#define MD_STARTFILE_PREFIX "/boot/common/non-packaged/develop/lib/"
-/* TODO: To be removed. */
-#undef MD_STARTFILE_PREFIX_1
-#define MD_STARTFILE_PREFIX_1 "/boot/common/lib/"
-
/* Haiku doesn't have a separate math library. */
#define MATH_LIBRARY ""
@@ -476,8 +469,6 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
So we do just that, we replace MULTIPLE_SYMBOL_SPACES with a
test for optimization (see lex.c, line 4882ff and decl2.c, line 2701).
*/
-/* [bonefish]:
- Review! */
#undef MULTIPLE_SYMBOL_SPACES
@@ -492,14 +483,10 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
so the most likely ill effect of disabling this is that a BeOS gdb
debugging an executable with no debug info would not see the gcc2_compiled
label. */
-/* [bonefish]:
- Review! */
#undef ASM_IDENTIFY_GCC
#define ASM_IDENTIFY_GCC(FILE)
/* required to compile winnt.c */
-/* [bonefish]:
- Review! */
#define I386_PE_STRIP_ENCODING(SYM_NAME) \
((SYM_NAME) + ((SYM_NAME)[0] == '@' ? 3 : 0))
############################################################################
Commit: 2d0a2c6404ffae1a46eb7e74daab08099b45af2c
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Mon Aug 12 11:11:03 2013 UTC
Bump legacy compiler version
----------------------------------------------------------------------------
diff --git a/legacy/gcc/gcc/version.c b/legacy/gcc/gcc/version.c
index 5da8041..619d0bc 100644
--- a/legacy/gcc/gcc/version.c
+++ b/legacy/gcc/gcc/version.c
@@ -1 +1 @@
-char *version_string = "2.95.3-haiku-2013_07_15";
+char *version_string = "2.95.3-haiku-2013_08_12";
Other related posts:
- » [haiku-commits] BRANCH BuildtoolsPM-github.package-management [2d0a2c6] gcc/gcc/config legacy/gcc/gcc/config/i386 legacy/gcc/gcc - BuildtoolsPM-github . package-management
