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 /libcody | |
| 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 'libcody')
| -rw-r--r-- | libcody/Makefile.in | 2 | ||||
| -rwxr-xr-x | libcody/configure | 30 | ||||
| -rw-r--r-- | libcody/configure.ac | 26 |
3 files changed, 4 insertions, 54 deletions
diff --git a/libcody/Makefile.in b/libcody/Makefile.in index cb01b00..bb87468 100644 --- a/libcody/Makefile.in +++ b/libcody/Makefile.in @@ -31,7 +31,7 @@ endif CXXOPTS += $(filter-out -DHAVE_CONFIG_H,@DEFS@) -include config.h # Linker options -LDFLAGS := @LDFLAGS@ @LD_PICFLAG@ +LDFLAGS := @LDFLAGS@ LIBS := @LIBS@ # Per-source & per-directory compile flags (warning: recursive) diff --git a/libcody/configure b/libcody/configure index 0e536c0..da52a5c 100755 --- a/libcody/configure +++ b/libcody/configure @@ -591,10 +591,7 @@ configure_args AR RANLIB EXCEPTIONS -LD_PICFLAG PICFLAG -enable_host_pie -enable_host_shared OBJEXT EXEEXT ac_ct_CXX @@ -656,7 +653,6 @@ enable_maintainer_mode with_compiler enable_checking enable_host_shared -enable_host_pie enable_exceptions ' ac_precious_vars='build_alias @@ -1290,7 +1286,6 @@ Optional Features: yes,no,all,none,release. Flags are: misc,valgrind or other strings --enable-host-shared build host code as shared libraries - --enable-host-pie build host code as PIE --enable-exceptions enable exceptions & rtti Optional Packages: @@ -2640,34 +2635,11 @@ fi # 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 -if test x$enable_host_pie = xyes; then - LD_PICFLAG=-pie -else - LD_PICFLAG= -fi - - # Check whether --enable-exceptions was given. diff --git a/libcody/configure.ac b/libcody/configure.ac index 14e8dd4..960191e 100644 --- a/libcody/configure.ac +++ b/libcody/configure.ac @@ -63,31 +63,9 @@ fi # 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 - -if test x$enable_host_pie = xyes; then - LD_PICFLAG=-pie -else - LD_PICFLAG= -fi - + [build host code as shared libraries])], +[PICFLAG=-fPIC], [PICFLAG=]) AC_SUBST(PICFLAG) -AC_SUBST(LD_PICFLAG) NMS_ENABLE_EXCEPTIONS |