aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.4.3/gcc/esp.h
diff options
context:
space:
mode:
authorDoug Kwan <dougkwan@google.com>2011-06-10 16:02:39 -0700
committerDoug Kwan <dougkwan@google.com>2011-06-10 16:02:39 -0700
commitfe2afdf3f3701489c05d2a7509752d6f0c7616f7 (patch)
tree0f879781b400d82bd939cb03642fe57298875223 /gcc-4.4.3/gcc/esp.h
parentfac2e2f3e863f49fc8a2feb2aa9fd8cfa315219c (diff)
downloadtoolchain_gcc-fe2afdf3f3701489c05d2a7509752d6f0c7616f7.tar.gz
toolchain_gcc-fe2afdf3f3701489c05d2a7509752d6f0c7616f7.tar.bz2
toolchain_gcc-fe2afdf3f3701489c05d2a7509752d6f0c7616f7.zip
Sync internal and external version:
Changes: -x86 security patch (for ChromeOS) -Fix bug in inlining. -Fix freestanding C++ library build: http://gcc.gnu.org/viewcvs?view=revision&revision=173220 -Fix out-of-range branches in Thumb-2 mode. -Fix gcda file corruption problem. -Hanlde LDFLAGS_FOR_TARGETS in configure. This is a backport of upstrem patch r173558. -Backport upstream fix for Atom performance at r164379. Change-Id: Id5a6cfb8949cbd390a0bb3546d55d83383ee4f8c
Diffstat (limited to 'gcc-4.4.3/gcc/esp.h')
-rw-r--r--gcc-4.4.3/gcc/esp.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/gcc-4.4.3/gcc/esp.h b/gcc-4.4.3/gcc/esp.h
index db2135b72..cbcf9d1f9 100644
--- a/gcc-4.4.3/gcc/esp.h
+++ b/gcc-4.4.3/gcc/esp.h
@@ -34,8 +34,19 @@
/* ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable
-z now will be added if we don't have -vanilla spec. We do a -pie incompatible check
Don't remove the specs in the end */
- #define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_pie_check) "
- #define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
+ #define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_pie_check) %(esp_link_relro)"
+
+ #if defined EFAULT_BIND_NOW
+ #define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
+ #else
+ #define ESP_LINK_NOW_SPEC ""
+ #endif
+
+ #if defined EFAULT_RELRO
+ #define ESP_LINK_RELRO_SPEC "%{!norelro:-z relro}"
+ #else
+ #define ESP_LINK_RELRO_SPEC ""
+ #endif
/* We use ESP_COMMAND_OPTIONS_SPEC to add pie command-line options. */
#define ESP_COMMAND_OPTIONS_SPEC "%{!D__KERNEL__:%{!nopie:%(esp_options_pie) %(esp_link_pie)}}"
@@ -120,6 +131,7 @@
{ "esp_cc1_strict_overflow", ESP_CC1_STRICT_OVERFLOW_SPEC }, \
{ "esp_link", ESP_LINK_SPEC }, \
{ "esp_link_now", ESP_LINK_NOW_SPEC }, \
+ { "esp_link_relro", ESP_LINK_RELRO_SPEC }, \
{ "esp_link_pie", ESP_LINK_PIE_SPEC }, \
{ "esp_link_pie_check", ESP_LINK_PIE_CHECK_SPEC }, \
{ "esp_command_options", ESP_COMMAND_OPTIONS_SPEC }, \