sim: ppc: enable use of gnulib

All other sim arches are using this now, so finish up the logic in
the ppc arch to enable gnulib usage here too.
This commit is contained in:
Mike Frysinger
2021-09-09 02:22:48 -04:00
parent ee73abf25e
commit a13ab747e7
5 changed files with 26 additions and 2 deletions

@ -25,6 +25,10 @@ srccom = $(srcdir)/../common
srcroot = $(srcdir)/../.. srcroot = $(srcdir)/../..
srcsim = $(srcdir)/.. srcsim = $(srcdir)/..
# Helper code from gnulib.
GNULIB_PARENT_DIR = ../..
include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
# Settings from top-level configure. # Settings from top-level configure.
include ../arch-subdir.mk include ../arch-subdir.mk
@ -82,11 +86,11 @@ CONFIG_CFLAGS = \
$(DEVZERO_CFLAGS) $(DEVZERO_CFLAGS)
SIM_FPU_CFLAGS = @sim_fpu_cflags@ SIM_FPU_CFLAGS = @sim_fpu_cflags@
STD_CFLAGS = $(CFLAGS) $(WERROR_CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) STD_CFLAGS = $(CFLAGS) $(WERROR_CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(INCGNU) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(INCLUDES) $(SIM_FPU_CFLAGS) NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(INCLUDES) $(SIM_FPU_CFLAGS)
BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARN_CFLAGS) BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARN_CFLAGS)
LIBS = $(COMMON_LIBS) @LIBS@ LIBS = $(COMMON_LIBS) @LIBS@ $(LIBGNU) $(LIBGNU_EXTRA_LIBS)
COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS)
LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@

@ -21,6 +21,9 @@
#ifndef _CPU_C_ #ifndef _CPU_C_
#define _CPU_C_ #define _CPU_C_
/* This must come before any other includes. */
#include "defs.h"
#include <setjmp.h> #include <setjmp.h>
#include "cpu.h" #include "cpu.h"

@ -20,6 +20,18 @@
#ifndef DEFS_H #ifndef DEFS_H
#define DEFS_H #define DEFS_H
/* Include gnulib's various configure tests. */
#include "gnulib/config.h"
/* Reset macros that our config.h will provide. */
#undef PACKAGE
#undef PACKAGE_BUGREPORT
#undef PACKAGE_NAME
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
#undef PACKAGE_URL
#undef PACKAGE_VERSION
/* Include arch-specific sim's various configure tests. */ /* Include arch-specific sim's various configure tests. */
#include "config.h" #include "config.h"

@ -21,6 +21,9 @@
#ifndef _DEVICE_C_ #ifndef _DEVICE_C_
#define _DEVICE_C_ #define _DEVICE_C_
/* This must come before any other includes. */
#include "defs.h"
#include <stdio.h> #include <stdio.h>
#include "device_table.h" #include "device_table.h"

@ -17,6 +17,8 @@
*/ */
/* This must come before any other includes. */
#include "defs.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>