mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-28 16:48:52 +00:00
29f03e3295
Define PICFLAG, UNDEFINEDPREAMBLE and UNDEFINEDCODE to nothing since Windows doesn't have -fPIC (GCC warns) and can't handle undefined variable references (which are not needed anyway). Signed-off-by: Ray Donnelly <mingw.android@gmail.com>
161 lines
4.5 KiB
Diff
161 lines
4.5 KiB
Diff
diff -urN gcc-5.3.0.orig/config/gcc-plugin.m4 gcc-5.3.0/config/gcc-plugin.m4
|
|
--- gcc-5.3.0.orig/config/gcc-plugin.m4 2015-12-19 14:39:04.120734900 +0000
|
|
+++ gcc-5.3.0/config/gcc-plugin.m4 2015-12-20 01:28:45.381965300 +0000
|
|
@@ -20,6 +20,9 @@
|
|
|
|
pluginlibs=
|
|
|
|
+ PICFLAG="-fPIC"
|
|
+ UNDEFINEDPREAMBLE="extern int X;"
|
|
+ UNDEFINEDCODE="return X == 0;"
|
|
case "${host}" in
|
|
*-*-darwin*)
|
|
if test x$build = x$host; then
|
|
@@ -30,6 +33,11 @@
|
|
export_sym_check=
|
|
fi
|
|
;;
|
|
+ *-*-mingw*|*-*-cygwin*|*-*-msys*)
|
|
+ PICFLAG=""
|
|
+ UNDEFINEDPREAMBLE=""
|
|
+ UNDEFINEDCODE=""
|
|
+ ;;
|
|
*)
|
|
if test x$build = x$host; then
|
|
export_sym_check="objdump${exeext} -T"
|
|
@@ -81,17 +89,17 @@
|
|
case "${host}" in
|
|
*-*-darwin*)
|
|
CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
|
|
- CFLAGS="$CFLAGS -fPIC"
|
|
+ CFLAGS="$CFLAGS ${PICFLAG}"
|
|
LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
|
|
;;
|
|
*)
|
|
- CFLAGS="$CFLAGS -fPIC"
|
|
- LDFLAGS="$LDFLAGS -fPIC -shared"
|
|
+ CFLAGS="$CFLAGS ${PICFLAG}"
|
|
+ LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
|
|
;;
|
|
esac
|
|
- AC_MSG_CHECKING([for -fPIC -shared])
|
|
+ AC_MSG_CHECKING([for ${PICFLAG} -shared])
|
|
AC_TRY_LINK(
|
|
- [extern int X;],[return X == 0;],
|
|
+ [${UNDEFINEDPREAMBLE}],[${UNDEFINEDCODE}],
|
|
[AC_MSG_RESULT([yes]); have_pic_shared=yes],
|
|
[AC_MSG_RESULT([no]); have_pic_shared=no])
|
|
if test x"$have_pic_shared" != x"yes" -o x"$ac_cv_search_dlopen" = x"no"; then
|
|
diff -urN gcc-5.3.0.orig/gcc/configure gcc-5.3.0/gcc/configure
|
|
--- gcc-5.3.0.orig/gcc/configure 2015-12-19 14:40:16.893975900 +0000
|
|
+++ gcc-5.3.0/gcc/configure 2015-12-20 01:28:45.472476700 +0000
|
|
@@ -28386,6 +28386,9 @@
|
|
|
|
pluginlibs=
|
|
|
|
+ PICFLAG="-fPIC"
|
|
+ UNDEFINEDPREAMBLE="extern int X;"
|
|
+ UNDEFINEDCODE="return X == 0;"
|
|
case "${host}" in
|
|
*-*-darwin*)
|
|
if test x$build = x$host; then
|
|
@@ -28396,6 +28399,11 @@
|
|
export_sym_check=
|
|
fi
|
|
;;
|
|
+ *-*-mingw*|*-*-cygwin*|*-*-msys*)
|
|
+ PICFLAG=""
|
|
+ UNDEFINEDPREAMBLE=""
|
|
+ UNDEFINEDCODE=""
|
|
+ ;;
|
|
*)
|
|
if test x$build = x$host; then
|
|
export_sym_check="objdump${exeext} -T"
|
|
@@ -28508,23 +28516,23 @@
|
|
case "${host}" in
|
|
*-*-darwin*)
|
|
CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
|
|
- CFLAGS="$CFLAGS -fPIC"
|
|
+ CFLAGS="$CFLAGS ${PICFLAG}"
|
|
LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
|
|
;;
|
|
*)
|
|
- CFLAGS="$CFLAGS -fPIC"
|
|
- LDFLAGS="$LDFLAGS -fPIC -shared"
|
|
+ CFLAGS="$CFLAGS ${PICFLAG}"
|
|
+ LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
|
|
;;
|
|
esac
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
|
|
-$as_echo_n "checking for -fPIC -shared... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
|
|
+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-extern int X;
|
|
+${UNDEFINEDPREAMBLE}
|
|
int
|
|
main ()
|
|
{
|
|
-return X == 0;
|
|
+${UNDEFINEDCODE}
|
|
;
|
|
return 0;
|
|
}
|
|
diff -urN gcc-5.3.0.orig/libcc1/configure gcc-5.3.0/libcc1/configure
|
|
--- gcc-5.3.0.orig/libcc1/configure 2015-12-19 14:40:20.855979000 +0000
|
|
+++ gcc-5.3.0/libcc1/configure 2015-12-20 01:28:45.504980900 +0000
|
|
@@ -14500,6 +14500,9 @@
|
|
|
|
pluginlibs=
|
|
|
|
+ PICFLAG="-fPIC"
|
|
+ UNDEFINEDPREAMBLE="extern int X;"
|
|
+ UNDEFINEDCODE="return X == 0;"
|
|
case "${host}" in
|
|
*-*-darwin*)
|
|
if test x$build = x$host; then
|
|
@@ -14510,6 +14513,11 @@
|
|
export_sym_check=
|
|
fi
|
|
;;
|
|
+ *-*-mingw*|*-*-cygwin*|*-*-msys*)
|
|
+ PICFLAG=""
|
|
+ UNDEFINEDPREAMBLE=""
|
|
+ UNDEFINEDCODE=""
|
|
+ ;;
|
|
*)
|
|
if test x$build = x$host; then
|
|
export_sym_check="objdump${exeext} -T"
|
|
@@ -14622,23 +14630,23 @@
|
|
case "${host}" in
|
|
*-*-darwin*)
|
|
CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g`
|
|
- CFLAGS="$CFLAGS -fPIC"
|
|
+ CFLAGS="$CFLAGS ${PICFLAG}"
|
|
LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup"
|
|
;;
|
|
*)
|
|
- CFLAGS="$CFLAGS -fPIC"
|
|
- LDFLAGS="$LDFLAGS -fPIC -shared"
|
|
+ CFLAGS="$CFLAGS ${PICFLAG}"
|
|
+ LDFLAGS="$LDFLAGS ${PICFLAG} -shared"
|
|
;;
|
|
esac
|
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fPIC -shared" >&5
|
|
-$as_echo_n "checking for -fPIC -shared... " >&6; }
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PICFLAG} -shared" >&5
|
|
+$as_echo_n "checking for ${PICFLAG} -shared... " >&6; }
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
-extern int X;
|
|
+${UNDEFINEDPREAMBLE}
|
|
int
|
|
main ()
|
|
{
|
|
-return X == 0;
|
|
+${UNDEFINEDCODE}
|
|
;
|
|
return 0;
|
|
}
|