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 /fixincludes | |
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 'fixincludes')
-rw-r--r-- | fixincludes/Makefile.in | 14 | ||||
-rwxr-xr-x | fixincludes/configure | 13 | ||||
-rw-r--r-- | fixincludes/configure.ac | 8 |
3 files changed, 4 insertions, 31 deletions
diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in index 990c08e..1937dca 100644 --- a/fixincludes/Makefile.in +++ b/fixincludes/Makefile.in @@ -30,8 +30,6 @@ CC = @CC@ CFLAGS = @CFLAGS@ WARN_CFLAGS = @WARN_CFLAGS@ @WARN_PEDANTIC@ @WERROR@ LDFLAGS = @LDFLAGS@ -PICFLAG = @PICFLAG@ -LD_PICFLAG = @LD_PICFLAG@ INCLUDES = -I. -I$(srcdir) -I../include -I$(srcdir)/../include FIXINC_CFLAGS = -DHAVE_CONFIG_H $(INCLUDES) @@ -75,7 +73,7 @@ default : all # Now figure out from those variables how to compile and link. .c.o: - $(CC) -c $(CFLAGS) $(PICFLAG) $(WARN_CFLAGS) $(CPPFLAGS) $(FIXINC_CFLAGS) $< + $(CC) -c $(CFLAGS) $(WARN_CFLAGS) $(CPPFLAGS) $(FIXINC_CFLAGS) $< # The only suffixes we want for implicit rules are .c and .o. .SUFFIXES: @@ -89,11 +87,7 @@ default : all ## ## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -ifeq ($(PICFLAG),) LIBIBERTY=../libiberty/libiberty.a -else -LIBIBERTY=../libiberty/pic/libiberty.a -endif ALLOBJ = fixincl.o fixtests.o fixfixes.o server.o procopen.o \ fixlib.o fixopts.o @@ -113,15 +107,15 @@ oneprocess : full-stamp twoprocess : test-stamp $(AF) full-stamp : $(ALLOBJ) $(LIBIBERTY) - $(CC) $(CFLAGS) $(PICFLAG) $(LDFLAGS) $(LD_PICFLAG) -o $(FI) $(ALLOBJ) $(LIBIBERTY) + $(CC) $(CFLAGS) $(LDFLAGS) -o $(FI) $(ALLOBJ) $(LIBIBERTY) $(STAMP) $@ test-stamp : $(TESTOBJ) $(LIBIBERTY) - $(CC) $(CFLAGS) $(PICFLAG) $(LDFLAGS) $(LD_PICFLAG) -o $(FI) $(TESTOBJ) $(LIBIBERTY) + $(CC) $(CFLAGS) $(LDFLAGS) -o $(FI) $(TESTOBJ) $(LIBIBERTY) $(STAMP) $@ $(AF): $(FIXOBJ) $(LIBIBERTY) - $(CC) $(CFLAGS) $(PICFLAG) $(LDFLAGS) $(LD_PICFLAG) -o $@ $(FIXOBJ) $(LIBIBERTY) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FIXOBJ) $(LIBIBERTY) $(ALLOBJ) : $(HDR) fixincl.o : fixincl.c $(srcdir)/fixincl.x diff --git a/fixincludes/configure b/fixincludes/configure index 67a7597..b3bca66 100755 --- a/fixincludes/configure +++ b/fixincludes/configure @@ -623,8 +623,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS get_gcc_base_ver MAINT -LD_PICFLAG -PICFLAG TARGET target_noncanonical WERROR @@ -697,7 +695,6 @@ enable_option_checking enable_werror_always with_local_prefix enable_twoprocess -enable_host_pie enable_maintainer_mode with_gcc_major_version_only ' @@ -1326,7 +1323,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-werror-always enable -Werror despite compiler version --enable-twoprocess Use a separate process to apply the fixes - --enable-host-pie build host code as PIE --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -4839,15 +4835,6 @@ $as_echo "#define SEPARATE_FIX_PROC 1" >>confdefs.h fi -# Enable --enable-host-pie. -# Check whether --enable-host-pie was given. -if test "${enable_host_pie+set}" = set; then : - enableval=$enable_host_pie; PICFLAG=-fPIE; LD_PICFLAG=-pie -fi - - - - case $host in vax-dec-bsd* ) diff --git a/fixincludes/configure.ac b/fixincludes/configure.ac index ec8534f..14813b9 100644 --- a/fixincludes/configure.ac +++ b/fixincludes/configure.ac @@ -68,14 +68,6 @@ if test $TARGET = twoprocess; then [Define if testing and fixing are done by separate process]) fi -# Enable --enable-host-pie. -AC_ARG_ENABLE(host-pie, -[AS_HELP_STRING([--enable-host-pie], - [build host code as PIE])], -[PICFLAG=-fPIE; LD_PICFLAG=-pie], []) -AC_SUBST(PICFLAG) -AC_SUBST(LD_PICFLAG) - case $host in vax-dec-bsd* ) AC_DEFINE(exit, xexit, [Define to xexit if the host system does not support atexit]) |