b6cb10af12
[ This is my third attempt to add this configure option. The first version was approved but it came too late in the development cycle. The second version was also approved, but I had to revert it: <https://gcc.gnu.org/pipermail/gcc-patches/2022-November/607082.html>. I've fixed the problem (by moving $(PICFLAG) from INTERNAL_CFLAGS to ALL_COMPILERFLAGS). Another change is that since r13-4536 I no longer need to touch Makefile.def, so this patch is simplified. ] This patch implements the --enable-host-pie configure option which makes the compiler executables PIE. This can be used to enhance protection against ROP attacks, and can be viewed as part of a wider trend to harden binaries. It is similar to the option --enable-host-shared, except that --e-h-s won't add -shared to the linker flags whereas --e-h-p will add -pie. It is different from --enable-default-pie because that option just adds an implicit -fPIE/-pie when the compiler is invoked, but the compiler itself isn't PIE. Since r12-5768-gfe7c3ecf, PCH works well with PIE, so there are no PCH regressions. When building the compiler, the build process may use various in-tree libraries; these need to be built with -fPIE so that it's possible to use them when building a PIE. For instance, when --with-included-gettext is in effect, intl object files must be compiled with -fPIE. Similarly, when building in-tree gmp, isl, mpfr and mpc, they must be compiled with -fPIE. With this patch and --enable-host-pie used to configure gcc: $ file gcc/cc1{,plus,obj,gm2} gcc/f951 gcc/lto1 gcc/cpp gcc/go1 gcc/rust1 gcc/gnat1 gcc/cc1: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=98e22cde129d304aa6f33e61b1c39e144aeb135e, for GNU/Linux 3.2.0, with debug_info, not stripped gcc/cc1plus: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=859d1ea37e43dfe50c18fd4e3dd9a34bb1db8f77, for GNU/Linux 3.2.0, with debug_info, not stripped gcc/cc1obj: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=1964f8ecee6163182bc26134e2ac1f324816e434, for GNU/Linux 3.2.0, with debug_info, not stripped gcc/cc1gm2: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=a396672c7ff913d21855829202e7b02ecf42ff4c, for GNU/Linux 3.2.0, with debug_info, not stripped gcc/f951: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=59c523db893186547ac75c7a71f48be0a461c06b, for GNU/Linux 3.2.0, with debug_info, not stripped gcc/lto1: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=084a7b77df7be2d63c2d4c655b5bbc3fcdb6038d, for GNU/Linux 3.2.0, with debug_info, not stripped gcc/cpp: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=3503bf8390d219a10d6653b8560aa21158132168, for GNU/Linux 3.2.0, with debug_info, not stripped gcc/go1: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=988cc673af4fba5dcb482f4b34957b99050a68c5, for GNU/Linux 3.2.0, with debug_info, not stripped gcc/rust1: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=b6a5d3d514446c4dcdee0707f086ab9b274a8a3c, for GNU/Linux 3.2.0, with debug_info, not stripped gcc/gnat1: ELF 64-bit LSB pie executable, x86-64, version 1 (GNU/Linux), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=bb11ccdc2c366fe3fe0980476bcd8ca19b67f9dc, for GNU/Linux 3.2.0, with debug_info, not stripped I plan to add an option to link with -Wl,-z,now. Bootstrapped on x86_64-pc-linux-gnu with --with-included-gettext --enable-host-pie as well as without --enable-host-pie. Also tested on a Debian system where the system gcc was configured with --enable-default-pie. Co-Authored by: Iain Sandoe <iain@sandoe.co.uk> ChangeLog: * configure.ac (--enable-host-pie): New check. Set PICFLAG after this check. * configure: Regenerate. c++tools/ChangeLog: * Makefile.in: Rename PIEFLAG to PICFLAG. Set LD_PICFLAG. Use it. Use pic/libiberty.a if PICFLAG is set. * configure.ac (--enable-default-pie): Set PICFLAG instead of PIEFLAG. (--enable-host-pie): New check. * configure: Regenerate. fixincludes/ChangeLog: * Makefile.in: Set and use PICFLAG and LD_PICFLAG. Use the "pic" build of libiberty if PICFLAG is set. * configure.ac: * configure: Regenerate. gcc/ChangeLog: * Makefile.in: Set LD_PICFLAG. Use it. Set enable_host_pie. Remove NO_PIE_CFLAGS and NO_PIE_FLAG. Pass LD_PICFLAG to ALL_LINKERFLAGS. Use the "pic" build of libiberty if --enable-host-pie. * configure.ac (--enable-host-shared): Don't set PICFLAG here. (--enable-host-pie): New check. Set PICFLAG and LD_PICFLAG after this check. * configure: Regenerate. * doc/install.texi: Document --enable-host-pie. gcc/ada/ChangeLog: * gcc-interface/Make-lang.in (ALL_ADAFLAGS): Remove NO_PIE_CFLAGS. Add PICFLAG. Use PICFLAG when building ada/b_gnat1.o and ada/b_gnatb.o. * gcc-interface/Makefile.in: Use pic/libiberty.a if PICFLAG is set. Remove NO_PIE_FLAG. gcc/m2/ChangeLog: * Make-lang.in: New var, GM2_PICFLAGS. Use it. gcc/d/ChangeLog: * Make-lang.in: Remove NO_PIE_CFLAGS. intl/ChangeLog: * Makefile.in: Use @PICFLAG@ in COMPILE as well. * configure.ac (--enable-host-shared): Don't set PICFLAG here. (--enable-host-pie): New check. Set PICFLAG after this check. * configure: Regenerate. libcody/ChangeLog: * Makefile.in: Pass LD_PICFLAG to LDFLAGS. * configure.ac (--enable-host-shared): Don't set PICFLAG here. (--enable-host-pie): New check. Set PICFLAG and LD_PICFLAG after this check. * configure: Regenerate. libcpp/ChangeLog: * configure.ac (--enable-host-shared): Don't set PICFLAG here. (--enable-host-pie): New check. Set PICFLAG after this check. * configure: Regenerate. libdecnumber/ChangeLog: * configure.ac (--enable-host-shared): Don't set PICFLAG here. (--enable-host-pie): New check. Set PICFLAG after this check. * configure: Regenerate. libiberty/ChangeLog: * configure.ac: Also set shared when enable_host_pie. * configure: Regenerate. zlib/ChangeLog: * configure.ac (--enable-host-shared): Don't set PICFLAG here. (--enable-host-pie): New check. Set PICFLAG after this check. * configure: Regenerate.
150 lines
3.2 KiB
Makefile
150 lines
3.2 KiB
Makefile
# Nathan's generic Makefile -*- mode:Makefile -*-
|
|
# Copyright (C) 2019-2020 Nathan Sidwell, nathan@acm.org
|
|
# License: Apache v2.0
|
|
|
|
srcdir := @srcdir@
|
|
prefix := @prefix@
|
|
exec_prefix := @exec_prefix@
|
|
bindir := @bindir@
|
|
libdir := @libdir@
|
|
includedir := @includedir@
|
|
# Linker options
|
|
LDFLAGS := @LDFLAGS@
|
|
LIBS := @LIBS@
|
|
|
|
# We have to place the -I paths last, so that building will see -I paths to us
|
|
CXX := $(filter-out -I%,@CXX@)
|
|
AR := @AR@
|
|
RANLIB := @RANLIB@
|
|
INSTALL := $(srcdir)/build-aux/install-sh
|
|
|
|
# C++ compiler options
|
|
CXXFLAGS := @CXXFLAGS@
|
|
CXXINC := $(filter -I%,@CXX@)
|
|
CXXOPTS := $(CXXFLAGS) @PICFLAG@
|
|
|
|
ifneq (@EXCEPTIONS@,yes)
|
|
CXXOPTS += -fno-exceptions -fno-rtti
|
|
endif
|
|
|
|
# Config
|
|
CXXOPTS += $(filter-out -DHAVE_CONFIG_H,@DEFS@) -include config.h
|
|
|
|
# Linker options
|
|
LDFLAGS := @LDFLAGS@ @LD_PICFLAG@
|
|
LIBS := @LIBS@
|
|
|
|
# Per-source & per-directory compile flags (warning: recursive)
|
|
SRC_CXXFLAGS = $(CXXFLAGS$(patsubst $(srcdir)%,%,$1)) \
|
|
$(if $(filter-out $(srcdir)/,$1),\
|
|
$(call $0,$(dir $(patsubst %/,%,$1))))
|
|
|
|
ifneq ($(MAINTAINER),)
|
|
override MAINTAINER += $1
|
|
endif
|
|
ifeq (@MAINTAINER@,yes)
|
|
MAINTAINER = $2
|
|
else
|
|
MAINTAINER = \# --enable-maintainer-mode to rebuild $1, or make MAINTAINER=touch
|
|
endif
|
|
|
|
vpath %.in $(srcdir)
|
|
vpath %.cc $(srcdir)
|
|
|
|
.SUFFIXES: .o .cc
|
|
|
|
%.o: %.cc
|
|
@mkdir -p $(dir $@)
|
|
$(CXX) $(strip $(CXXOPTS) $(call SRC_CXXFLAGS,$<) $(CXXINC)) \
|
|
-MMD -MP -MF ${@:.o=.d} -c -o $@ $<
|
|
|
|
all:: Makefile
|
|
|
|
mostlyclean::
|
|
|
|
clean:: Makefile
|
|
|
|
# FIXME: Delete
|
|
revision.stamp: $(srcdir)/.
|
|
@revision=`git -C $(srcdir) rev-parse HEAD 2>/dev/null` ;\
|
|
if test -n "$$revision" ;\
|
|
then revision=git-$$revision ;\
|
|
if git -C $(srcdir) status --porcelain 2>/dev/null | grep -vq '^ ' ;\
|
|
then revision=$${revision}M ;\
|
|
fi ;\
|
|
else revision=unknown ;\
|
|
fi ;\
|
|
echo $$revision > $@
|
|
|
|
revision: revision.stamp
|
|
@cmp -s $< $@ || cp -f $< $@
|
|
|
|
mostlyclean::
|
|
|
|
clean:: mostlyclean
|
|
rm -f revision.stamp revision
|
|
|
|
distclean:: clean
|
|
rm -f config.log config.status
|
|
|
|
$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/config.m4
|
|
$(call MAINTAINER,$@,cd $(@D) && autoconf -W all,error)
|
|
|
|
$(srcdir)/config.h.in: $(srcdir)/configure.ac $(srcdir)/config.m4
|
|
$(call MAINTAINER,$@,cd $(@D) && autoheader -f -W all,error)
|
|
|
|
config.h: config.status config.h.in
|
|
./$< --header=$@
|
|
touch $@
|
|
|
|
ifeq ($(filter %clean,$(MAKECMDGOALS)),)
|
|
Makefile: config.status Makefile.in
|
|
./$< --file=$@
|
|
touch $@
|
|
endif
|
|
|
|
config.status: $(srcdir)/configure $(srcdir)/config.h.in
|
|
if test -x $@; then ./$@ -recheck; else $< @configure_args@; fi
|
|
|
|
mostlyclean::
|
|
|
|
clean:: mostlyclean
|
|
rm -f $(shell find $(srcdir) -name '*~')
|
|
|
|
distclean:: clean
|
|
rm -f config.h
|
|
|
|
maintainer-clean:: distclean
|
|
rm -f $(srcdir)/config.h.in
|
|
|
|
.PHONY: all check clean distclean maintainer-clean mostlyclean
|
|
|
|
CXXFLAGS/ := -I$(srcdir)
|
|
LIBCODY.O := buffer.o client.o fatal.o netclient.o netserver.o \
|
|
resolver.o packet.o server.o
|
|
|
|
all:: libcody.a
|
|
|
|
libcody.a: $(LIBCODY.O)
|
|
$(AR) -cr $@ $^
|
|
$(RANLIB) $@
|
|
|
|
mostlyclean::
|
|
|
|
clean:: mostlyclean
|
|
rm -f $(LIBCODY.O) $(LIBCODY.O:.o=.d)
|
|
rm -f libcody.a
|
|
|
|
CXXFLAGS/fatal.cc = -DSRCDIR='"$(srcdir)"'
|
|
|
|
fatal.o: Makefile revision
|
|
|
|
install::
|
|
$(INSTALL) -d $(libdir) $(includedir)
|
|
$(INSTALL) libcody.a $(libdir)
|
|
$(INSTALL) $(srcdir)/cody.hh $(includedir)
|
|
|
|
ifeq ($(filter clean%,$(MAKECMDGOALS)),)
|
|
-include $(LIBCODY.O:.o=.d)
|
|
endif
|