| 1 |
eulisse |
1.1 |
diff -Naur rh73_gcc32/share/gccxml-0.6/GCC/3.2/pthread.h rh73_gcc32_patch1/share/gccxml-0.6/GCC/3.2/pthread.h
|
| 2 |
|
|
--- rh73_gcc32/share/gccxml-0.6/GCC/3.2/pthread.h Thu Jan 1 01:00:00 1970
|
| 3 |
|
|
+++ rh73_gcc32_patch1/share/gccxml-0.6/GCC/3.2/pthread.h Thu Apr 22 18:34:13 2004
|
| 4 |
|
|
@@ -0,0 +1,18 @@
|
| 5 |
|
|
+#ifndef GCCXML_PTHREAD_H
|
| 6 |
|
|
+#define GCCXML_PTHREAD_H
|
| 7 |
|
|
+
|
| 8 |
|
|
+/* Some pthread.h files use __thread, which is a keyword for GCC 3.3.
|
| 9 |
|
|
+ Change the name for the duration of including pthread.h. */
|
| 10 |
|
|
+#ifndef __thread
|
| 11 |
|
|
+# define __thread gccxml__thread
|
| 12 |
|
|
+# define gccxml__thread gccxml__thread
|
| 13 |
|
|
+#endif
|
| 14 |
|
|
+#include_next <pthread.h>
|
| 15 |
|
|
+#ifdef gccxml__thread
|
| 16 |
|
|
+# undef gccxml__thread
|
| 17 |
|
|
+# undef __thread
|
| 18 |
|
|
+#endif
|
| 19 |
|
|
+
|
| 20 |
|
|
+#endif
|
| 21 |
|
|
+
|
| 22 |
|
|
+
|
| 23 |
|
|
diff -Naur rh73_gcc32/share/gccxml-0.6/GCC/find_flags rh73_gcc32_patch1/share/gccxml-0.6/GCC/find_flags
|
| 24 |
|
|
--- rh73_gcc32/share/gccxml-0.6/GCC/find_flags Mon Feb 9 21:01:53 2004
|
| 25 |
|
|
+++ rh73_gcc32_patch1/share/gccxml-0.6/GCC/find_flags Thu Apr 22 19:00:40 2004
|
| 26 |
|
|
@@ -64,12 +64,21 @@
|
| 27 |
|
|
if [ "$MAJOR_VERSION" -lt 3 ]; then
|
| 28 |
|
|
INCLUDES="-iwrapper$SELFPATH/2.95 $INCLUDES"
|
| 29 |
|
|
if [ "$MINOR_VERSION" = 96 ]; then
|
| 30 |
|
|
- INCLUDES="-iwrapper$SELFPATH/2.96 $INCLUDES"
|
| 31 |
|
|
+ INCLUDES="-iwrapper$SELFPATH/2.96 $INCLUDES"
|
| 32 |
|
|
fi
|
| 33 |
|
|
elif [ "$MAJOR_VERSION" = 3 -a "$MINOR_VERSION" -ge 3 ]; then
|
| 34 |
|
|
+ INCLUDES="-iwrapper$SELFPATH/3.3 $INCLUDES"
|
| 35 |
|
|
SPECIAL="-include $SELFPATH/3.3/gccxml_builtins.h"
|
| 36 |
|
|
+elif [ "$MAJOR_VERSION" = 3 -a "$MINOR_VERSION" = 2 ]; then
|
| 37 |
|
|
+ INCLUDES="-iwrapper$SELFPATH/3.2 $INCLUDES"
|
| 38 |
|
|
+elif [ "$MAJOR_VERSION" = 3 -a "$MINOR_VERSION" = 1 ]; then
|
| 39 |
|
|
+ INCLUDES="-iwrapper$SELFPATH/3.1 $INCLUDES"
|
| 40 |
|
|
+elif [ "$MAJOR_VERSION" = 3 -a "$MINOR_VERSION" = 0 ]; then
|
| 41 |
|
|
+ INCLUDES="-iwrapper$SELFPATH/3.0 $INCLUDES"
|
| 42 |
|
|
fi
|
| 43 |
|
|
|
| 44 |
|
|
# Format and print out the options.
|
| 45 |
|
|
-OPTIONS="$MACROS -D__declspec(x)= -D__attribute__(x)= $INCLUDES $SPECIAL"
|
| 46 |
|
|
+OPTIONS="$MACROS -D__declspec(x)=__attribute__((x)) $INCLUDES $SPECIAL"
|
| 47 |
|
|
echo $OPTIONS
|
| 48 |
|
|
+
|
| 49 |
|
|
+
|
