diff options
author | Dmitriy Ivanov <dimitry@google.com> | 2014-08-28 14:12:12 -0700 |
---|---|---|
committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-31 17:10:30 -0700 |
commit | 976402cca13a1f4f3aa988fd301575e134ef5f2c (patch) | |
tree | 96d5ca98af5d4638b03541afc5e40d1f888516c0 /tests/libs/dl_preempt_library_2.cpp | |
parent | bf3d5ef5fd240d4c5fbde1b32f9084dbc720840b (diff) | |
download | android_bionic-976402cca13a1f4f3aa988fd301575e134ef5f2c.tar.gz android_bionic-976402cca13a1f4f3aa988fd301575e134ef5f2c.tar.bz2 android_bionic-976402cca13a1f4f3aa988fd301575e134ef5f2c.zip |
Fix symbol lookup order during relocation
Relocate symbol against DF_1_GLOBAL shared libraries
loaded before this shared library. This includes
main executable, ld_preloads and other libraries
that have DF_1_GLOBAL flag set.
Bug: 2643900
Bug: 15432753
Bug: 18186310
(cherry picked from commit d225a5e65223b375a63548c4b780f04d8f3d7b60)
Change-Id: I4e889cdf2dfbf8230b0790053d311ee6b0d0ee2d
Diffstat (limited to 'tests/libs/dl_preempt_library_2.cpp')
-rw-r--r-- | tests/libs/dl_preempt_library_2.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/tests/libs/dl_preempt_library_2.cpp b/tests/libs/dl_preempt_library_2.cpp new file mode 100644 index 000000000..8df9a1667 --- /dev/null +++ b/tests/libs/dl_preempt_library_2.cpp @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// This one should be preempted by the function +// defined in libdl_preempt_test_1.so +extern "C" int __attribute__((weak)) lib_global_default_serial() { + return 2716057; +} + +// Even though this one is defined by +// libdl_preempt_test_1.so it should not be +// preempted because of protected visibility +extern "C" int __attribute__((weak,visibility("protected"))) lib_global_protected_serial() { + return 3370318; +} + +extern "C" int lib_global_default_get_serial() { + return lib_global_default_serial(); +} + +extern "C" int lib_global_protected_get_serial() { + return lib_global_protected_serial(); +} + |