diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile index d32ebe86d..ab9e3eec1 100644 --- a/examples/elf/tests/helloxx/Makefile +++ b/examples/elf/tests/helloxx/Makefile @@ -94,7 +94,7 @@ LDLIBSTDC_STUBS_LIB = $(LDLIBSTDC_STUBS_DIR)/liblibxx.a all: $(BIN1) $(BIN2) $(BIN3) $(BIN4) $(BIN5) .PHONY: all clean install -$(OBJS): %$(OBJEXT): %.cpp +$(OBJS): %$(OBJEXT): %.cxx @echo "CC: $<" $(Q) $(CXX) -c $(CXXELFFLAGS) $< -o $@ diff --git a/examples/elf/tests/helloxx/hello++1.cpp b/examples/elf/tests/helloxx/hello++1.cxx similarity index 98% rename from examples/elf/tests/helloxx/hello++1.cpp rename to examples/elf/tests/helloxx/hello++1.cxx index 9ab9d4ded..e3ffd9928 100644 --- a/examples/elf/tests/helloxx/hello++1.cpp +++ b/examples/elf/tests/helloxx/hello++1.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// examples/elf/tests/helloxx/hello++1.c +// apps/examples/elf/tests/helloxx/hello++1.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt diff --git a/examples/elf/tests/helloxx/hello++2.cpp b/examples/elf/tests/helloxx/hello++2.cxx similarity index 98% rename from examples/elf/tests/helloxx/hello++2.cpp rename to examples/elf/tests/helloxx/hello++2.cxx index b148989ca..c475830ef 100644 --- a/examples/elf/tests/helloxx/hello++2.cpp +++ b/examples/elf/tests/helloxx/hello++2.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// examples/elf/tests/helloxx/hello++2.c +// apps/examples/elf/tests/helloxx/hello++2.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt diff --git a/examples/elf/tests/helloxx/hello++3.cpp b/examples/elf/tests/helloxx/hello++3.cxx similarity index 98% rename from examples/elf/tests/helloxx/hello++3.cpp rename to examples/elf/tests/helloxx/hello++3.cxx index b59774cd4..e21358a70 100644 --- a/examples/elf/tests/helloxx/hello++3.cpp +++ b/examples/elf/tests/helloxx/hello++3.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// examples/elf/tests/helloxx/hello++3.c +// apps/examples/elf/tests/helloxx/hello++3.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt diff --git a/examples/elf/tests/helloxx/hello++4.cpp b/examples/elf/tests/helloxx/hello++4.cxx similarity index 99% rename from examples/elf/tests/helloxx/hello++4.cpp rename to examples/elf/tests/helloxx/hello++4.cxx index 7db2564ed..eb6c0e34e 100644 --- a/examples/elf/tests/helloxx/hello++4.cpp +++ b/examples/elf/tests/helloxx/hello++4.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// examples/elf/tests/helloxx/hello++4.c +// apps/examples/elf/tests/helloxx/hello++4.cxx // // Copyright (C) 2012 Gregory Nutt. All rights reserved. // Author: Gregory Nutt diff --git a/examples/elf/tests/helloxx/hello++5.cpp b/examples/elf/tests/helloxx/hello++5.cxx similarity index 99% rename from examples/elf/tests/helloxx/hello++5.cpp rename to examples/elf/tests/helloxx/hello++5.cxx index db6cd6929..31e9117e4 100644 --- a/examples/elf/tests/helloxx/hello++5.cpp +++ b/examples/elf/tests/helloxx/hello++5.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// examples/elf/tests/helloxx/hello++5.c +// apps/examples/elf/tests/helloxx/hello++5.cxx // // Copyright (C) 2015 Gregory Nutt. All rights reserved. // Author: Gregory Nutt diff --git a/examples/nxflat/tests/hello++/Makefile b/examples/nxflat/tests/hello++/Makefile index 2cbc616df..0a0fec239 100644 --- a/examples/nxflat/tests/hello++/Makefile +++ b/examples/nxflat/tests/hello++/Makefile @@ -70,7 +70,7 @@ LIBSTDC_STUBS_LIB = $(LIBSTDC_STUBS_DIR)/liblibxx.a all: $(BIN1) $(BIN2) $(BIN3) # $(BIN4) -$(R1CXXOBJS): %.o: %.cpp +$(R1CXXOBJS): %.o: %.cxx @echo "CC: $<" $(Q) $(CXX) -c $(CXXPICFLAGS) $< -o $@ diff --git a/examples/nxflat/tests/hello++/hello++1.cpp b/examples/nxflat/tests/hello++/hello++1.cxx similarity index 98% rename from examples/nxflat/tests/hello++/hello++1.cpp rename to examples/nxflat/tests/hello++/hello++1.cxx index 850c2fd4d..983970cc2 100644 --- a/examples/nxflat/tests/hello++/hello++1.cpp +++ b/examples/nxflat/tests/hello++/hello++1.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// examples/nxflat/tests/hello++/hello++1.c +// apps/examples/nxflat/tests/hello++/hello++1.cxx // // Copyright (C) 2009 Gregory Nutt. All rights reserved. // Author: Gregory Nutt diff --git a/examples/nxflat/tests/hello++/hello++2.cpp b/examples/nxflat/tests/hello++/hello++2.cxx similarity index 98% rename from examples/nxflat/tests/hello++/hello++2.cpp rename to examples/nxflat/tests/hello++/hello++2.cxx index b386ba432..420764b52 100644 --- a/examples/nxflat/tests/hello++/hello++2.cpp +++ b/examples/nxflat/tests/hello++/hello++2.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// examples/nxflat/tests/hello++/hello++2.c +// apps/examples/nxflat/tests/hello++/hello++2.cxx // // Copyright (C) 2009 Gregory Nutt. All rights reserved. // Author: Gregory Nutt diff --git a/examples/nxflat/tests/hello++/hello++3.cpp b/examples/nxflat/tests/hello++/hello++3.cxx similarity index 98% rename from examples/nxflat/tests/hello++/hello++3.cpp rename to examples/nxflat/tests/hello++/hello++3.cxx index 3741eecb5..5849d2972 100644 --- a/examples/nxflat/tests/hello++/hello++3.cpp +++ b/examples/nxflat/tests/hello++/hello++3.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// examples/nxflat/tests/hello++/hello++3.c +// apps/examples/nxflat/tests/hello++/hello++3.cxx // // Copyright (C) 2009 Gregory Nutt. All rights reserved. // Author: Gregory Nutt diff --git a/examples/nxflat/tests/hello++/hello++4.cpp b/examples/nxflat/tests/hello++/hello++4.cxx similarity index 99% rename from examples/nxflat/tests/hello++/hello++4.cpp rename to examples/nxflat/tests/hello++/hello++4.cxx index ac718386b..35fb520f8 100644 --- a/examples/nxflat/tests/hello++/hello++4.cpp +++ b/examples/nxflat/tests/hello++/hello++4.cxx @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// examples/nxflat/tests/hello++/hello++4.c +// apps/examples/nxflat/tests/hello++/hello++4.cxx // // Copyright (C) 2009 Gregory Nutt. All rights reserved. // Author: Gregory Nutt diff --git a/testing/irtest/Makefile b/testing/irtest/Makefile index 0307f4a53..4a85180a1 100644 --- a/testing/irtest/Makefile +++ b/testing/irtest/Makefile @@ -25,8 +25,7 @@ PRIORITY = $(CONFIG_TESTING_IRTEST_PRIORITY) STACKSIZE = $(CONFIG_TESTING_IRTEST_STACKSIZE) MODULE = $(CONFIG_TESTING_IRTEST) -CXXEXT = .cpp -MAINSRC = main.cpp -CXXSRCS = $(filter-out $(MAINSRC), $(wildcard *.cpp)) +MAINSRC = main.cxx +CXXSRCS = $(filter-out $(MAINSRC), $(wildcard *.cxx)) include $(APPDIR)/Application.mk diff --git a/testing/irtest/cmd.cpp b/testing/irtest/cmd.cxx similarity index 99% rename from testing/irtest/cmd.cpp rename to testing/irtest/cmd.cxx index 7a5686a1a..99bb4938a 100644 --- a/testing/irtest/cmd.cpp +++ b/testing/irtest/cmd.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * testing/irtest/cmd.cpp + * apps/testing/irtest/cmd.cxx * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/testing/irtest/enum.cpp b/testing/irtest/enum.cxx similarity index 98% rename from testing/irtest/enum.cpp rename to testing/irtest/enum.cxx index 8c805e6ee..dcc5305d9 100644 --- a/testing/irtest/enum.cpp +++ b/testing/irtest/enum.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * testing/irtest/enum.cpp + * apps/testing/irtest/enum.cxx * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/testing/irtest/main.cpp b/testing/irtest/main.cxx similarity index 98% rename from testing/irtest/main.cpp rename to testing/irtest/main.cxx index d6c26bb72..18351af7d 100644 --- a/testing/irtest/main.cpp +++ b/testing/irtest/main.cxx @@ -1,5 +1,5 @@ /**************************************************************************** - * testing/irtest/main.cpp + * apps/testing/irtest/main.cxx * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with