1.1 --- a/common/autoconf/flags.m4 Fri Mar 27 05:14:05 2020 +0000
1.2 +++ b/common/autoconf/flags.m4 Mon Apr 06 01:58:35 2020 +0100
1.3 @@ -156,6 +156,7 @@
1.4
1.5 if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.6 PICFLAG="-fPIC"
1.7 + PIEFLAG="-fPIE"
1.8 C_FLAG_REORDER=''
1.9 CXX_FLAG_REORDER=''
1.10
1.11 @@ -176,6 +177,7 @@
1.12 fi
1.13 elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
1.14 PICFLAG="-KPIC"
1.15 + PIEFLAG=""
1.16 C_FLAG_REORDER='-xF'
1.17 CXX_FLAG_REORDER='-xF'
1.18 SHARED_LIBRARY_FLAGS="-G"
1.19 @@ -185,6 +187,7 @@
1.20 SET_SHARED_LIBRARY_MAPFILE='-M[$]1'
1.21 elif test "x$TOOLCHAIN_TYPE" = xxlc; then
1.22 PICFLAG="-qpic=large"
1.23 + PIEFLAG=""
1.24 C_FLAG_REORDER=''
1.25 CXX_FLAG_REORDER=''
1.26 SHARED_LIBRARY_FLAGS="-qmkshrobj"
1.27 @@ -194,6 +197,7 @@
1.28 SET_SHARED_LIBRARY_MAPFILE=''
1.29 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
1.30 PICFLAG=""
1.31 + PIEFLAG=""
1.32 C_FLAG_REORDER=''
1.33 CXX_FLAG_REORDER=''
1.34 SHARED_LIBRARY_FLAGS="-LD"
1.35 @@ -658,8 +662,8 @@
1.36 CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
1.37
1.38 # Executable flags
1.39 - CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
1.40 - CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
1.41 + CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG"
1.42 + CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG"
1.43
1.44 AC_SUBST(CFLAGS_JDKLIB)
1.45 AC_SUBST(CFLAGS_JDKEXE)
1.46 @@ -742,6 +746,9 @@
1.47 if test "x$OPENJDK_TARGET_OS" = xlinux; then
1.48 LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
1.49 fi
1.50 + if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.51 + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
1.52 + fi
1.53 fi
1.54 AC_SUBST(LDFLAGS_JDKLIB)
1.55 AC_SUBST(LDFLAGS_JDKEXE)
