git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
H.J. Lu 2010-03-28 16:40:50 +00:00 committed by H.J. Lu
parent 7a1e445fd2
commit f48aa01a62
2 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fixincludes/ChangeLog
View File

@ -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> 2010-03-24 Joseph Myers <joseph@codesourcery.com>
* inclhack.def (glibc_strncpy): New fix. * inclhack.def (glibc_strncpy): New fix.

47
fixincludes/mkfixinc.sh
View File

@ -15,6 +15,8 @@ case $machine in
i?86-moss-msdos* | \ i?86-moss-msdos* | \
i?86-*-pe | \ i?86-*-pe | \
i?86-*-cygwin* | \ i?86-*-cygwin* | \
i?86-*-mingw32* | \
x86_64-*-mingw32* | \
i?86-*-interix* | \ i?86-*-interix* | \
*-*-vxworks* | \ *-*-vxworks* | \
powerpc-*-eabisim* | \ powerpc-*-eabisim* | \
@ -27,51 +29,6 @@ case $machine in
(echo "#! /bin/sh" ; echo "exit 0" ) > ${target} (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 cat < ${srcdir}/fixinc.in > ${target} || exit 1
;; ;;