diff options
author | Yi Kong <yikong@google.com> | 2019-08-22 11:57:14 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-22 11:57:14 -0700 |
commit | d5da35bc84baaa182b218528f4e1e2adc5b78132 (patch) | |
tree | 8b9a1c4be0b4422358e58ef7226a68de6f139031 | |
parent | 0dc903ee6acf3a388b332e2d703f2e3cec65183e (diff) | |
parent | 436af3d55b26d1204812b4e45fea7bd9feb983e7 (diff) | |
download | bionic-d5da35bc84baaa182b218528f4e1e2adc5b78132.tar.gz |
Merge changes from topic "clang-r365631-switch-over"
am: 436af3d55b
Change-Id: I116f6b040d47ec6f4fca540322651f7d59305cc9
-rw-r--r-- | tests/libs/segment_gap_outer.lds | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/libs/segment_gap_outer.lds b/tests/libs/segment_gap_outer.lds index c2961b2c6..0f175af2f 100644 --- a/tests/libs/segment_gap_outer.lds +++ b/tests/libs/segment_gap_outer.lds @@ -1,15 +1,14 @@ SECTIONS { - # This starts off fairly normal: rodata, text, data, relro, bss with + # This starts off fairly normal: rodata, text, dynamic, data, bss with # appropriate alignment between them. . = SIZEOF_HEADERS; .rodata : {} . = ALIGN(0x1000); .text : {} . = ALIGN(0x1000); - .data : {} - . = ALIGN(0x1000); - .data.rel.ro : {} + .dynamic : {} . = ALIGN(0x1000); + .data : {} .bss : {} # Now create the gap. We need a text segment first to prevent the linker from |