From 63c20dbb4ba66cbf1610f78a41e7ad303853ccf9 Mon Sep 17 00:00:00 2001 From: "W. Eric Norum" Date: Fri, 23 Jan 2009 20:24:59 +0000 Subject: [PATCH] Repair accidental commit of local changes. Swirtch to RTEMS 4.10. --- configure/os/CONFIG_SITE.Common.RTEMS | 2 +- configure/os/CONFIG_SITE.darwin-ppc.Common | 2 +- configure/os/CONFIG_SITE.darwin-ppcx86.Common | 1 - configure/os/CONFIG_SITE.darwin-x86.Common | 2 +- configure/os/CONFIG_SITE.linux-x86.Common | 2 +- configure/os/CONFIG_SITE.linux-x86.linux-x86 | 1 - configure/os/CONFIG_SITE.solaris-sparc.Common | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configure/os/CONFIG_SITE.Common.RTEMS b/configure/os/CONFIG_SITE.Common.RTEMS index c37dcc248..c25d8b303 100644 --- a/configure/os/CONFIG_SITE.Common.RTEMS +++ b/configure/os/CONFIG_SITE.Common.RTEMS @@ -18,4 +18,4 @@ RTEMS_VERSION=4.10 # # Specify your desired command-line-input library # -COMMANDLINE_LIBRARY = READLINE +COMMANDLINE_LIBRARY = EPICS diff --git a/configure/os/CONFIG_SITE.darwin-ppc.Common b/configure/os/CONFIG_SITE.darwin-ppc.Common index 5d3e000d6..3bd24bc00 100644 --- a/configure/os/CONFIG_SITE.darwin-ppc.Common +++ b/configure/os/CONFIG_SITE.darwin-ppc.Common @@ -6,4 +6,4 @@ # Site override definitions for darwin-ppc host builds #------------------------------------------------------- -CROSS_COMPILER_TARGET_ARCHS = # RTEMS-uC5282 # RTEMS-mvme5500 RTEMS-mvme2100 +CROSS_COMPILER_TARGET_ARCHS = # RTEMS-uC5282 RTEMS-mvme5500 RTEMS-mvme2100 diff --git a/configure/os/CONFIG_SITE.darwin-ppcx86.Common b/configure/os/CONFIG_SITE.darwin-ppcx86.Common index b8be33360..88249f6c0 100644 --- a/configure/os/CONFIG_SITE.darwin-ppcx86.Common +++ b/configure/os/CONFIG_SITE.darwin-ppcx86.Common @@ -10,4 +10,3 @@ # Need this to get OS X readline rather than Fink (PPC-only) readline # OP_SYS_LDFLAGS += -L/usr/lib -OP_SYS_CFLAGS += -g diff --git a/configure/os/CONFIG_SITE.darwin-x86.Common b/configure/os/CONFIG_SITE.darwin-x86.Common index ccaddcacc..5d3e000d6 100644 --- a/configure/os/CONFIG_SITE.darwin-x86.Common +++ b/configure/os/CONFIG_SITE.darwin-x86.Common @@ -6,4 +6,4 @@ # Site override definitions for darwin-ppc host builds #------------------------------------------------------- -CROSS_COMPILER_TARGET_ARCHS = RTEMS-uC5282 RTEMS-mvme3100 # RTEMS-mvme167 # RTEMS-beatnik RTEMS-mvme2100 +CROSS_COMPILER_TARGET_ARCHS = # RTEMS-uC5282 # RTEMS-mvme5500 RTEMS-mvme2100 diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common index 47c06cbcd..b829d62ff 100644 --- a/configure/os/CONFIG_SITE.linux-x86.Common +++ b/configure/os/CONFIG_SITE.linux-x86.Common @@ -9,4 +9,4 @@ # JBA test override values #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 -CROSS_COMPILER_TARGET_ARCHS = linux-xscale_be # RTEMS-uC5282 RTEMS-mvme3100 # RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167 +#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167 diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-x86 b/configure/os/CONFIG_SITE.linux-x86.linux-x86 index d6b1f732e..2e58e2d8b 100644 --- a/configure/os/CONFIG_SITE.linux-x86.linux-x86 +++ b/configure/os/CONFIG_SITE.linux-x86.linux-x86 @@ -5,4 +5,3 @@ # Site specific definitions for linux-x86 host - linux-x86 target builds #------------------------------------------------------- -USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES diff --git a/configure/os/CONFIG_SITE.solaris-sparc.Common b/configure/os/CONFIG_SITE.solaris-sparc.Common index d0b9aa997..bbc92c5f6 100644 --- a/configure/os/CONFIG_SITE.solaris-sparc.Common +++ b/configure/os/CONFIG_SITE.solaris-sparc.Common @@ -7,4 +7,4 @@ #INSTALL_LOCATION = /home/phoebus/JBA/testBaseNew -CROSS_COMPILER_TARGET_ARCHS += vxWorks-ppc604 vxWorks-ppc603 vxWorks-68040 vxWorks-ppc604_long +#CROSS_COMPILER_TARGET_ARCHS += vxWorks-ppc604 vxWorks-ppc603 vxWorks-68040