review.tizen.org Git - platform/upstream/libffi.git/commit

projects / platform / upstream / libffi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8d26e8c 54529ba)

author	Jean-Luc Jumpertz <jean-luc@celedev.eu>
	Mon, 23 Oct 2017 13:02:29 +0000 (15:02 +0200)
committer	Jean-Luc Jumpertz <jean-luc@celedev.eu>
	Mon, 23 Oct 2017 13:02:29 +0000 (15:02 +0200)
commit	181fc4cc9ca211f3bc8209cecf3b2348b0674e21
tree	323df740d66f719277797c976687c460d3265b25	tree \| snapshot
parent	8d26e8c6da23b10331181a4bbf837f479ce5d7d2	commit \| diff
parent	54529ba1db9974b5efcbd2e893c44b6b01b0b2c8	commit \| diff

Merge branch 'master' based on ksjogo/libffi

Added a tvOS target in Xcode project. Misc Xcode project cleanup.
Fix macOS build target in Xcode project.

# Conflicts:
# src/aarch64/ffi.c
# src/x86/ffi64.c

src/aarch64/ffi.c	diff1 \|	diff2 \|	blob \| history
src/closures.c	diff1 \|	diff2 \|	blob \| history
src/x86/ffi64.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;