Skip to content

Commit

Permalink
v0.9.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Yu Ding committed Dec 1, 2017
1 parent a87ba87 commit 50beed6
Show file tree
Hide file tree
Showing 443 changed files with 200,185 additions and 1,444 deletions.
16 changes: 11 additions & 5 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Rust SGX SDK
Rust SGX SDK helps developers write Intel SGX applications in Rust programming language.

## v0.9.1 Release
This version supports the recently released [Intel SGX SDK 2.0](https://download.01.org/intel-sgx/linux-2.0/), and provides the most popular machine learning library [rusty-machine](https://github.com/AtheMathmo/rusty-machine/) in Intel SGX! Please refer to [release_notes](https://github.com/baidu/rust-sgx-sdk/blob/master/release_notes.md) for further details.


## v0.9.0 Release
Almost there! Rust SGX SDK v0.9.0 is coming up as a beta version of the future v1.0.0, with the most desired `sgx::tstd` as well as many new features! Also we added support for programming SGX untrusted part in Rust using `sgx::urts`. Now it's easy to port Rust crates to the SGX trust execution environment and write the whole SGX application in Rust! Please refer to [release_notes](https://github.com/baidu/rust-sgx-sdk/blob/master/release_notes.md) for further details.

Expand Down Expand Up @@ -90,15 +94,17 @@ is shipped in this sample and Makefiles are modified accordingly.
* `hugemem` sample shows how to use huge mem in SGX enclave. In this
sample, we allocate reserve 31.75GB heap space and allocate 31.625GB buffers!

* New! `file` sample shows how to read/write files in SGX enclave.
* `file` sample shows how to read/write files in SGX enclave.

* `hello-rust` is the helloworld sample writtin in pure Rust.

* New! `hello-rust` is the helloworld sample writtin in pure Rust.
* `backtrace` is a sample showing how to enabling backtrace mechanism inside the enclave.

* New! `backtrace` is a sample showing how to enabling backtrace mechanism inside the enclave.
* `unit-test` shows the way of writing unit tests and conduct unit testing.

* New! `unit-test` shows the way of writing unit tests and conduct unit testing.
* `zlib-lazy-static-sample` shows how to use ported third party crates inside enclave.

* New! `zlib-lazy-static-sample` shows how to use ported third party crates inside enclave.
* New! `machine-learning` shows how to use [rusty-machine](https://github.com/AtheMathmo/rusty-machine) for machine learning inside Intel SGX enclave.

# Samples of ported third-party libraries

Expand Down
2 changes: 1 addition & 1 deletion build_helper/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "build_helper"
version = "0.9.0"
version = "0.9.1"
authors = ["baidu"]

[lib]
Expand Down
26 changes: 14 additions & 12 deletions dockerfile/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ RUN apt-get update
RUN apt-get install -y build-essential ocaml automake autoconf libtool wget python libssl-dev libcurl4-openssl-dev protobuf-compiler libprotobuf-dev sudo kmod vim curl git-core libprotobuf-c0-dev libboost-thread-dev libboost-system-dev liblog4cpp5-dev libjsoncpp-dev

RUN mkdir /root/sgx
RUN wget -O /root/sgx/optimized_libs-1.9.100.39124.tar https://download.01.org/intel-sgx/linux-1.9/optimized_libs-1.9.100.39124.tar
RUN wget -O /root/sgx/prebuilt-ae-1.9.100.39124.tar https://download.01.org/intel-sgx/linux-1.9/prebuilt-ae-1.9.100.39124.tar
RUN wget -O /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_1.9.100.39124.bin https://download.01.org/intel-sgx/linux-1.9/sgx_linux_ubuntu16.04.1_x64_psw_1.9.100.39124.bin
RUN wget -O /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_1.9.100.39124.bin https://download.01.org/intel-sgx/linux-1.9/sgx_linux_ubuntu16.04.1_x64_sdk_1.9.100.39124.bin
#RUN wget -O /root/sgx/optimized_libs-1.9.100.39124.tar https://download.01.org/intel-sgx/linux-1.9/optimized_libs-1.9.100.39124.tar
#RUN wget -O /root/sgx/prebuilt-ae-1.9.100.39124.tar https://download.01.org/intel-sgx/linux-1.9/prebuilt-ae-1.9.100.39124.tar
RUN wget -O /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_2.0.100.40950.bin https://download.01.org/intel-sgx/linux-2.0/sgx_linux_ubuntu16.04.1_x64_psw_2.0.100.40950.bin
RUN wget -O /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_2.0.100.40950.bin https://download.01.org/intel-sgx/linux-2.0/sgx_linux_ubuntu16.04.1_x64_sdk_2.0.100.40950.bin

RUN chmod a+x /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_1.9.100.39124.bin
RUN /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_1.9.100.39124.bin
RUN chmod a+x /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_1.9.100.39124.bin
RUN echo -e 'no\n/opt' | /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_1.9.100.39124.bin
RUN chmod a+x /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_2.0.100.40950.bin
RUN /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_2.0.100.40950.bin
RUN chmod a+x /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_2.0.100.40950.bin
RUN echo -e 'no\n/opt' | /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_2.0.100.40950.bin
RUN echo 'source /opt/sgxsdk/environment' >> /root/.bashrc

RUN git clone https://github.com/01org/linux-sgx.git /root/linux-sgx
Expand All @@ -56,14 +56,16 @@ RUN cp /root/linux-sgx/build/linux/libsgx_tstdc.a /opt/sgxsdk/lib64/libsgx_tstdc

RUN wget 'https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init' -O /root/rustup-init
RUN chmod +x /root/rustup-init
RUN echo '1' | /root/rustup-init --default-toolchain nightly-2017-09-29
RUN echo '1' | /root/rustup-init --default-toolchain nightly-2017-11-29
RUN echo 'source /root/.cargo/env' >> /root/.bashrc

# A hack of linking Rust's libc (https://github.com/rust-lang/libc) in no_std environment.
RUN rm /root/.rustup/toolchains/nightly-2017-09-29-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-058430ec2dd28527.rlib
RUN rm /root/.rustup/toolchains/nightly-2017-11-29-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-7f54f8f6cd32e0c8.rlib

# Remove useless .h file in intel sgx sdk, which always cause linking problem.
RUN ar d /opt/sgxsdk/lib64/libsgx_uprotected_fs.a sgx_tprotected_fs_u.h
RUN ar d /opt/sgxsdk/lib64/libsgx_tprotected_fs.a sgx_tprotected_fs_t.h
# Needed no more. Intel has merged the corresponding patch.
# https://github.com/01org/linux-sgx/pull/173
# RUN ar d /opt/sgxsdk/lib64/libsgx_uprotected_fs.a sgx_tprotected_fs_u.h
# RUN ar d /opt/sgxsdk/lib64/libsgx_tprotected_fs.a sgx_tprotected_fs_t.h

WORKDIR /root
38 changes: 19 additions & 19 deletions dockerfile/experimental/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ RUN mkdir /root/sgx
WORKDIR /root/sgx

# Download essential files
RUN wget -O /root/sgx/optimized_libs-1.9.100.39124.tar https://download.01.org/intel-sgx/linux-1.9/optimized_libs-1.9.100.39124.tar
RUN wget -O /root/sgx/prebuilt-ae-1.9.100.39124.tar https://download.01.org/intel-sgx/linux-1.9/prebuilt-ae-1.9.100.39124.tar
RUN wget -O /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_1.9.100.39124.bin https://download.01.org/intel-sgx/linux-1.9/sgx_linux_ubuntu16.04.1_x64_psw_1.9.100.39124.bin
RUN wget -O /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_1.9.100.39124.bin https://download.01.org/intel-sgx/linux-1.9/sgx_linux_ubuntu16.04.1_x64_sdk_1.9.100.39124.bin
#RUN wget -O /root/sgx/optimized_libs-2.0.100.40950.tar https://download.01.org/intel-sgx/linux-1.9/optimized_libs-2.0.100.40950.tar
#RUN wget -O /root/sgx/prebuilt-ae-2.0.100.40950.tar https://download.01.org/intel-sgx/linux-1.9/prebuilt-ae-2.0.100.40950.tar
RUN wget -O /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_2.0.100.40950.bin https://download.01.org/intel-sgx/linux-2.0/sgx_linux_ubuntu16.04.1_x64_psw_2.0.100.40950.bin
RUN wget -O /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_2.0.100.40950.bin https://download.01.org/intel-sgx/linux-2.0/sgx_linux_ubuntu16.04.1_x64_sdk_2.0.100.40950.bin

# Setup protobuf v3.4.1
RUN wget -O /root/sgx/v3.4.1.tar.gz https://github.com/google/protobuf/archive/v3.4.1.tar.gz
Expand All @@ -60,22 +60,22 @@ WORKDIR /root/sgx
#RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/boost.conf && ldconfig
#WORKDIR /root/sgx

RUN chmod a+x /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_1.9.100.39124.bin
RUN /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_1.9.100.39124.bin
RUN chmod a+x /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_1.9.100.39124.bin
RUN echo -e 'no\n/opt' | /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_1.9.100.39124.bin
RUN chmod a+x /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_2.0.100.40950.bin
RUN /root/sgx/sgx_linux_ubuntu16.04.1_x64_psw_2.0.100.40950.bin
RUN chmod a+x /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_2.0.100.40950.bin
RUN echo -e 'no\n/opt' | /root/sgx/sgx_linux_ubuntu16.04.1_x64_sdk_2.0.100.40950.bin
RUN echo 'source /opt/sgxsdk/environment' >> /root/.bashrc

RUN wget -O /root/sgx/sgx_1.9.tar.gz https://github.com/01org/linux-sgx/archive/sgx_1.9.tar.gz
RUN tar xzf sgx_1.9.tar.gz
RUN wget -O /root/sgx/sgx_2.0.tar.gz https://github.com/01org/linux-sgx/archive/sgx_2.0.tar.gz
RUN tar xzf sgx_2.0.tar.gz
ADD all.patch /root/sgx
RUN patch -t -p0 < all.patch
WORKDIR linux-sgx-sgx_1.9
RUN /root/sgx/linux-sgx-sgx_1.9/download_prebuilt.sh
WORKDIR linux-sgx-sgx_2.0
RUN /root/sgx/linux-sgx-sgx_2.0/download_prebuilt.sh
RUN make -j8
RUN cp /root/sgx/linux-sgx-sgx_1.9/build/linux/libsgx_tstdc.a /opt/sgxsdk/lib64/libsgx_tstdc.a
RUN cp /root/sgx/linux-sgx-sgx_1.9/build/linux/aesm_service /opt/intel/sgxpsw/aesm/aesm_service
RUN cp /root/sgx/linux-sgx-sgx_1.9/build/linux/libsgx_uae_service.so /usr/lib/libsgx_uae_service.so
RUN cp /root/sgx/linux-sgx-sgx_2.0/build/linux/libsgx_tstdc.a /opt/sgxsdk/lib64/libsgx_tstdc.a
RUN cp /root/sgx/linux-sgx-sgx_2.0/build/linux/aesm_service /opt/intel/sgxpsw/aesm/aesm_service
RUN cp /root/sgx/linux-sgx-sgx_2.0/build/linux/libsgx_uae_service.so /usr/lib/libsgx_uae_service.so
RUN apt-get autoclean && apt-get autoremove && rm -rf /var/cache/apt/archives/*
#RUN git clone https://github.com/01org/linux-sgx.git /root/linux-sgx
#ADD patch /root/
Expand All @@ -86,14 +86,14 @@ RUN apt-get autoclean && apt-get autoremove && rm -rf /var/cache/apt/archives/*

RUN wget 'https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init' -O /root/rustup-init
RUN chmod +x /root/rustup-init
RUN echo '1' | /root/rustup-init --default-toolchain nightly-2017-09-29
RUN echo '1' | /root/rustup-init --default-toolchain nightly-2017-11-29
RUN echo 'source /root/.cargo/env' >> /root/.bashrc

# Remove useless .h file in intel sgx sdk, which always cause linking problem.
RUN ar d /opt/sgxsdk/lib64/libsgx_uprotected_fs.a sgx_tprotected_fs_u.h
RUN ar d /opt/sgxsdk/lib64/libsgx_tprotected_fs.a sgx_tprotected_fs_t.h
# RUN ar d /opt/sgxsdk/lib64/libsgx_uprotected_fs.a sgx_tprotected_fs_u.h
# RUN ar d /opt/sgxsdk/lib64/libsgx_tprotected_fs.a sgx_tprotected_fs_t.h

## A hack of linking Rust's libc (https://github.com/rust-lang/libc) in no_std environment.
RUN rm /root/.rustup/toolchains/nightly-2017-09-29-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-058430ec2dd28527.rlib
RUN rm /root/.rustup/toolchains/nightly-2017-11-29-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-7f54f8f6cd32e0c8.rlib

WORKDIR /root
20 changes: 10 additions & 10 deletions dockerfile/experimental/all.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
diff -ur linux-sgx-sgx_1.9-orig/buildenv.mk linux-sgx-sgx_1.9/buildenv.mk
--- linux-sgx-sgx_1.9-orig/buildenv.mk 2017-09-26 11:18:44.117249066 -0700
+++ linux-sgx-sgx_1.9/buildenv.mk 2017-09-26 11:22:00.870339246 -0700
diff -ur linux-sgx-sgx_2.0-orig/buildenv.mk linux-sgx-sgx_2.0/buildenv.mk
--- linux-sgx-sgx_2.0-orig/buildenv.mk 2017-09-26 11:18:44.117249066 -0700
+++ linux-sgx-sgx_2.0/buildenv.mk 2017-09-26 11:22:00.870339246 -0700
@@ -88,7 +88,7 @@
COMMON_FLAGS += -ffunction-sections -fdata-sections

# turn on compiler warnings as much as possible
-COMMON_FLAGS += -Wall -Wextra -Winit-self -Wpointer-arith -Wreturn-type \
+COMMON_FLAGS += -Wextra -Winit-self -Wpointer-arith -Wreturn-type \
Expand All @@ -13,23 +13,23 @@ diff -ur linux-sgx-sgx_1.9-orig/buildenv.mk linux-sgx-sgx_1.9/buildenv.mk
@@ -102,6 +102,10 @@
# for static_assert()
CXXFLAGS += -std=c++0x

+# for protobuf v3
+CFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0
+CXXFLAGS += -DPROTOBUF_INLINE_NOT_IN_HEADERS=0
+
.DEFAULT_GOAL := all
# this turns off the RCS / SCCS implicit rules of GNU Make
% : RCS/%,v
diff -ur linux-sgx-sgx_1.9-orig/sdk/tlibc/Makefile linux-sgx-sgx_1.9/sdk/tlibc/Makefile
--- linux-sgx-sgx_1.9-orig/sdk/tlibc/Makefile 2017-09-26 11:18:44.165250295 -0700
+++ linux-sgx-sgx_1.9/sdk/tlibc/Makefile 2017-09-26 11:19:20.634187863 -0700
diff -ur linux-sgx-sgx_2.0-orig/sdk/tlibc/Makefile linux-sgx-sgx_2.0/sdk/tlibc/Makefile
--- linux-sgx-sgx_2.0-orig/sdk/tlibc/Makefile 2017-09-26 11:18:44.165250295 -0700
+++ linux-sgx-sgx_2.0/sdk/tlibc/Makefile 2017-09-26 11:19:20.634187863 -0700
@@ -33,7 +33,7 @@

CFLAGS += $(ENCLAVE_CFLAGS)
ASFLAGS := $(CFLAGS)
-CFLAGS += -std=c99
+CFLAGS += -std=c99 -D USE_MALLOC_DEPRECATED
CXXFLAGS += $(ENCLAVE_CXXFLAGS) -fno-exceptions -fno-rtti

CPPFLAGS += -I. \
Binary file modified documents/ccsp17.pdf
Binary file not shown.
6 changes: 3 additions & 3 deletions edl/sgx_backtrace.edl
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/

enclave {
trusted {
/* define ECALLs here. */
};

untrusted {
untrusted {
int u_backtrace_open_ocall([out]int *error, [in, string]const char *pathname, int flags);
int u_backtrace_close_ocall([out]int *error, int fd);
int u_backtrace_fcntl_ocall([out]int *error, int fd, int cmd, int arg);

void * u_backtrace_mmap_ocall([out]int *error, [user_check]void *start, size_t length, int prot, int flags, int fd, int64_t offset);
int u_backtrace_munmap_ocall([out]int *error, [user_check]void *start, size_t length);
};
Expand Down
6 changes: 3 additions & 3 deletions edl/sgx_stdio.edl
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/

enclave {

trusted {
/* define ECALLs here. */
};

untrusted {
untrusted {
size_t u_stdin_ocall([out, size=nbytes] void *buf, size_t nbytes);
size_t u_stdout_ocall([in, size=nbytes] const void *buf, size_t nbytes);
size_t u_stderr_ocall([in, size=nbytes] const void *buf, size_t nbytes);
Expand Down
4 changes: 2 additions & 2 deletions edl/sgx_tstd.edl
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/

enclave {
trusted {
/* define ECALLs here. */
public void t_global_init_ecall(uint64_t id, [in, size=len] const uint8_t * path, size_t len);
public void t_global_exit_ecall();
};

untrusted {
untrusted {

};
};
2 changes: 1 addition & 1 deletion libbacktrace/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@
2012-09-17 Ian Lance Taylor <[email protected]>

* Initial implementation.

Copyright (C) 2012-2016 Free Software Foundation, Inc.

Copying and distribution of this file, with or without modification,
Expand Down
2 changes: 1 addition & 1 deletion libbacktrace/ChangeLog.jit
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

* configure.ac: Add --enable-host-shared.
* configure: Regenerate.

Copyright (C) 2013-2014 Free Software Foundation, Inc.

Copying and distribution of this file, with or without modification,
Expand Down
4 changes: 2 additions & 2 deletions libbacktrace/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
# met:

# (1) Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# notice, this list of conditions and the following disclaimer.

# (2) Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# distribution.

# (3) The name of the author may not be used to
# endorse or promote products derived from this software without
Expand Down
20 changes: 10 additions & 10 deletions libbacktrace/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
# met:

# (1) Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# notice, this list of conditions and the following disclaimer.

# (2) Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# distribution.

# (3) The name of the author may not be used to
# endorse or promote products derived from this software without
Expand Down Expand Up @@ -137,10 +137,10 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libbacktrace_la_SOURCES) $(EXTRA_libbacktrace_la_SOURCES) \
$(btest_SOURCES) $(stest_SOURCES)
MULTISRCTOP =
MULTIBUILDTOP =
MULTIDIRS =
MULTISUBDIR =
MULTISRCTOP =
MULTIBUILDTOP =
MULTIDIRS =
MULTISUBDIR =
MULTIDO = true
MULTICLEAN = true
am__can_run_installinfo = \
Expand Down Expand Up @@ -390,7 +390,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
Expand All @@ -408,7 +408,7 @@ clean-noinstLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES)
libbacktrace.la: $(libbacktrace_la_OBJECTS) $(libbacktrace_la_DEPENDENCIES) $(EXTRA_libbacktrace_la_DEPENDENCIES)
$(LINK) $(libbacktrace_la_OBJECTS) $(libbacktrace_la_LIBADD) $(LIBS)

clean-checkPROGRAMS:
Expand All @@ -419,10 +419,10 @@ clean-checkPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES)
btest$(EXEEXT): $(btest_OBJECTS) $(btest_DEPENDENCIES) $(EXTRA_btest_DEPENDENCIES)
@rm -f btest$(EXEEXT)
$(btest_LINK) $(btest_OBJECTS) $(btest_LDADD) $(LIBS)
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES) $(EXTRA_stest_DEPENDENCIES)
stest$(EXEEXT): $(stest_OBJECTS) $(stest_DEPENDENCIES) $(EXTRA_stest_DEPENDENCIES)
@rm -f stest$(EXEEXT)
$(LINK) $(stest_OBJECTS) $(stest_LDADD) $(LIBS)

Expand Down
6 changes: 3 additions & 3 deletions libbacktrace/backtrace-supported.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are
met:

(1) Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
notice, this list of conditions and the following disclaimer.

(2) Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
distribution.

(3) The name of the author may not be used to
endorse or promote products derived from this software without
specific prior written permission.
Expand Down
2 changes: 1 addition & 1 deletion libbacktrace/btest.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ struct sdata {

struct symdata {
const char* name;
uintptr_t val;
uintptr_t val;
uintptr_t size;
int failed;
};
Expand Down
6 changes: 3 additions & 3 deletions libbacktrace/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
# met:

# (1) Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# notice, this list of conditions and the following disclaimer.

# (2) Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# distribution.

# (3) The name of the author may not be used to
# endorse or promote products derived from this software without
# specific prior written permission.
Expand Down
Loading

0 comments on commit 50beed6

Please sign in to comment.