common/autoconf/generated-configure.sh

changeset 2496
f2715985987e
parent 2487
a013ce3462fc
child 2497
343c4ea489d5
     1.1 --- a/common/autoconf/generated-configure.sh	Fri Mar 27 05:14:05 2020 +0000
     1.2 +++ b/common/autoconf/generated-configure.sh	Mon Apr 06 01:58:35 2020 +0100
     1.3 @@ -4379,7 +4379,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1580709484
     1.8 +DATE_WHEN_GENERATED=1585090811
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -41236,6 +41236,7 @@
    1.13  
    1.14    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    1.15      PICFLAG="-fPIC"
    1.16 +    PIEFLAG="-fPIE"
    1.17      C_FLAG_REORDER=''
    1.18      CXX_FLAG_REORDER=''
    1.19  
    1.20 @@ -41256,6 +41257,7 @@
    1.21      fi
    1.22    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
    1.23      PICFLAG="-KPIC"
    1.24 +    PIEFLAG=""
    1.25      C_FLAG_REORDER='-xF'
    1.26      CXX_FLAG_REORDER='-xF'
    1.27      SHARED_LIBRARY_FLAGS="-G"
    1.28 @@ -41265,6 +41267,7 @@
    1.29      SET_SHARED_LIBRARY_MAPFILE='-M$1'
    1.30    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    1.31      PICFLAG="-qpic=large"
    1.32 +    PIEFLAG=""
    1.33      C_FLAG_REORDER=''
    1.34      CXX_FLAG_REORDER=''
    1.35      SHARED_LIBRARY_FLAGS="-qmkshrobj"
    1.36 @@ -41274,6 +41277,7 @@
    1.37      SET_SHARED_LIBRARY_MAPFILE=''
    1.38    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    1.39      PICFLAG=""
    1.40 +    PIEFLAG=""
    1.41      C_FLAG_REORDER=''
    1.42      CXX_FLAG_REORDER=''
    1.43      SHARED_LIBRARY_FLAGS="-LD"
    1.44 @@ -42088,8 +42092,8 @@
    1.45    CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
    1.46  
    1.47    # Executable flags
    1.48 -  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
    1.49 -  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
    1.50 +  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG"
    1.51 +  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG"
    1.52  
    1.53  
    1.54  
    1.55 @@ -42172,6 +42176,9 @@
    1.56      if test "x$OPENJDK_TARGET_OS" = xlinux; then
    1.57        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
    1.58      fi
    1.59 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    1.60 +      LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
    1.61 +    fi
    1.62    fi
    1.63  
    1.64  

mercurial