555474f2da
This patch updates the AVR32 arch patches for strace 4.5.18 and refreshes all the other patches so they apply clean. Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
140 lines
3.7 KiB
Plaintext
140 lines
3.7 KiB
Plaintext
--- a/config.h.in
|
|
+++ b/config.h.in
|
|
@@ -146,6 +146,9 @@
|
|
/* Define if stat64 is available in asm/stat.h. */
|
|
#undef HAVE_STAT64
|
|
|
|
+/* Define if statfs64 is available in sys/statfs.h or sys/vfs.h. */
|
|
+#undef HAVE_STATFS64
|
|
+
|
|
/* Define to 1 if stdbool.h conforms to C99. */
|
|
#undef HAVE_STDBOOL_H
|
|
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -2531,6 +2531,14 @@ cat >>confdefs.h <<\_ACEOF
|
|
_ACEOF
|
|
|
|
;;
|
|
+avr32*)
|
|
+ arch=avr32
|
|
+
|
|
+cat >>confdefs.h <<\_ACEOF
|
|
+#define AVR32 1
|
|
+_ACEOF
|
|
+
|
|
+ ;;
|
|
*)
|
|
{ echo "$as_me:$LINENO: result: NO!" >&5
|
|
echo "${ECHO_T}NO!" >&6; }
|
|
@@ -5994,6 +6002,70 @@ _ACEOF
|
|
|
|
fi
|
|
|
|
+{ echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
|
|
+echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6; }
|
|
+if test "${ac_cv_type_statfs64+set}" = set; then
|
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
+else
|
|
+ cat >conftest.$ac_ext <<_ACEOF
|
|
+/* confdefs.h. */
|
|
+_ACEOF
|
|
+cat confdefs.h >>conftest.$ac_ext
|
|
+cat >>conftest.$ac_ext <<_ACEOF
|
|
+/* end confdefs.h. */
|
|
+#ifdef LINUX
|
|
+#include <linux/types.h>
|
|
+#include <sys/statfs.h>
|
|
+#else
|
|
+#include <sys/vfs.h>
|
|
+#endif
|
|
+int
|
|
+main ()
|
|
+{
|
|
+struct statfs64 st;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+rm -f conftest.$ac_objext
|
|
+if { (ac_try="$ac_compile"
|
|
+case "(($ac_try" in
|
|
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
|
+ *) ac_try_echo=$ac_try;;
|
|
+esac
|
|
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|
+ (eval "$ac_compile") 2>conftest.er1
|
|
+ ac_status=$?
|
|
+ grep -v '^ *+' conftest.er1 >conftest.err
|
|
+ rm -f conftest.er1
|
|
+ cat conftest.err >&5
|
|
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
+ (exit $ac_status); } && {
|
|
+ test -z "$ac_c_werror_flag" ||
|
|
+ test ! -s conftest.err
|
|
+ } && test -s conftest.$ac_objext; then
|
|
+ ac_cv_type_statfs64=yes
|
|
+else
|
|
+ echo "$as_me: failed program was:" >&5
|
|
+sed 's/^/| /' conftest.$ac_ext >&5
|
|
+
|
|
+ ac_cv_type_statfs64=no
|
|
+fi
|
|
+
|
|
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
+fi
|
|
+
|
|
+{ echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
|
|
+echo "${ECHO_T}$ac_cv_type_statfs64" >&6; }
|
|
+if test "$ac_cv_type_statfs64" = yes
|
|
+then
|
|
+
|
|
+cat >>confdefs.h <<\_ACEOF
|
|
+#define HAVE_STATFS64 1
|
|
+_ACEOF
|
|
+
|
|
+fi
|
|
+
|
|
|
|
{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
|
|
echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
|
|
@@ -10377,22 +10449,21 @@ echo "$as_me: $ac_file is unchanged" >&6
|
|
fi
|
|
rm -f "$tmp/out12"
|
|
# Compute $ac_file's index in $config_headers.
|
|
-_am_arg=$ac_file
|
|
_am_stamp_count=1
|
|
for _am_header in $config_headers :; do
|
|
case $_am_header in
|
|
- $_am_arg | $_am_arg:* )
|
|
+ $ac_file | $ac_file:* )
|
|
break ;;
|
|
* )
|
|
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
|
|
esac
|
|
done
|
|
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
|
|
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
- X"$_am_arg" : 'X\(//\)[^/]' \| \
|
|
- X"$_am_arg" : 'X\(//\)$' \| \
|
|
- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
|
|
-echo X"$_am_arg" |
|
|
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
|
|
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
+ X$ac_file : 'X\(//\)[^/]' \| \
|
|
+ X$ac_file : 'X\(//\)$' \| \
|
|
+ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
|
|
+echo X$ac_file |
|
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
s//\1/
|
|
q
|
|
@@ -10429,7 +10500,7 @@ echo "$as_me: executing $ac_file command
|
|
# each Makefile.in and add a new line on top of each file to say so.
|
|
# Grep'ing the whole file is not good either: AIX grep has a line
|
|
# limit of 2048, but all sed's we know have understand at least 4000.
|
|
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
|
|
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
|
|
dirpart=`$as_dirname -- "$mf" ||
|
|
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
X"$mf" : 'X\(//\)[^/]' \| \
|