mirror of
https://github.com/corda/corda.git
synced 2025-01-01 02:36:44 +00:00
04a801e0cd
commit 9d8046e310efe860bb9d81e977a323f3905665c1
Author: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
Date: Sat Sep 16 11:26:45 2017 -0500
Check and handle signal interrupts in sockets
Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
commit 960ad91a4a8ec06020273a175471def37870fda6
Author: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
Date: Sat Sep 16 11:27:35 2017 -0500
Add error code in oal for invalid inputs
Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
commit e22c569335c1ec8d18f7df8105a68e9b9a82e691
Author: Li, Xun <xun.li@intel.com>
Date: Wed Sep 20 10:51:18 2017 +0800
Update libunwind for glibc 2.26 compatibility
libunwind should include <signal.h> explicitly.
glibc change sys/ucontext.h as a bug fix(https://sourceware.org/git/?p=glibc.git;a=commit;h=cfed8ece799b6e6540193a14b41d9de52dc3b08f)
Signed-off-by: Li, Xun <xun.li@intel.com>
commit 9cda5c4774b2f4fc02fd031f98057cd88d14f2e0
Merge: 94c162c98 36918f071
Author: lzha101 <lili.z.zhang@intel.com>
Date: Wed Sep 20 09:58:29 2017 +0800
Merge pull request #165 from corda/chrisr3-stack-protector-fix
Ensure trts_nsp.cpp is compiled without stack protection.
Signed-off-by: Zhang Lili lili.z.zhang@intel.com
commit 36918f071fd29c86335b0cea0e072c3f08a51eae
Author: Chris Rankin <chris.rankin@r3.com>
Date: Tue Sep 19 07:31:57 2017 +0000
Ensure trts_nsp.cpp is compiled without stack protection.
Signed-off-by: Chris Rankin <chris.rankin@r3.com>
commit 94c162c98bf95a034eadb41bfa6e6a35f410a0c8
Author: Kai Mast <kaimast@cs.cornell.edu>
Date: Mon Sep 18 04:07:19 2017 -0400
g++7 fixes (#148)
Signed-off-by: Li, Xun<xun.li@intel.com>
commit 8a72fed8737dc8e331889e6530925fc5a0be2ea0
Merge: 2133df2d4 635e3a370
Author: Li Xun <xun.li@intel.com>
Date: Mon Sep 18 15:58:10 2017 +0800
Merge pull request #159 from corda/chrisr3-gcc7-fix
Resolve GCC 7.1 warnings about deprecated throw(std::bad_alloc) in C++11.
Signed-off-by: Li, Xun <xun.li@intel.com>
commit 635e3a37081ad3f773a0ff24c89f1e6094034d28
Author: Chris Rankin <chris.rankin@r3.com>
Date: Wed Sep 13 10:31:11 2017 +0100
Resolve warnings about deprecated throw(std::bad_alloc) in C++11.
75 lines
2.4 KiB
Makefile
75 lines
2.4 KiB
Makefile
#
|
|
# Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions
|
|
# are met:
|
|
#
|
|
# * Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
# * 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.
|
|
# * Neither the name of Intel Corporation nor the names of its
|
|
# contributors may be used to endorse or promote products derived
|
|
# from this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
#
|
|
|
|
include ../../buildenv.mk
|
|
|
|
CPPFLAGS += -I$(COMMON_DIR)/inc \
|
|
-I$(COMMON_DIR)/inc/internal \
|
|
-I$(COMMON_DIR)/inc/tlibc
|
|
|
|
CXXFLAGS += $(ENCLAVE_CXXFLAGS) \
|
|
-Werror \
|
|
-fno-exceptions \
|
|
-fno-rtti
|
|
|
|
TCXXFLAGS := $(patsubst -fstack-protector%,-fno-stack-protector,$(CXXFLAGS))
|
|
|
|
OBJS1 := init_enclave.o \
|
|
trts.o \
|
|
trts_ecall.o \
|
|
trts_ocall.o \
|
|
trts_util.o \
|
|
trts_veh.o \
|
|
trts_xsave.o \
|
|
init_optimized_lib.o \
|
|
trts_version.o
|
|
|
|
OBJS2 := trts_nsp.o
|
|
|
|
OBJS := $(OBJS1) $(OBJS2)
|
|
|
|
all: $(OBJS) elf_parser
|
|
|
|
$(OBJS1): %.o: %.cpp
|
|
$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -fPIC $< -o $@
|
|
|
|
$(OBJS2): %.o: %.cpp
|
|
$(CXX) -c $(TCXXFLAGS) $(CPPFLAGS) -fPIC $< -o $@
|
|
|
|
.PHONY: elf_parser
|
|
elf_parser:
|
|
$(MAKE) -C linux
|
|
|
|
.PHONY: clean
|
|
clean:
|
|
@$(RM) $(OBJS) *.bak *~
|
|
$(MAKE) -C linux clean
|