- upgraded release date to 041111, for BeBits-release.

git-svn-id: file:///srv/svn/repos/haiku/trunk/buildtools@9917 a95241bf-73f2-0310-859d-f6bbb57e9c96

binutils/bfd/configure

@@ -919,7 +919,7 @@ fi
 
 PACKAGE=bfd
 
-VERSION=2.15-beos-041025
+VERSION=2.15-beos-041111
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

binutils/bfd/version.h

@@ -1,3 +1,3 @@
-#define BFD_VERSION_DATE 20040517
+#define BFD_VERSION_DATE 20041111
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING @bfd_version_string@

gcc/gcc/c-parse.y

@@ -193,6 +193,8 @@ char *language_string = "GNU C";
 %type <ttype> parmlist_or_identifiers parmlist_or_identifiers_1
 %type <ttype> identifiers_or_typenames
 
+%type <itype> extension
+
 %type <itype> setspecs
 
 %type <ends_in_label> lineno_stmt_or_label lineno_stmt_or_labels stmt_or_label
@@ -222,6 +224,15 @@ static tree declspec_stack;
 /* 1 if we explained undeclared var errors.  */
 static int undeclared_variable_notice;
 
+/* For __extension__, save/restore the warning flags which are
+   controlled by __extension__.  */
+#define SAVE_WARN_FLAGS() (pedantic | (warn_pointer_arith << 1))
+#define RESTORE_WARN_FLAGS(val) \
+  do {                                     \
+    pedantic = val & 1;                    \
+    warn_pointer_arith = (val >> 1) & 1;   \
+  } while (0)
+
 
 /* Tell yyparse how to print a token's value, if yydebug is set.  */
 
@@ -266,7 +277,7 @@ extdef:
 		  else
 		    error ("argument of `asm' is not a constant string"); }
 	| extension extdef
-		{ pedantic = $<itype>1; }
+		{ RESTORE_WARN_FLAGS ($1); }
 	;
 
 datadef:
@@ -403,7 +414,7 @@ unary_expr:
 	/* __extension__ turns off -pedantic for following primary.  */
 	| extension cast_expr	  %prec UNARY
 		{ $$ = $2;
-		  pedantic = $<itype>1; }
+                  RESTORE_WARN_FLAGS ($1); }
 	| unop cast_expr  %prec UNARY
 		{ $$ = build_unary_op ($1, $2, 0);
 		  overflow_warning ($$); }
@@ -860,7 +871,7 @@ decl:
 	| declmods ';'
 		{ pedwarn ("empty declaration"); }
 	| extension decl
-		{ pedantic = $<itype>1; }
+                { RESTORE_WARN_FLAGS ($1); }
 	;
 
 /* Declspecs which contain at least one type specifier or typedef name.
@@ -1423,7 +1434,7 @@ component_decl:
 		{ $$ = NULL_TREE; }
 	| extension component_decl
 		{ $$ = $2;
-		  pedantic = $<itype>1; }
+                  RESTORE_WARN_FLAGS ($1); }
 	;
 
 components:
@@ -2231,8 +2242,9 @@ identifiers_or_typenames:
 
 extension:
 	EXTENSION
-		{ $<itype>$ = pedantic;
-		  pedantic = 0; }
+                { $$ = SAVE_WARN_FLAGS();
+                  pedantic = 0;
+                  warn_pointer_arith = 0; }
 	;
 
 %%

gcc/gcc/version.c

@@ -1 +1 @@
-char *version_string = "2.95.3-beos-041025";
+char *version_string = "2.95.3-beos-041111";

gcc/libio/iostream.cc

@@ -102,6 +102,24 @@ int istream::peek()
   return ch;
 }
 
+// [zooey]: added for R5-compatibility with bdb
+istream& istream::read(char *ptr, int n)
+{
+  return read((char*)ptr, (streamsize)n);
+}
+istream& istream::read(unsigned char *ptr, int n)
+{
+  return read((char*)ptr, (streamsize)n);
+}
+istream& istream::read(signed char *ptr, int n)
+{
+  return read((char*)ptr, (streamsize)n);
+}
+istream& istream::read(void *ptr, int n)
+{
+  return read((char*)ptr, (streamsize)n);
+}
+
 istream& istream::ignore(int n /* = 1 */, int delim /* = EOF */)
 {
     _gcount = 0;
@@ -1022,6 +1040,24 @@ ostream& ostream::write(const char *s, streamsize n)
     return *this;
 }
 
