From f48aa01a62442f2307c42473c782c7c0a9c99190 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Sun, 28 Mar 2010 16:40:50 +0000
Subject: [PATCH] re PR target/40722 (ia32intrin.h defines of _rotl, _rotr
conflict with target stdlib.h decls)
2010-03-28 H.J. Lu <hongjiu.lu@intel.com>
PR target/40722
* mkfixinc.sh: Revert the last change for mingw.
From-SVN: r157784
---
fixincludes/ChangeLog | 5 +++++
fixincludes/mkfixinc.sh | 47 ++---------------------------------------
2 files changed, 7 insertions(+), 45 deletions(-)
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index d53ca27f9bf3..edcca8af2772 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-28 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR target/40722
+ * mkfixinc.sh: Revert the last change for mingw.
+
2010-03-24 Joseph Myers <joseph@codesourcery.com>
* inclhack.def (glibc_strncpy): New fix.
diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh
index c353d89be50c..b45f1795dcc1 100755
--- a/fixincludes/mkfixinc.sh
+++ b/fixincludes/mkfixinc.sh
@@ -15,6 +15,8 @@ case $machine in
i?86-moss-msdos* | \
i?86-*-pe | \
i?86-*-cygwin* | \
+ i?86-*-mingw32* | \
+ x86_64-*-mingw32* | \
i?86-*-interix* | \
*-*-vxworks* | \
powerpc-*-eabisim* | \
@@ -27,51 +29,6 @@ case $machine in
(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
;;
- i?86-*-mingw32* | \
- x86_64-*-mingw32*)
- # We only want to fix stdlib.h in mingw.
- # FIXME: Is SED available on mingw?
- (cat > ${target} << EOF
-#! /bin/sh
-
-OUTPUT_DIR=\$1
-if [ "x\$OUTPUT_DIR" = "x" ]; then
- echo fixincludes: no output directory specified
- exit 1
-fi
-
-if [ ! -d \$OUTPUT_DIR ]; then
- echo fixincludes: output dir \"\$OUTPUT_DIR\" is an invalid directory
- exit 1
-fi
-
-INPUT_DIR=\$2
-if [ "x\$INPUT_DIR" = "x" ]; then
- echo fixincludes: no input directory specified
- exit 1
-fi
-
-if [ ! -d \$INPUT_DIR ]; then
- echo fixincludes: input dir \"\$INPUT_DIR\" is an invalid directory
- exit 1
-fi
-
-INPUT_STDLIB_H=\$INPUT_DIR/stdlib.h
-if [ ! -f \$INPUT_STDLIB_H ]; then
- echo fixincludes: \"stdlib.h\" is an invalid file
- exit 1
-fi
-
-OUTPUT_STDLIB_H=\$OUTPUT_DIR/stdlib.h
-sed -e "s/\(.*_rotl.*\)/#if __GNUC__ < 4 || (__GNUC__ == 4 \&\& __GNUC_MINOR__ < 5)\n\1/" \
- -e "s/\(.*_lrotr.*\)/\1\n#else\n\#include <x86intrin.h>\n#endif/" \
- \$INPUT_STDLIB_H > \$OUTPUT_STDLIB_H
-
-exit 0
-EOF
-)
- ;;
-
*)
cat < ${srcdir}/fixinc.in > ${target} || exit 1
;;
--
GitLab