From 0d0637ffaf3a777a0b327a575d55459cb3b7163e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 14 Jul 2012 10:45:30 -0500 Subject: Makefile: Use dummy PIC code on Simple Vectored targets --- Makefile | 10 ++++++++++ freebsd-to-rtems.py | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/Makefile b/Makefile index 306203d1..67257461 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ CFLAGS += -I contrib/pf CFLAGS += -w CFLAGS += -std=gnu99 CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d +NEED_DUMMY_PIC_IRQ=yes C_FILES = C_FILES += rtemsbsd/dev/usb/controller/ohci_lpc24xx.c @@ -389,6 +390,7 @@ C_FILES += freebsd/dev/pci/pci_pci.c ifeq ($(RTEMS_CPU), i386) C_FILES += freebsd/i386/pci/pci_bus.c C_FILES += freebsd/i386/i386/legacy.c +NEED_DUMMY_PIC_IRQ=no endif C_FILES += freebsd/dev/re/if_re.c C_FILES += freebsd/dev/fxp/if_fxp.c @@ -420,23 +422,31 @@ C_FILES += freebsd/dev/bfe/if_bfe.c C_FILES += freebsd/dev/bge/if_bge.c ifeq ($(RTEMS_CPU), arm) C_FILES += freebsd/arm/arm/in_cksum.c +NEED_DUMMY_PIC_IRQ=no endif ifeq ($(RTEMS_CPU), i386) C_FILES += freebsd/i386/i386/in_cksum.c +NEED_DUMMY_PIC_IRQ=no endif ifeq ($(RTEMS_CPU), mips) C_FILES += freebsd/mips/mips/in_cksum.c +NEED_DUMMY_PIC_IRQ=no endif ifeq ($(RTEMS_CPU), powerpc) C_FILES += freebsd/powerpc/powerpc/in_cksum.c +NEED_DUMMY_PIC_IRQ=no endif ifeq ($(RTEMS_CPU), sparc) C_FILES += freebsd/mips/mips/in_cksum.c +NEED_DUMMY_PIC_IRQ=no endif ifeq ($(RTEMS_CPU), sparc64) C_FILES += freebsd/sparc64/sparc64/in_cksum.c endif +ifeq ($(NEED_DUMMY_PIC_IRQ),yes) +CFLAGS += -I rtems-dummy-pic-irq/include +endif C_O_FILES = $(C_FILES:%.c=%.o) C_D_FILES = $(C_FILES:%.c=%.d) diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py index 4adfab45..7abf1834 100755 --- a/freebsd-to-rtems.py +++ b/freebsd-to-rtems.py @@ -345,6 +345,7 @@ class ModuleManager: 'CFLAGS += -w \n' \ 'CFLAGS += -std=gnu99\n' \ 'CFLAGS += -MT $@ -MD -MP -MF $(basename $@).d\n' \ + 'NEED_DUMMY_PIC_IRQ=yes\n' \ '\n' data += 'C_FILES =\n' for m in self.modules: @@ -354,8 +355,13 @@ class ModuleManager: data += 'ifeq ($(RTEMS_CPU), ' + cpu + ')\n' for file in files: data += 'C_FILES += ' + file.getMakefileFragment() + '\n' + if cpu in ("arm", "i386", "lm32", "mips", "powerpc", "sparc"): + data += 'NEED_DUMMY_PIC_IRQ=no\n' data += 'endif\n' data += '\n' \ + 'ifeq ($(NEED_DUMMY_PIC_IRQ),yes)\n' \ + 'CFLAGS += -I rtems-dummy-pic-irq/include\n' \ + 'endif\n' \ 'C_O_FILES = $(C_FILES:%.c=%.o)\n' \ 'C_D_FILES = $(C_FILES:%.c=%.d)\n' \ '\n' \ -- cgit v1.2.3