From 04711f5189a72c2fcaeed520d65582704adca042 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 22 Nov 2022 21:10:31 -0500 Subject: Revert "configure: Implement --enable-host-pie" This reverts commit 251c72a68af3a8b0638705b73ef120ffdf0053eb. --- libdecnumber/configure | 22 +--------------------- libdecnumber/configure.ac | 19 ++----------------- 2 files changed, 3 insertions(+), 38 deletions(-) (limited to 'libdecnumber') diff --git a/libdecnumber/configure b/libdecnumber/configure index 84bc4ff..fb6db05 100755 --- a/libdecnumber/configure +++ b/libdecnumber/configure @@ -626,8 +626,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS CET_HOST_FLAGS PICFLAG -enable_host_pie -enable_host_shared ADDITIONAL_OBJS enable_decimal_float target_os @@ -708,7 +706,6 @@ enable_werror_always enable_maintainer_mode enable_decimal_float enable_host_shared -enable_host_pie enable_cet ' ac_precious_vars='build_alias @@ -1341,7 +1338,6 @@ Optional Features: or 'dpd' choses which decimal floating point format to use --enable-host-shared build host code as shared libraries - --enable-host-pie build host code as PIE --enable-cet enable Intel CET in host libraries [default=auto] Some influential environment variables: @@ -5190,23 +5186,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h # Enable --enable-host-shared. # Check whether --enable-host-shared was given. if test "${enable_host_shared+set}" = set; then : - enableval=$enable_host_shared; -fi - - - -# Enable --enable-host-pie. -# Check whether --enable-host-pie was given. -if test "${enable_host_pie+set}" = set; then : - enableval=$enable_host_pie; -fi - - - -if test x$enable_host_shared = xyes; then - PICFLAG=-fPIC -elif test x$enable_host_pie = xyes; then - PICFLAG=-fPIE + enableval=$enable_host_shared; PICFLAG=-fPIC else PICFLAG= fi diff --git a/libdecnumber/configure.ac b/libdecnumber/configure.ac index 14f67f9..0794031 100644 --- a/libdecnumber/configure.ac +++ b/libdecnumber/configure.ac @@ -100,23 +100,8 @@ AC_C_BIGENDIAN # Enable --enable-host-shared. AC_ARG_ENABLE(host-shared, [AS_HELP_STRING([--enable-host-shared], - [build host code as shared libraries])]) -AC_SUBST(enable_host_shared) - -# Enable --enable-host-pie. -AC_ARG_ENABLE(host-pie, -[AS_HELP_STRING([--enable-host-pie], - [build host code as PIE])]) -AC_SUBST(enable_host_pie) - -if test x$enable_host_shared = xyes; then - PICFLAG=-fPIC -elif test x$enable_host_pie = xyes; then - PICFLAG=-fPIE -else - PICFLAG= -fi - + [build host code as shared libraries])], +[PICFLAG=-fPIC], [PICFLAG=]) AC_SUBST(PICFLAG) # Enable Intel CET on Intel CET enabled host if jit is enabled. -- cgit v1.1