Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i#5926 libdw: Switch drsyms to use libdw from elfutils #6534

Merged
merged 26 commits into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
db2b344
i#5926 libdw: Add new interface dr_running_under_dynamorio()
derekbruening Jan 2, 2024
5c1bcdd
i#5926 libdw: Switch drsyms to use libdw from elfutils
derekbruening Nov 28, 2023
54b6601
clang-format the autoconfig config.h for elfutils
derekbruening Jan 2, 2024
c83334c
DO NOT COMMIT: disable trailing spaces check as .patch files contain …
derekbruening Jan 2, 2024
221d3ab
Work around compiler warning
derekbruening Jan 2, 2024
a1ea6f6
Link libdw with pthread; install zlib on 32-bit GA CI and attempt to …
derekbruening Jan 2, 2024
b26e75b
Merge branch 'master' of github.com:DynamoRIO/dynamorio into i5926-li…
derekbruening Jan 2, 2024
aa0dec4
Try armhf packages for zlib for android
derekbruening Jan 2, 2024
2c2c2f6
Undo Android libz install attempt and instead go back to libelftc ins…
derekbruening Jan 2, 2024
c2af1ca
Re-add drsyms_dwarf.c to Android
derekbruening Jan 4, 2024
4ef8587
Patch realpath() call in __libdw_elfpath to avoid malloc
derekbruening Jan 4, 2024
eb113ec
Merge branch 'master' of github.com:DynamoRIO/dynamorio into i5926-li…
derekbruening Jan 4, 2024
79328c3
Wrap private lib init/fini call in try/except, and fix shared_data==N…
derekbruening Jan 5, 2024
91529e1
Change privlib crash message from warning to error so it will show up…
derekbruening Jan 5, 2024
303fd2e
DO NOT COMMIT: Remove all but ubuntu22 32-bit job and enable tmate
derekbruening Jan 5, 2024
02671e8
DO NOT COMMIT addendum: add in if-failure line, apparently needed to …
derekbruening Jan 5, 2024
924314f
Try renaming libz.a to force libz.so
derekbruening Jan 5, 2024
c476ac5
Install zlib1g too for .so
derekbruening Jan 5, 2024
6f89370
Revert "Install zlib1g too for .so"
derekbruening Jan 5, 2024
1e1fd75
Revert "Try renaming libz.a to force libz.so"
derekbruening Jan 5, 2024
d13e42f
Revert "DO NOT COMMIT addendum: add in if-failure line, apparently ne…
derekbruening Jan 5, 2024
e6fccd5
Revert "DO NOT COMMIT: Remove all but ubuntu22 32-bit job and enable …
derekbruening Jan 5, 2024
e53b7a9
Update copyright dates
derekbruening Jan 5, 2024
3c89b91
Install zlib1g:i386 for .so to avoid disastrous attempted use of non-…
derekbruening Jan 5, 2024
81f0461
Merge branch 'master' of github.com:DynamoRIO/dynamorio into i5926-li…
derekbruening Jan 5, 2024
ad8c1d0
Add DWARF-5 and elfutils license note to release notes
derekbruening Jan 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-aarchxx.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2020-2023 Google, Inc. All rights reserved.
# Copyright (c) 2020-2024 Google, Inc. All rights reserved.
# **********************************************************

# Redistribution and use in source and binary forms, with or without
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-package.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2020-2023 Google, Inc. All rights reserved.
# Copyright (c) 2020-2024 Google, Inc. All rights reserved.
# **********************************************************

# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
sudo apt-get -y install doxygen vera++ zlib1g-dev libsnappy-dev \
liblz4-dev g++-multilib libunwind-dev
sudo add-apt-repository 'deb [arch=i386] http://us.archive.ubuntu.com/ubuntu focal main'
apt download libunwind8:i386 libunwind-dev:i386 liblzma5:i386
apt download libunwind8:i386 libunwind-dev:i386 liblzma5:i386 zlib1g-dev:i386
mkdir ../extract
for i in *.deb; do dpkg-deb -x $i ../extract; done
sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-x86.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# **********************************************************
# Copyright (c) 2020-2023 Google, Inc. All rights reserved.
# Copyright (c) 2020-2024 Google, Inc. All rights reserved.
# **********************************************************

# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
sudo apt-get -y install doxygen vera++ zlib1g-dev libsnappy-dev \
liblz4-dev g++-multilib libunwind-dev
sudo add-apt-repository 'deb [arch=i386] http://us.archive.ubuntu.com/ubuntu focal main'
apt download libunwind8:i386 libunwind-dev:i386 liblzma5:i386
apt download libunwind8:i386 libunwind-dev:i386 liblzma5:i386 zlib1g-dev:i386
mkdir ../extract
for i in *.deb; do dpkg-deb -x $i ../extract; done
sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/
Expand Down Expand Up @@ -286,7 +286,7 @@ jobs:
sudo apt-get -y install doxygen vera++ zlib1g-dev libsnappy-dev \
liblz4-dev g++-multilib libunwind-dev
sudo add-apt-repository 'deb [arch=i386] http://us.archive.ubuntu.com/ubuntu focal main'
apt download libunwind8:i386 libunwind-dev:i386 liblzma5:i386
apt download libunwind8:i386 libunwind-dev:i386 liblzma5:i386 zlib1g-dev:i386
mkdir ../extract
for i in *.deb; do dpkg-deb -x $i ../extract; done
sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "third_party/zlib"]
path = third_party/zlib
url = https://github.com/madler/zlib.git
[submodule "third_party/elfutils"]
path = third_party/elfutils
url = git://sourceware.org/git/elfutils.git
ksco marked this conversation as resolved.
Show resolved Hide resolved
179 changes: 178 additions & 1 deletion License.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Primary DynamoRIO License: BSD
All of DynamoRIO except certain portions called out in subsequent sections
on this page is licensed under the following BSD license:

Copyright (c) 2010-2014 Google, Inc. licensed under the terms of the BSD. All other rights reserved.
Copyright (c) 2010-2024 Google, Inc. licensed under the terms of the BSD. All other rights reserved.

Copyright (c) 2000-2009 VMware, Inc. licensed under the terms of the BSD. All other rights reserved.

Expand Down Expand Up @@ -550,6 +550,183 @@ DAMAGES.

END OF TERMS AND CONDITIONS

===========================================================================
The drsyms Extension is linked with elfutils libraries under the LGPL 3 License

The drsyms Extension on Linux is linked with static libraries from the
elfutils project. The source code for elfutils is available at
git://sourceware.org/git/elfutils.git. We choose the LGPL 3 license
(elfutils offers that as a choice) for our use of these libraries. The
drsyms Extension and the elfutils static libraries are provided as
libraries distinct from the rest of DynamoRIO. The details of the LGPL 3
license are below:

GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.


This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.

0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.

"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.

An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.

A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".

The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.

The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.

You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.

If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:

a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or

b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.

The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the object code with a copy of the GNU GPL and this license
document.

4. Combined Works.

You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:

a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.

c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.

d) Do one of the following:

0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.

1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.

e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)

5. Combined Libraries.

You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.

b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.

The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.

===========================================================================
The valgrind.h and memcheck.h files in third_party/valgrind/ are also BSD
but with 4 clauses:
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2010-2021 Google, Inc. licensed under the terms of the BSD. All other rights reserved.
Copyright (c) 2010-2024 Google, Inc. licensed under the terms of the BSD. All other rights reserved.
Copyright (c) 2000-2010 VMware, Inc. licensed under the terms of the BSD. All other rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
Loading
Loading