Changeset a01878 in git

Timestamp:

Sep 17, 2019, 11:07:52 AM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

54f7977545741955f5f91b1a913510dfee7e7acd

Parents:

c8a22acb36f3d2e85dbb125cc9077be569847c9b

Message:

chg: croos compile for omalloc

Location:

omalloc

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• omTables.c (modified) (1 diff)
• omTables1.c (added)

omalloc/Makefile.am

@@ -40 +40 @@
 BUILT_SOURCES = omTables.inc omTables.h
 
-omTables.inc: omTables$(EXEEXT) omalloc.h
-        ./omTables$(EXEEXT) > omTables.xx && mv omTables.xx  $@
+omTables.inc:
+        $(MAKE) $(AM_MAKEFLAGS) CC="${HOSTCC}" LD="${HOSTLD}" CFLAGS="${HOSTCFLAGS}" omTables
+        ./omTables$(EXEEXT) > omTables.xx && mv omTables.xx  omTables.inc
 
-omTables.h: omTables$(EXEEXT)
-        ./omTables$(EXEEXT) 1 >omTables.yy && mv omTables.yy $@
+omTables.h:
+        $(MAKE) $(AM_MAKEFLAGS) CC="${HOSTCC}" LD="${HOSTLD}" CFLAGS="${HOSTCFLAGS}" omTables1
+        ./omTables1$(EXEEXT) >omTables.yy && mv omTables.yy omTables.h
 
-noinst_PROGRAMS = omTables
+noinst_PROGRAMS = omTables omTables1
 omTables_SOURCES = omAllocPrivate.h omTables.c
+omTables1_SOURCES = omAllocPrivate.h omTables1.c
 nodist_omTables_SOURCES = omConfig.h
+nodist_omTables1_SOURCES = omConfig.h
 omTables_CPPFLAGS = ${AM_CPPFLAGS} -DOM_GENERATE_INC
+omTables1_CPPFLAGS = ${AM_CPPFLAGS} -DOM_GENERATE_INC
 
 CLEANFILES = $(BUILT_SOURCES)

omalloc/configure.ac

@@ -148 +148 @@
   AC_DEFINE_UNQUOTED(OM_PROG_ADDR2LINE, "$ac_cv_prog_ADDR2LINE", "Name of addr2line")
 fi
+
+AC_MSG_NOTICE(HOSTCC set)
+HOSTCC=${HOSTCC:=$CC}
+HOSTLD=${HOSTLD:=$LD}
+HOSTCFLAGS=${HOSTCFLAGS:=$CFLAGS}
+  AC_SUBST(HOSTCC)
+  AC_SUBST(HOSTLD)
+  AC_SUBST(HOSTCFLAGS)
 
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll

omalloc/omTables.c

@@ -175 +175 @@
     if (om_BinSize[max_bin_index] == OM_MAX_BLOCK_SIZE) break;
   }
-  if (argc > 1)
-  {
-    /* output what goes into omTables.h */
-  printf(
-"#ifndef OM_TABLES_H\n"
-"#define OM_TABLES_H\n"
-"#define OM_MAX_BLOCK_SIZE %d\n"
-"#define OM_MAX_BIN_INDEX %d\n"
-"#define OM_SIZEOF_UNIQUE_MAX_BLOCK_THRESHOLD %d\n"
-"#endif /* OM_TABLES_H */\n"
-,  OM_MAX_BLOCK_SIZE, max_bin_index, GetMaxBlockThreshold());
-  return 0;
-  }
 
   printf(