* added workaround to gcc4 configuration that makes the comparison

of stage2 and stage3 compilers work on haiku (using objdump instead of cmp, as suggested by Michael) git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@32475 a95241bf-73f2-0310-859d-f6bbb57e9c96
[ARM] [GSoC] François Revol + Johannes Wischert:
2026-02-05 00:13:15 +01:00 · 2009-08-17 18:20:12 +00:00 · 2009-08-11 02:07:15 +00:00 · 2009-07-07 10:30:09 +00:00 · 2009-06-29 09:08:34 +00:00
14 changed files with 174 additions and 186 deletions
--- a/gcc/config/acx.m4
+++ b/gcc/config/acx.m4
@@ -401,24 +401,30 @@ dnl for the parameter format "cmp file1 file2 skip1 skip2" which is
 dnl accepted by cmp on some systems.
 AC_DEFUN([ACX_PROG_CMP_IGNORE_INITIAL],
 [AC_CACHE_CHECK([how to compare bootstrapped objects], gcc_cv_prog_cmp_skip,
-[ echo abfoo >t1
-  echo cdfoo >t2
-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
-  if cmp t1 t2 2 2 > /dev/null 2>&1; then
-    if cmp t1 t2 1 1 > /dev/null 2>&1; then
-      :
-    else
-      gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
+[# comparing object files via cmp doesn't work on haiku (files will seemingly
+  # always differ), so we disassemble both files and compare the results:
+  if uname -o | grep -iq haiku; then
+    gcc_cv_prog_cmp_skip='objdump -Dz $$f1 | tail +6 >tmp-foo1; objdump -Dz $$f2 | tail +6 >tmp-foo2; cmp tmp-foo1 tmp-foo2'
+  else 
+    gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+    echo abfoo >t1
+    echo cdfoo >t2
+    if cmp t1 t2 2 2 > /dev/null 2>&1; then
+      if cmp t1 t2 1 1 > /dev/null 2>&1; then
+        :
+      else
+        gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
+      fi
    fi
-  fi
-  if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
-    if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
-      :
-    else
-      gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
+    if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
+      if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
+        :
+      else
+        gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
+      fi
    fi
+    rm t1 t2
  fi
-  rm t1 t2
 ])
 do_compare="$gcc_cv_prog_cmp_skip"
 AC_SUBST(do_compare)
--- a/gcc/configure
+++ b/gcc/configure
@@ -4350,25 +4350,30 @@ echo $ECHO_N "checking how to compare bootstrapped objects... $ECHO_C" >&6
 if test "${gcc_cv_prog_cmp_skip+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-   echo abfoo >t1
-  echo cdfoo >t2
-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
-  if cmp t1 t2 2 2 > /dev/null 2>&1; then
-    if cmp t1 t2 1 1 > /dev/null 2>&1; then
-      :
-    else
-      gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
+  # comparing object files via cmp doesn't work on haiku (files will seemingly
+  # always differ), so we disassemble both files and compare the results:
+  if uname -o | grep -iq haiku; then
+    gcc_cv_prog_cmp_skip='objdump -Dz $$f1 | tail +6 >tmp-foo1; objdump -Dz $$f2 | tail +6 >tmp-foo2; cmp tmp-foo1 tmp-foo2'
+  else 
+    gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
+    echo abfoo >t1
+    echo cdfoo >t2
+    if cmp t1 t2 2 2 > /dev/null 2>&1; then
+      if cmp t1 t2 1 1 > /dev/null 2>&1; then
+        :
+      else
+        gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
+      fi
    fi
-  fi
-  if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
-    if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
-      :
-    else
-      gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
+    if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
+      if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
+        :
+      else
+        gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
+      fi
    fi
+    rm t1 t2
  fi
-  rm t1 t2
-
 fi
 echo "$as_me:$LINENO: result: $gcc_cv_prog_cmp_skip" >&5
 echo "${ECHO_T}$gcc_cv_prog_cmp_skip" >&6
--- a/gcc/gcc/config.gcc
+++ b/gcc/gcc/config.gcc
@@ -734,8 +734,14 @@ arm*-*-netbsd*)
 	use_collect2=yes
 	;;
 arm*-*-haiku*)
-	tmake_file="${tmake_file} t-haiku arm/t-arm arm/t-arm-elf"
-	tm_file="dbxelf.h elfos.h haiku.h arm/elf.h arm/aout.h arm/haiku.h arm/arm.h"
+	tmake_file="${tmake_file} t-haiku arm/t-arm arm/t-arm-elf arm/t-bpabi arm/t-haiku"
+	tm_file="dbxelf.h elfos.h haiku.h arm/elf.h arm/bpabi.h arm/haiku.h"
+	# The BPABI long long divmod functions return a 128-bit value in
+	# registers r0-r3.  Correctly modeling that requires the use of
+	# TImode.
+	need_64bit_hwint=yes
+	default_use_cxa_atexit=yes
+	tm_file="${tm_file} arm/aout.h arm/arm.h"
 	;;
 arm*-*-linux*)			# ARM GNU/Linux with ELF
 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