+// [zooey]: added for R5-compatibility
+ostream& ostream::write(const char *s, int n)
+{
+  return write((const char*)s, (streamsize)n);
+}
+ostream& ostream::write(const unsigned char *s, int n)
+{
+  return write((const char*)s, (streamsize)n);
+}
+ostream& ostream::write(const signed char *s, int n)
+{
+  return write((const char*)s, (streamsize)n);
+}
+ostream& ostream::write(const void *s, int n)
+{ 
+  return write((const char*)s, (streamsize)n);
+}
+
 void ostream::do_osfx()
 {
     if (flags() & ios::unitbuf)

gcc/libio/iostream.h

@@ -69,15 +69,12 @@ class ostream : virtual public ios
     ostream& write(const void *s, streamsize n)
       { return write((const char*)s, n);}
 #ifdef _STREAM_COMPAT
-    // [zooey]: added for R5-compatibility
-    ostream& write(const char *s, int n)
-      { return write((const char*)s, (streamsize)n);}
-    ostream& write(const unsigned char *s, int n)
-      { return write((const char*)s, (streamsize)n);}
-    ostream& write(const signed char *s, int n)
-      { return write((const char*)s, (streamsize)n);}
-    ostream& write(const void *s, int n)
-      { return write((const char*)s, (streamsize)n);}
+    // [zooey]: added for R5-compatibility with bdb,
+    // these can't be inlined as they wouldn't end up in the lib then.
+    ostream& write(const char *s, int n);
+    ostream& write(const unsigned char *s, int n);
+    ostream& write(const signed char *s, int n);
+    ostream& write(const void *s, int n);
 #endif
     ostream& seekp(streampos);
     ostream& seekp(streamoff, _seek_dir);
@@ -153,15 +150,12 @@ protected:
     istream& read(void *ptr, streamsize n)
       { return read((char*)ptr, n); }
 #ifdef _STREAM_COMPAT
-    // [zooey]: added for R5-compatibility
-    istream& read(char *ptr, int n)
-      { return read((char*)ptr, (streamsize)n); }
-    istream& read(unsigned char *ptr, int n)
-      { return read((char*)ptr, (streamsize)n); }
-    istream& read(signed char *ptr, int n)
-      { return read((char*)ptr, (streamsize)n); }
-    istream& read(void *ptr, int n)
-      { return read((char*)ptr, (streamsize)n); }
+    // [zooey]: added for R5-compatibility with bdb,
+    // these can't be inlined as they wouldn't end up in the lib then.
+    istream& read(char *ptr, int n);
+    istream& read(unsigned char *ptr, int n);
+    istream& read(signed char *ptr, int n);
+    istream& read(void *ptr, int n);
 #endif
     istream& get(streambuf& sb, char delim = '\n');
     istream& gets(char **s, char delim = '\n');

gcc_distribution/prepare_distribution.sh

@@ -1,6 +1,7 @@
 # this script prepares the /boot/develop/tools/gnupro-folder for distribution
 #
 GCC_VER=`gcc --version`
+FULL_VER=gcc-2.95.3_binutils-2.15
 # strip executables
 strip --strip-unneeded /boot/develop/tools/gnupro/bin/*
 strip --strip-unneeded /boot/develop/tools/gnupro/i586-pc-beos/bin/*
@@ -21,9 +22,24 @@ mv /boot/develop/tools/gnupro/lib/gcc-lib/i586-pc-beos/$GCC_VER/specs /boot/deve
 ln -sf /boot/develop/tools/gnupro/lib/gcc-lib/i586-pc-beos/$GCC_VER/specs.Default /boot/develop/tools/gnupro/lib/gcc-lib/i586-pc-beos/$GCC_VER/specs
 cp -a ../gcc/COPYING* /boot/develop/tools/gnupro/
 # install readline lib, headers and html-docs
-#strip --strip-unneeded ../../readline-5.0/lib*.a
-#cp -a ../../readline-5.0/lib*.a /boot/develop/tools/gnupro/lib/
+#strip --strip-unneeded ~/Sources/ports/readline-5.0/lib*.a
+#cp -a ~/Sources/ports/readline-5.0/lib*.a /boot/develop/tools/gnupro/lib/
 #cp -a /boot/home/config/include/readline /boot/develop/tools/gnupro/include/
-#cp -a ../../readline-5.0/doc/readline.html /boot/develop/tools/gnupro/html-docs/
+#cp -a ~/Sources/ports/readline-5.0/doc/readline.html /boot/develop/tools/gnupro/html-docs/
 # identify all files
 mimeset /boot/develop/tools/gnupro/
+# add sdk-subfolder and create the required links:
+rm -rf /boot/develop/tools/sdk_$FULL_VER
+mkdir -p /boot/develop/tools/sdk_$FULL_VER
+cat >/boot/develop/tools/sdk_$FULL_VER/Readme <<EOF
+This folder exists to integrate gcc into the Dano/Zeta layout of the
+development-tools. If you want to activate $GCC_VER, just make a link from 
+/etc/develop/zeta-r1-gcc2-x86/tools/sdk to this folder.
+EOF
+mkdir -p /boot/develop/tools/sdk_$FULL_VER/release/H-i586-pc-beos5/T-i586-pc-beos5/i586-pc-beos5
+pushd /boot/develop/tools/sdk_$FULL_VER/release/H-i586-pc-beos5/T-i586-pc-beos5/i586-pc-beos5
+ln -sf ../../../../../$FULL_VER/i586-pc-beos/lib lib
+cd ..
+ln -sf ../../../../$FULL_VER/bin bin
+ln -sf ../../../../$FULL_VER/lib lib
+popd