Revert remove-debug-code patch temporarily (for ARM Fedora release)

This commit is contained in:
Anthony Green
2011-08-15 13:25:13 -04:00
parent d992ac54a2
commit 3b7efa4e74
24 changed files with 223 additions and 6898 deletions

View File

@@ -25,7 +25,7 @@ Index: libffi/ChangeLog
+
2011-02-11 Anthony Green <green@moxielogic.com>
* libtool-version: Update.
* src/sparc/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test,
Index: libffi/include/ffi_common.h
===================================================================
--- libffi.orig/include/ffi_common.h

View File

@@ -2,7 +2,7 @@ Index: libffi/ChangeLog
===================================================================
--- libffi.orig/ChangeLog
+++ libffi/ChangeLog
@@ -79,7 +79,7 @@
@@ -70,7 +70,7 @@
* src/prep_cif.c (UNLIKELY, LIKELY): Define.
(initialize_aggregate): Check for bad types.

View File

@@ -2,13 +2,14 @@ Index: libffi/Makefile.am
===================================================================
--- libffi.orig/Makefile.am
+++ libffi/Makefile.am
@@ -31,7 +31,8 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
@@ -31,7 +31,9 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \
src/moxie/eabi.S libtool-version ChangeLog.libffi \
m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
- m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c
- m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh
+ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \
+ msvcc.sh
+
info_TEXINFOS = doc/libffi.texi
@@ -16,11 +17,11 @@ Index: libffi/Makefile.in
===================================================================
--- libffi.orig/Makefile.in
+++ libffi/Makefile.in
@@ -429,7 +429,8 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
@@ -426,7 +426,8 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \
src/moxie/eabi.S libtool-version ChangeLog.libffi \
m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
- m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c
- m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh
+ m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c \
+ msvcc.sh

View File

@@ -18,7 +18,6 @@ interix
ppc64-darwin
irix
sparc-abi-check
remove-debug-code
ungccify
ios-fixes
bad-abi-fix

View File

@@ -2,7 +2,7 @@ Index: libffi/Makefile.am
===================================================================
--- libffi.orig/Makefile.am
+++ libffi/Makefile.am
@@ -180,14 +180,11 @@ endif
@@ -176,14 +176,11 @@ endif
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
@@ -22,21 +22,21 @@ Index: libffi/Makefile.in
===================================================================
--- libffi.orig/Makefile.in
+++ libffi/Makefile.in
@@ -66,8 +66,6 @@ target_triplet = @target@
@@ -65,8 +65,6 @@ target_triplet = @target@
# Build debug. Define FFI_DEBUG on the commandline so that, when building with
# MSVC, it can link against the debug CRT.
@FFI_DEBUG_TRUE@am__append_28 = -DFFI_DEBUG
@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG
-# Build opt.
-@FFI_DEBUG_FALSE@am__append_29 = -O2
-@FFI_DEBUG_FALSE@am__append_28 = -O2
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
@@ -494,7 +492,7 @@ nodist_libffi_la_SOURCES = $(am__append_
$(am__append_27)
@@ -490,7 +488,7 @@ nodist_libffi_la_SOURCES = $(am__append_
$(am__append_24) $(am__append_25) $(am__append_26)
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
-AM_CFLAGS = -Wall -g -fexceptions $(am__append_28) $(am__append_29)
+AM_CFLAGS = -g $(am__append_28)
-AM_CFLAGS = -Wall -g -fexceptions $(am__append_27) $(am__append_28)
+AM_CFLAGS = -g $(am__append_27)
libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
AM_CCASFLAGS = $(AM_CPPFLAGS)