[v7,2/3] linux-generic: Implement 32bit version of _odp_atomic_tptr_t

Message ID 20150128095630.GI14949@8074w.roxell.se
State New
Headers show

Commit Message

Anders Roxell Jan. 28, 2015, 9:56 a.m.
On 2015-01-27 21:41, Bill Fischofer wrote:
> On Tue, Jan 27, 2015 at 4:44 PM, Geoffrey Blake <Geoffrey.Blake@arm.com>
> wrote:
> 
> > From: Geoffrey Blake <geoffrey.blake@arm.com>
> >
> > Signed-off-by: Geoffrey Blake <geoffrey.blake@arm.com>
> >
> 
> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org>
> 

I wasn't able to build: make distcheck...

I think we can add something like this (see below)... We need to figure out a better
name than config.h and a better name than I used as well... =)

Maybe this file should be placed in the platform/linux-generic/include/
directory with some sensible name

Or should we place this file in the ROOT_DIR/include/ directory after
the reorganisation?
Do we want to expose this file to the users?

If we agree on doing this, I think this should go in as a separate
prior too this patch.

Cheers,
Anders

Patch

diff --git a/configure.ac b/configure.ac
index 7f689de..37f2e2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@ 
 AC_PREREQ([2.5])
 AC_INIT([OpenDataPlane], m4_esyscmd(./scripts/odp_version.sh), [lng-odp@lists.linaro.org])
 AM_INIT_AUTOMAKE([subdir-objects])
-AC_CONFIG_SRCDIR([helper/config.h.in])
-AM_CONFIG_HEADER([helper/config.h])
+AC_CONFIG_SRCDIR([platform/linux-generic/include/odp_gen_config.h.in])
+AM_CONFIG_HEADER([platform/linux-generic/include/odp_gen_config.h])
 
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
diff --git a/helper/.gitignore b/helper/.gitignore
deleted file mode 100644
index f282c15..0000000
--- a/helper/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@ 
-config.h.in
-config.h
-stamp-h1
diff --git a/platform/linux-generic/.gitignore b/platform/linux-generic/.gitignore
new file mode 100644
index 0000000..5e8e32f
--- /dev/null
+++ b/platform/linux-generic/.gitignore
@@ -0,0 +1,3 @@ 
+odp_gen_config.h.in
+odp_gen_config.h
+stamp-h1
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 4c226a8..fae586a 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -3,7 +3,7 @@  include $(top_srcdir)/platform/Makefile.inc
 
 AM_CFLAGS +=  -I$(srcdir)/include
 AM_CFLAGS +=  -I$(srcdir)/include/api
-AM_CFLAGS +=  -I$(top_srcdir)/helper/include -I$(top_srcdir)/helper
+AM_CFLAGS +=  -I$(top_srcdir)/helper/include
 
 include_HEADERS = \
 		  $(top_srcdir)/platform/linux-generic/include/api/odp.h \
@@ -49,6 +49,7 @@  noinst_HEADERS = \
 		  ${top_srcdir}/platform/linux-generic/include/odp_classification_datamodel.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_classification_inlines.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_classification_internal.h \
+		  $(top_srcdir)/platform/linux-generic/include/odp_gen_config.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_crypto_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_debug_internal.h \
 		  ${top_srcdir}/platform/linux-generic/include/odp_internal.h \
diff --git a/platform/linux-generic/include/odp_atomic_internal.h b/platform/linux-generic/include/odp_atomic_internal.h
index 90a515a..611f6d4 100644
--- a/platform/linux-generic/include/odp_atomic_internal.h
+++ b/platform/linux-generic/include/odp_atomic_internal.h
@@ -16,7 +16,7 @@ 
 #ifndef ODP_ATOMIC_INTERNAL_H_
 #define ODP_ATOMIC_INTERNAL_H_
 
-#include <config.h>
+#include <odp_gen_config.h>
 #include <odp_std_types.h>
 #include <odp_align.h>
 #include <odp_hints.h>