Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Kevin
bionic
Commits
7c2c01d6
Commit
7c2c01d6
authored
10 years ago
by
Dan Albert
Browse files
Options
Download
Email Patches
Plain Diff
Revert "Fix volantis boot."
Bug:
http://b/20065774
This reverts commit
76e1cbca
.
parent
6f0d7005
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
20 deletions
+1
-20
libc/Android.mk
libc/Android.mk
+1
-2
libc/arch-arm64/arm64.mk
libc/arch-arm64/arm64.mk
+0
-2
libc/arch-arm64/bionic/libgcc_compat.c
libc/arch-arm64/bionic/libgcc_compat.c
+0
-11
libc/version_script.txt
libc/version_script.txt
+0
-5
No files found.
libc/Android.mk
View file @
7c2c01d6
...
...
@@ -1379,8 +1379,7 @@ LOCAL_LDFLAGS := -Wl,--version-script,$(LOCAL_PATH)/version_script.txt
# We'd really like to do this for all architectures, but since this wasn't done
# before, these symbols must continue to be exported on LP32 for binary
# compatibility.
# TODO: disabled for http://b/20065774.
#LOCAL_LDFLAGS_64 := -Wl,--exclude-libs,libgcc.a
LOCAL_LDFLAGS_64
:=
-Wl
,--exclude-libs,libgcc.a
# TODO: This is to work around b/19059885. Remove after root cause is fixed
LOCAL_LDFLAGS_arm
:=
-Wl
,--hash-style
=
sysv
...
...
This diff is collapsed.
Click to expand it.
libc/arch-arm64/arm64.mk
View file @
7c2c01d6
...
...
@@ -40,8 +40,6 @@ libc_bionic_src_files_arm64 += \
arch-arm64/bionic/syscall.S
\
arch-arm64/bionic/vfork.S
\
# Work around for http://b/20065774.
libc_bionic_src_files_arm64
+=
arch-arm64/bionic/libgcc_compat.c
libc_crt_target_cflags_arm64
:=
\
-I
$(LOCAL_PATH)
/arch-arm64/include
...
...
This diff is collapsed.
Click to expand it.
libc/arch-arm64/bionic/libgcc_compat.c
deleted
100644 → 0
View file @
6f0d7005
/* STOPSHIP: remove this once the flounder blobs have been rebuilt (http://b/20065774). */
extern
void
__clear_cache
(
char
*
,
char
*
);
extern
char
_Unwind_Backtrace
;
extern
char
_Unwind_GetIP
;
void
*
__bionic_libgcc_compat_symbols
[]
=
{
&
__clear_cache
,
&
_Unwind_Backtrace
,
&
_Unwind_GetIP
,
};
This diff is collapsed.
Click to expand it.
libc/version_script.txt
View file @
7c2c01d6
LIBC {
global:
/* Work-around for http://b/20065774. */
__clear_cache;
_Unwind_Backtrace;
_Unwind_GetIP;
local:
_ZSt7nothrow;
_ZdaPv;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment