This is the mail archive of the
libffi-discuss@sourceware.org
mailing list for the libffi project.
Re: libffi merge
Dave Korn wrote:
> Andrew Haley wrote:
>> Anthony Green wrote:
>>> Andrew Haley wrote:
>>>> A big chunk of the
>>>> formatting diffs are now due to this change:
>
>>>> * include/ffi.h.in LICENSE src/debug.c src/closures.c
>>>> src/ffitest.c src/s390/sysv.S src/s390/ffitarget.h
>>>> src/types.c src/m68k/ffitarget.h src/raw_api.c src/frv/ffi.c
>>>> src/frv/ffitarget.h src/sh/ffi.c src/sh/sysv.S
>>>> src/sh/ffitarget.h src/powerpc/ffitarget.h src/pa/ffi.c
>>>> src/pa/ffitarget.h src/pa/linux.S src/java_raw_api.c
>>>> src/cris/ffitarget.h src/x86/ffi.c src/x86/sysv.S
>>>> src/x86/unix64.S src/x86/win32.S
> ^^^^^^^^^^^^^^^
>
>>> No particular reason. I haven't done a libffi to gcc merge since
>>> cleaning this up. Do you want me to do this patch now, or is it easier
>>> for you to bring it over?
>> Let me do it, I was just a bit baffled.
>
> Keep an eye out for that one; last time I checked, the license header in the
> libffi version was a bit mangled, you don't want to inadvertently bring that
> across.
2009-06-04 Andrew Haley <aph@redhat.com>
* src/x86/darwin.S: Fix licence formatting.
src/x86/win32.S: Likewise.
src/sh64/sysv.S: Likewise.
src/sh/sysv.S: Likewise.
Index: src/sh/sysv.S
===================================================================
RCS file: /cvs/libffi/libffi/src/sh/sysv.S,v
retrieving revision 1.5
diff -c -2 -p -r1.5 sysv.S
*** src/sh/sysv.S 17 Jul 2008 13:13:52 -0000 1.5
--- src/sh/sysv.S 4 Jun 2009 14:42:04 -0000
***************
*** 15,26 ****
in all copies or substantial portions of the Software.
! THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
! IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
! ANY CLAIM, DAMAGES OR
! OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
! ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
! OTHER DEALINGS IN THE SOFTWARE.
----------------------------------------------------------------------- */
--- 15,26 ----
in all copies or substantial portions of the Software.
! THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
! EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
! NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
! HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
! WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
! DEALINGS IN THE SOFTWARE.
----------------------------------------------------------------------- */
Index: src/sh64/sysv.S
===================================================================
RCS file: /cvs/libffi/libffi/src/sh64/sysv.S,v
retrieving revision 1.5
diff -c -2 -p -r1.5 sysv.S
*** src/sh64/sysv.S 3 Jun 2009 17:42:56 -0000 1.5
--- src/sh64/sysv.S 4 Jun 2009 14:42:04 -0000
***************
*** 15,26 ****
in all copies or substantial portions of the Software.
! THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
! IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
! ANY CLAIM, DAMAGES OR
! OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
! ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
! OTHER DEALINGS IN THE SOFTWARE.
----------------------------------------------------------------------- */
--- 15,27 ----
in all copies or substantial portions of the Software.
!
! THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
! EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
! NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
! HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
! WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
! DEALINGS IN THE SOFTWARE.
----------------------------------------------------------------------- */
Index: src/x86/darwin.S
===================================================================
RCS file: /cvs/libffi/libffi/src/x86/darwin.S,v
retrieving revision 1.3
diff -c -2 -p -r1.3 darwin.S
*** src/x86/darwin.S 15 Feb 2008 01:24:06 -0000 1.3
--- src/x86/darwin.S 4 Jun 2009 14:42:04 -0000
***************
*** 16,28 ****
in all copies or substantial portions of the Software.
! THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
! IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
! ANY CLAIM, DAMAGES OR
! OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
! ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
! OTHER DEALINGS IN THE SOFTWARE.
! ----------------------------------------------------------------------- */
#ifndef __x86_64__
--- 16,29 ----
in all copies or substantial portions of the Software.
! THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
! EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
! NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
! HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
! WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
! DEALINGS IN THE SOFTWARE.
! -----------------------------------------------------------------------
! */
#ifndef __x86_64__
Index: src/x86/win32.S
===================================================================
RCS file: /cvs/libffi/libffi/src/x86/win32.S,v
retrieving revision 1.6
diff -c -2 -p -r1.6 win32.S
*** src/x86/win32.S 3 Jun 2009 17:42:56 -0000 1.6
--- src/x86/win32.S 4 Jun 2009 14:42:04 -0000
***************
*** 18,30 ****
in all copies or substantial portions of the Software.
! THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
! IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
! ANY CLAIM, DAMAGES OR
! OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
! ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
! OTHER DEALINGS IN THE SOFTWARE.
! ----------------------------------------------------------------------- */
#define LIBFFI_ASM
--- 18,31 ----
in all copies or substantial portions of the Software.
! THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
! EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
! MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
! NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
! HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
! WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
! DEALINGS IN THE SOFTWARE.
! -----------------------------------------------------------------------
! */
#define LIBFFI_ASM