diff options
| author | Peter Collingbourne <pcc@google.com> | 2020-01-15 14:43:37 -0800 |
|---|---|---|
| committer | Peter Collingbourne <pcc@google.com> | 2020-01-15 15:07:09 -0800 |
| commit | f26a67a6c141c94f84bd497f2c317dd1658fe99a (patch) | |
| tree | 42d21cfe557c62a634169d81a772ef9d923fd29c | |
| parent | 51b055fd85673ecc48e8242fdd9c0cdc03bef92a (diff) | |
| download | prebuilts_gcc_linux-x86_host_x86_64-linux-glibc2.17-4.8-f26a67a6c141c94f84bd497f2c317dd1658fe99a.tar.gz prebuilts_gcc_linux-x86_host_x86_64-linux-glibc2.17-4.8-f26a67a6c141c94f84bd497f2c317dd1658fe99a.tar.bz2 prebuilts_gcc_linux-x86_host_x86_64-linux-glibc2.17-4.8-f26a67a6c141c94f84bd497f2c317dd1658fe99a.zip | |
Delete symlink to bionic's stdatomic.h.
As mentioned in the commit where this was added, this doesn't seem to be
needed any more. It is also actively preventing us from removing the code in
the Android LLVM build script that copies bionic's stdatomic.h into clang's
include directory, since clang's stdatomic.h will try to use the system's
stdatomic.h (i.e. this symlink in host builds) if available, and bionic's
stdatomic.h depends on bits/stdatomic.h in C, which doesn't have its own
symlink from here, resulting in C builds that include stdatomic.h being broken
(which is a relatively good sign that nothing is actually depending on this
symlink being here).
Bug: 147765083
Change-Id: I4f704e423de12ea2927d6dc95c97384cb7cfd07d
| -rw-r--r-- | sysroot-patches/sysroot-link-stdatomic-to-bionic.patch | 15 | ||||
| l--------- | sysroot/usr/include/stdatomic.h | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/sysroot-patches/sysroot-link-stdatomic-to-bionic.patch b/sysroot-patches/sysroot-link-stdatomic-to-bionic.patch deleted file mode 100644 index d12ffa0..0000000 --- a/sysroot-patches/sysroot-link-stdatomic-to-bionic.patch +++ /dev/null @@ -1,15 +0,0 @@ -Carried from glibc-2.15 we have a stdatomic.h symlink. - -There's no motivating build failure I could produce for this. It's incredibly -cheap to include, and random online posts indicate that stdatomic.h only -appeared with gcc 4.9. Probably worth checking if this is still needed when we -move to that. - ------ -diff --git a/usr/include/stdatomic.h b/usr/include/stdatomic.h -new file mode 120000 ---- /dev/null -+++ b/usr/include/stdatomic.h -@@ -0,0 +1 @@ -+../../../../../../../../bionic/libc/include/stdatomic.h -\ No newline at end of file diff --git a/sysroot/usr/include/stdatomic.h b/sysroot/usr/include/stdatomic.h deleted file mode 120000 index b79fbfe..0000000 --- a/sysroot/usr/include/stdatomic.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../bionic/libc/include/stdatomic.h
\ No newline at end of file |