Module: xenomai-forge
Branch: master
Commit: 3ab029a0b9179522e5e64ae88a9d2ab972117564
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=3ab029a0b9179522e5e64ae88a9d2ab972117564
Author: Philippe Gerum <r...@xenomai.org>
Date: Tue Aug 14 12:28:12 2012 +0200
cobalt/x86_32: force -fno-omit-frame-pointer for core library only
---
configure | 4 ++--
configure.in | 4 ++--
lib/cobalt/Makefile.am | 5 ++---
lib/cobalt/Makefile.in | 3 ++-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 0551d7e..b61cf71 100755
--- a/configure
+++ b/configure
@@ -13543,9 +13543,9 @@ XENO_USER_APP_CFLAGS=$XENO_USER_CFLAGS
XENO_USER_APP_LDFLAGS=$XENO_USER_LDADD
if test x$debug_mode = xpartial; then
- XENO_USER_CFLAGS="-g -O2 -D__XENO_DEBUG__ $XENO_USER_CFLAGS
-fno-omit-frame-pointer"
+ XENO_USER_CFLAGS="-g -O2 -D__XENO_DEBUG__ $XENO_USER_CFLAGS"
elif test x$debug_mode = xfull; then
- XENO_USER_CFLAGS="-g -D__XENO_DEBUG__ -D__XENO_DEBUG_FULL__
-fno-omit-frame-pointer $XENO_USER_CFLAGS"
+ XENO_USER_CFLAGS="-g -D__XENO_DEBUG__ -D__XENO_DEBUG_FULL__
$XENO_USER_CFLAGS"
else
XENO_USER_CFLAGS="-O2 $XENO_USER_CFLAGS"
fi
diff --git a/configure.in b/configure.in
index 8f478e9..fd5ce5b 100644
--- a/configure.in
+++ b/configure.in
@@ -520,9 +520,9 @@ XENO_USER_APP_CFLAGS=$XENO_USER_CFLAGS
XENO_USER_APP_LDFLAGS=$XENO_USER_LDADD
if test x$debug_mode = xpartial; then
- XENO_USER_CFLAGS="-g -O2 -D__XENO_DEBUG__ $XENO_USER_CFLAGS
-fno-omit-frame-pointer"
+ XENO_USER_CFLAGS="-g -O2 -D__XENO_DEBUG__ $XENO_USER_CFLAGS"
elif test x$debug_mode = xfull; then
- XENO_USER_CFLAGS="-g -D__XENO_DEBUG__ -D__XENO_DEBUG_FULL__
-fno-omit-frame-pointer $XENO_USER_CFLAGS"
+ XENO_USER_CFLAGS="-g -D__XENO_DEBUG__ -D__XENO_DEBUG_FULL__
$XENO_USER_CFLAGS"
else
XENO_USER_CFLAGS="-O2 $XENO_USER_CFLAGS"
fi
diff --git a/lib/cobalt/Makefile.am b/lib/cobalt/Makefile.am
index a0c3335..f09bb17 100644
--- a/lib/cobalt/Makefile.am
+++ b/lib/cobalt/Makefile.am
@@ -6,8 +6,6 @@ noinst_HEADERS = \
lib_LTLIBRARIES = libcobalt.la
-CPPFLAGS += -I$(top_srcdir)/kernel/cobalt
-
libcobalt_la_LDFLAGS = @XENO_LIB_LDFLAGS@ -version-info 2:0:0 -lpthread -lrt
libcobalt_la_SOURCES = \
@@ -31,8 +29,9 @@ libcobalt_la_SOURCES = \
printf.c \
wrappers.c
-libcobalt_la_CPPFLAGS = \
+libcobalt_la_CPPFLAGS = \
@XENO_COBALT_CFLAGS@ -Wno-missing-prototypes \
+ -I$(top_srcdir)/kernel/cobalt \
-I$(top_srcdir) \
-I$(top_srcdir)/include
diff --git a/lib/cobalt/Makefile.in b/lib/cobalt/Makefile.in
index 7ce8f42..cc0b691 100644
--- a/lib/cobalt/Makefile.in
+++ b/lib/cobalt/Makefile.in
@@ -137,7 +137,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
CHECKFLAGS = @CHECKFLAGS@
CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/kernel/cobalt
+CPPFLAGS = @CPPFLAGS@
CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
CYGPATH_W = @CYGPATH_W@
@@ -307,6 +307,7 @@ libcobalt_la_SOURCES = \
libcobalt_la_CPPFLAGS = \
@XENO_COBALT_CFLAGS@ -Wno-missing-prototypes \
+ -I$(top_srcdir)/kernel/cobalt \
-I$(top_srcdir) \
-I$(top_srcdir)/include
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
