summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-03-24 18:44:25 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-03-24 18:44:25 +0000
commit526ebe88a82fb868722cc4bc5b97c71f1f5e3c9d (patch)
tree8979142b631bfaf0f61f555cd595db7b4420733b
parentbdac86b58331f66227f9a397a59d19667f8bc8ef (diff)
downloadrtems-526ebe88a82fb868722cc4bc5b97c71f1f5e3c9d.tar.bz2
Added rule to transform hppa1.1 to hppa1_1 since hppa1.1 is not a
valid cpp symbol.
Diffstat (limited to '')
-rw-r--r--make/leaf.cfg15
1 files changed, 12 insertions, 3 deletions
diff --git a/make/leaf.cfg b/make/leaf.cfg
index 13c720f1a5..b93ff047d1 100644
--- a/make/leaf.cfg
+++ b/make/leaf.cfg
@@ -126,6 +126,15 @@ clobber: clean
$(RM) -r $(CLOBBER_OS) $(CLOBBER_CC) $(CLOBBER_DEPEND)
$(RM) -r $(CLOBBER_ADDITIONS) a.out
+# Until RTEMS_CPU is removed from all the make configuration files,
+# this will need to be here to transform hppa1.1 into hppa1_1 to
+# make it a valid cpp symbol. At some point in the near future,
+# targopts.h should not define RTEMS_CPU. As best I can tell,
+# gcc cpp predefines eliminate the need for RTEMS_CPU_MODEL
+# on some families but not on others. For example, the i386
+# family does not give us enough information from the predefines.
+RTEMS_CPU_DEFINED=$(subst .,_,$(RTEMS_CPU))
+
# make the target dependent options file
$(ARCH)/targopts.h-tmp: FORCE
@echo "/* target board dependent options file */" >$@
@@ -134,10 +143,10 @@ $(ARCH)/targopts.h-tmp: FORCE
@echo "#ifndef __TARGET_OPTIONS_h" >>$@
@echo "#define __TARGET_OPTIONS_h" >>$@
@echo >>$@
- @echo "#ifdef $(RTEMS_CPU)" >>$@
- @echo "#undef $(RTEMS_CPU)" >>$@
+ @echo "#ifdef $(RTEMS_CPU_DEFINED)" >>$@
+ @echo "#undef $(RTEMS_CPU_DEFINED)" >>$@
@echo "#endif" >>$@
- @echo "#define $(RTEMS_CPU) 1" >>$@
+ @echo "#define $(RTEMS_CPU_DEFINED) 1" >>$@
@echo >>$@
@echo "#ifdef $(RTEMS_CPU_MODEL)" >>$@
@echo "#undef $(RTEMS_CPU_MODEL)" >>$@