diff options
| author | Marek Polacek <polacek@redhat.com> | 2022-11-22 21:10:31 -0500 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2022-11-22 21:10:31 -0500 |
| commit | 04711f5189a72c2fcaeed520d65582704adca042 (patch) | |
| tree | f0eb61aee9cb51bf6ff14bfef4429b1f77e99d26 /libcpp | |
| parent | 30f399ee9318bcb44e3e2debde086303157a347d (diff) | |
| download | gcc-04711f5189a72c2fcaeed520d65582704adca042.zip gcc-04711f5189a72c2fcaeed520d65582704adca042.tar.gz gcc-04711f5189a72c2fcaeed520d65582704adca042.tar.bz2 | |
Revert "configure: Implement --enable-host-pie"
This reverts commit 251c72a68af3a8b0638705b73ef120ffdf0053eb.
Diffstat (limited to 'libcpp')
| -rwxr-xr-x | libcpp/configure | 22 | ||||
| -rw-r--r-- | libcpp/configure.ac | 19 |
2 files changed, 3 insertions, 38 deletions
diff --git a/libcpp/configure b/libcpp/configure index 1389dda..e9937cd 100755 --- a/libcpp/configure +++ b/libcpp/configure @@ -625,8 +625,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS CET_HOST_FLAGS PICFLAG -enable_host_pie -enable_host_shared MAINT USED_CATALOGS PACKAGE @@ -740,7 +738,6 @@ enable_maintainer_mode enable_checking enable_canonical_system_headers enable_host_shared -enable_host_pie enable_cet enable_valgrind_annotations ' @@ -1382,7 +1379,6 @@ Optional Features: --enable-canonical-system-headers enable or disable system headers canonicalization --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] --enable-valgrind-annotations enable valgrind runtime interaction @@ -7609,23 +7605,7 @@ esac # 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/libcpp/configure.ac b/libcpp/configure.ac index b29b4d6..89ac99b 100644 --- a/libcpp/configure.ac +++ b/libcpp/configure.ac @@ -211,23 +211,8 @@ esac # 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. |