diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:06:20 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:06:58 +0000 |
commit | 3fcbb67b7949a8b362de5558bf1c6dd7ec5d21cf (patch) | |
tree | b867f9a6d3426f212b2f073bef8067a830f13022 /elf/rtld-Rules | |
parent | b6df7ac2cbe11e6a72f2ab7bd35c6130b72d21d9 (diff) | |
parent | cab56836b146bc129f1ad43f0393d95a9deca63a (diff) |
Merge commit 'refs/top-bases/t/tls-threadvar' into t/tls-threadvar
Diffstat (limited to 'elf/rtld-Rules')
-rw-r--r-- | elf/rtld-Rules | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/elf/rtld-Rules b/elf/rtld-Rules index 94ca39bff2..6fd9494ba3 100644 --- a/elf/rtld-Rules +++ b/elf/rtld-Rules @@ -1,6 +1,6 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. -# Copyright (C) 2002-2016 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ rtld-all: # When run from the elf/Makefile to build rtld-libc.a, $(subdir) is elf. ifneq ($(subdir),elf) ifndef rtld-modules -error rtld-modules not set +$(error rtld-modules not set) endif endif @@ -37,7 +37,7 @@ ifndef rtld-modules # Running to build rtld-libc.a, driving runs of $(rtld-subdir-make), below. ifndef rtld-subdirs -error This makefile is a subroutine of elf/Makefile not to be used directly +$(error This makefile is a subroutine of elf/Makefile not to be used directly) endif include ../Makeconfig @@ -90,7 +90,7 @@ else rtld-compile-command.S = $(compile-command.S) $(rtld-CPPFLAGS) rtld-compile-command.s = $(compile-command.s) $(rtld-CPPFLAGS) -rtld-compile-command.c = $(compile-command.c) $(rtld-CPPFLAGS) +rtld-compile-command.c = $(compile-command.c) $(rtld-CPPFLAGS) $(rtld-CFLAGS) # These are the basic compilation rules corresponding to the Makerules ones. # The sysd-rules generated makefile already defines pattern rules for rtld-% @@ -142,6 +142,8 @@ endif # Set libof-* for each routine. cpp-srcs-left := $(rtld-modules:%.os=%) lib := rtld -include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) +include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) + +rtld-CFLAGS += $(no-stack-protector) endif |