--- 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)
@@ -29,30 +29,25 @@
 #undef  TARGET_DEFAULT_FLOAT_ABI
 #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT

-#undef  TARGET_DEFAULT
-#define TARGET_DEFAULT (0)
+/* bpabi.h sets FPUTYPE_DEFAULT to VFP */
+/* bpabi.h sets ARM_DEFAULT_ABI */

 #undef  MULTILIB_DEFAULTS
 #define MULTILIB_DEFAULTS \
  { "marm", "mlittle-endian", "msoft-float", "mno-thumb-interwork" }

+/* Default is set by bpabi.h */
+/*
+#undef TARGET_DEFAULT
+*/
+
 #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
+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6

 /* Now we define the strings used to build the spec file.  */
+/* interestingly, bpabi defines __GXX_TYPEINFO_EQUALITY_INLINE=0 too as we do. */

+#undef TARGET_OS_CPP_BUILTINS
 #define TARGET_OS_CPP_BUILTINS()		\
  do									\
    {									\
@@ -67,11 +62,18 @@
         type_infos are not merged, so that they get compared by name \
         instead of by pointer. */ \
      builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \
-      builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0");\
+      /*builtin_define ("__GXX_TYPEINFO_EQUALITY_INLINE=0"); done in bpabi: */\
+      TARGET_BPABI_CPP_BUILTINS();					\
    }									\
  while (0)

+/* Use the default LIBGCC_SPEC, not the empty version in haiku.h, as we
+   do not use multilib (needed ??).  */
+#undef LIBGCC_SPEC
+
 /* If ELF is the default format, we should not use /lib/elf.  */

 #undef	LINK_SPEC
-#define LINK_SPEC "%{!o*:-o %b} -m armelf -shared -no-undefined -Bsymbolic %{nostart:-e 0}"
+#define LINK_SPEC "%{!o*:-o %b} -m armelf -shared -no-undefined -Bsymbolic %{nostart:-e 0} \
+  %{mbig-endian:-EB} %{mlittle-endian:-EL} -X" 
+
--- a/gcc/gcc/config/arm/t-haiku
+++ b/gcc/gcc/config/arm/t-haiku
@@ -0,0 +1,21 @@
+# build multilib for soft float and VFP 
+# (unsure about how it should be done...)
+# mix from t-symbian & t-wince-pe
+
+#LIB1ASMSRC = arm/lib1funcs.asm
+#LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _call_via_rX _interwork_call_via_rX
+
+
+#MULTILIB_OPTIONS    += mhard-float
+#MULTILIB_DIRNAMES   += fpu
+
+MULTILIB_OPTIONS    += msoft-float
+MULTILIB_DIRNAMES   += fpu soft
+MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
+
+MULTILIB_OPTIONS    += mfloat-abi=softfp
+MULTILIB_DIRNAMES   += softfp
+
+#LIBGCC = stmp-multilib
+#INSTALL_LIBGCC = install-multilib
+#TARGET_LIBGCC2_CFLAGS = 
--- a/gcc/gcc/config/haiku.h
+++ b/gcc/gcc/config/haiku.h
@@ -28,41 +28,45 @@ Boston, MA 02111-1307, USA.  */
 #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 @@ Boston, MA 02111-1307, USA.  */
    { 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 @@ Boston, MA 02111-1307, USA.  */
    { "/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 @@ Boston, MA 02111-1307, USA.  */
    { "/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 @@ Boston, MA 02111-1307, USA.  */
    { 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 @@ Boston, MA 02111-1307, USA.  */
    { 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 } \
--- a/gcc/gcc/config/i386/haiku.h
+++ b/gcc/gcc/config/i386/haiku.h
@@ -31,18 +31,6 @@ Boston, MA 02111-1307, USA.  */
 #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									\
    {									\
--- a/gcc/gcc/config/m68k/haiku.h
+++ b/gcc/gcc/config/m68k/haiku.h
@@ -62,18 +62,6 @@ Boston, MA 02110-1301, USA.  */
 #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 @@ Boston, MA 02110-1301, USA.  */

 /* 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
--- a/gcc/gcc/config/mips/haiku.h
+++ b/gcc/gcc/config/mips/haiku.h
@@ -23,18 +23,6 @@ Boston, MA 02111-1307, USA.  */
 #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									\
    {									\
--- a/gcc/gcc/config/rs6000/haiku.h
+++ b/gcc/gcc/config/rs6000/haiku.h
@@ -23,18 +23,6 @@ Boston, MA 02111-1307, USA.  */
 #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 */
--- 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@
--- a/legacy/gcc/gcc/c-parse.y
+++ b/legacy/gcc/gcc/c-parse.y
@@ -1332,7 +1332,7 @@ enum_head:

 structsp:
 	  struct_head identifier '{'
-		{ $$ = start_struct (RECORD_TYPE, $2);
+		{ $<ttype>$ = start_struct (RECORD_TYPE, $2);
 		  /* Start scope of tag before parsing components.  */
 		}
 	  component_decl_list '}' maybe_attribute 
@@ -1344,7 +1344,7 @@ structsp:
 	| struct_head identifier
 		{ $$ = xref_tag (RECORD_TYPE, $2); }
 	| union_head identifier '{'
-		{ $$ = start_struct (UNION_TYPE, $2); }
+		{ $<ttype>$ = start_struct (UNION_TYPE, $2); }
 	  component_decl_list '}' maybe_attribute
 		{ $$ = finish_struct ($<ttype>4, $5, chainon ($1, $7)); }
 	| union_head '{' component_decl_list '}' maybe_attribute
@@ -1355,13 +1355,13 @@ structsp:
 		{ $$ = xref_tag (UNION_TYPE, $2); }
 	| enum_head identifier '{'
 		{ $<itype>3 = suspend_momentary ();
-		  $$ = start_enum ($2); }
+		  $<ttype>$ = start_enum ($2); }
 	  enumlist maybecomma_warn '}' maybe_attribute
 		{ $$= finish_enum ($<ttype>4, nreverse ($5), chainon ($1, $8));
 		  resume_momentary ($<itype>3); }
 	| enum_head '{'
 		{ $<itype>2 = suspend_momentary ();
-		  $$ = start_enum (NULL_TREE); }
+		  $<ttype>$ = start_enum (NULL_TREE); }
 	  enumlist maybecomma_warn '}' maybe_attribute
 		{ $$= finish_enum ($<ttype>3, nreverse ($4), chainon ($1, $7));
 		  resume_momentary ($<itype>2); }
--- a/legacy/gcc/gcc/config/i386/haiku.h
+++ b/legacy/gcc/gcc/config/i386/haiku.h
@@ -149,13 +149,10 @@ Boston, MA 02111-1307, USA.  */
 #define PTRDIFF_TYPE "long int"

 #undef WCHAR_TYPE
-#define WCHAR_TYPE "short unsigned int"
-
-#undef WCHAR_UNSIGNED
-#define WCHAR_UNSIGNED 1
+#define WCHAR_TYPE "int"

 #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 @@ Boston, MA 02111-1307, USA.  */
 #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 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
    { 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 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
    { 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 } \
--- a/legacy/gcc/gcc/version.c
+++ b/legacy/gcc/gcc/version.c
@@ -1 +1 @@
-char *version_string = "2.95.3-haiku-081024";
+char *version_string = "2.95.3-haiku-090629";
Author	SHA1	Message	Date
Oliver Tappe	a1532d3621	* added workaround to gcc4 configuration that makes the comparison of stage2 and stage3 compilers work on haiku (using objdump instead of cmp, as suggested by Michael) git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@32475 a95241bf-73f2-0310-859d-f6bbb57e9c96	2009-08-17 18:20:12 +00:00
François Revol	09a4a7d36c	[ARM] [GSoC] François Revol + Johannes Wischert: - add missing bits needed to use EABI by default (which should be == AAPCS == BPABI if I understood it right), - include t-bpabi and bpabi.h, - added an arm/t-haiku and arm/haiku.h to correct back some stuff after them as is done for linux, - add multilib variants for softfloat (for xscale) and softfp (AAPCS), - undo the LIBGCC_SPEC override for arm, it might have been the cause of multilib not working, not sure, - make armv6 default target. This allows building for both overo and verdex boards with some mods, though it emits calls to exception unwinding stuff that requires some more symbols (like abort), and should probably be fixed some other way. git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@32237 a95241bf-73f2-0310-859d-f6bbb57e9c96	2009-08-11 02:07:15 +00:00
Oliver Tappe	03890535ff	* 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	2009-07-07 10:30:09 +00:00
Oliver Tappe	566b075d92	* specify type for $$ in order to make newer bison versions happy, such that gcc2 can be compiled on haiku git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@31308 a95241bf-73f2-0310-859d-f6bbb57e9c96	2009-06-29 09:08:34 +00:00