[Bug target/19548] New: RTEMS CPP specs not merged from 3.2/3.2 branches

[Bug target/19548] New: RTEMS CPP specs not merged from 3.2/3.2 branches

[joel at gcc dot gnu dot org]

Somehow, this necessary patch was only applied to the 3.2 and 3.3 release
branches.  The RTEMS community has skipped the 3.4 branch so never noticed it
missing there.  Anyway, it never got on the head.

http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/config/rs6000/sysv4.h?rev=1.113.4.1&content-type=text/x-cvsweb-markup

We didn't notice it until we were paying attention to RTEMS build failures.
The toolset will build without this but isn't functional.

Is this OK to merge?

-- 
           Summary: RTEMS CPP specs not merged from 3.2/3.2 branches
           Product: gcc
           Version: 4.0.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: target
        AssignedTo: unassigned at gcc dot gnu dot org
        ReportedBy: joel at gcc dot gnu dot org
                CC: gcc-bugs at gcc dot gnu dot org,ralf dot corsepius at
                    rtems dot org
GCC target triplet: powerpc-rtems


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4, 4.0 regression} RTEMS CPP specs not merged from 3.2/3.2 branches

[corsepiu at gcc dot gnu dot org]

------- Additional Comments From corsepiu at gcc dot gnu dot org  2005-01-21 01:08 -------
The required bits are on gcc-3_2-branch and gcc-3_3-branch, but are missing from
gcc-3_4-branch and gcc-CVS-trunk.

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
      Known to fail|                            |3.4.3 4.0.0
      Known to work|                            |3.2.3 3.3.4
            Summary|RTEMS CPP specs not merged  |[3.4, 4.0 regression} RTEMS
                   |from 3.2/3.2 branches       |CPP specs not merged from
                   |                            |3.2/3.2 branches


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4/4.0 regression} RTEMS CPP specs not merged from 3.2/3.2 branches

[pinskia at gcc dot gnu dot org]

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
           Priority|P2                          |P3
            Summary|[3.4, 4.0 regression} RTEMS |[3.4/4.0 regression} RTEMS
                   |CPP specs not merged from   |CPP specs not merged from
                   |3.2/3.2 branches            |3.2/3.2 branches
   Target Milestone|---                         |3.4.4


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4/4.0 regression] RTEMS CPP specs not merged from 3.2/3.2 branches

[pinskia at gcc dot gnu dot org]

------- Additional Comments From pinskia at gcc dot gnu dot org  2005-01-21 07:29 -------
To me this looks like it was accidentally not committed as the ChangeLog references the change but the 
commit was not there so I would assume this could clarify as obvious.

gcc/gcc/ChangeLog.9:   * config/rs6000/sysv4.h: Add CPP_OS_RTEMS_SPEC.


-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |NEW
     Ever Confirmed|                            |1
   Last reconfirmed|0000-00-00 00:00:00         |2005-01-21 07:29:11
               date|                            |
            Summary|[3.4/4.0 regression} RTEMS  |[3.4/4.0 regression] RTEMS
                   |CPP specs not merged from   |CPP specs not merged from
                   |3.2/3.2 branches            |3.2/3.2 branches


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4/4.0 regression] RTEMS CPP specs not merged from 3.2/3.2 branches

[corsepiu at gcc dot gnu dot org]

------- Additional Comments From corsepiu at gcc dot gnu dot org  2005-01-21 10:04 -------
(In reply to comment #2)
> commit was not there so I would assume this could clarify as obvious.
OK, thanks.

However, one thought:

In gcc < 3.4 CPP_OS_RTEMS_SPEC had been part of svr4.h.

What do you think about moving CPP_OS_RTEMS_SPEC into rs6000/rtems.h, i.e. about
a applying this patch to gcc-4.0:

Index: gcc/config/rs6000/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/rs6000/rtems.h,v
retrieving revision 1.20
diff -u -r1.20 rtems.h
--- gcc/config/rs6000/rtems.h   17 Oct 2004 18:09:44 -0000      1.20
+++ gcc/config/rs6000/rtems.h   21 Jan 2005 10:02:12 -0000
@@ -38,3 +38,20 @@

 #undef CPP_OS_DEFAULT_SPEC
 #define CPP_OS_DEFAULT_SPEC "%(cpp_os_rtems)"
+
+#define CPP_OS_RTEMS_SPEC "\
+%{!mcpu*:  %{!Dppc*: %{!Dmpc*: -Dmpc750} } }\
+%{mcpu=403:  %{!Dppc*: %{!Dmpc*: -Dppc403}  } } \
+%{mcpu=505:  %{!Dppc*: %{!Dmpc*: -Dmpc505}  } } \
+%{mcpu=601:  %{!Dppc*: %{!Dmpc*: -Dppc601}  } } \
+%{mcpu=602:  %{!Dppc*: %{!Dmpc*: -Dppc602}  } } \
+%{mcpu=603:  %{!Dppc*: %{!Dmpc*: -Dppc603}  } } \
+%{mcpu=603e: %{!Dppc*: %{!Dmpc*: -Dppc603e} } } \
+%{mcpu=604:  %{!Dppc*: %{!Dmpc*: -Dmpc604}  } } \
+%{mcpu=750:  %{!Dppc*: %{!Dmpc*: -Dmpc750}  } } \
+%{mcpu=821:  %{!Dppc*: %{!Dmpc*: -Dmpc821}  } } \
+%{mcpu=860:  %{!Dppc*: %{!Dmpc*: -Dmpc860}  } }"
+
+#undef  SUBSUBTARGET_EXTRA_SPECS
+#define SUBSUBTARGET_EXTRA_SPECS \
+  { "cpp_os_rtems",            CPP_OS_RTEMS_SPEC }

It would avoid polluting other targets' spec with RTEMS details while it should
not make a difference for powerpc-rtems.

-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4/4.0 regression] RTEMS CPP specs not merged from 3.2/3.2 branches

[pinskia at gcc dot gnu dot org]

------- Additional Comments From pinskia at gcc dot gnu dot org  2005-01-21 14:42 -------
(In reply to comment #3)
> (In reply to comment #2)
> > commit was not there so I would assume this could clarify as obvious.
> OK, thanks.
> What do you think about moving CPP_OS_RTEMS_SPEC into rs6000/rtems.h, i.e. about
> a applying this patch to gcc-4.0:

I would say this is better.  Rember you are a RTEMS maintainer so you can approve it yourself but 
remember I have no say, I am just a person who likes to go through all the bug reports and help out.

Also if this gets applied to 4.0, please also try to get it applied for 3.4.0 also since this is 3.4 regression 
too.

-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4/4.0 regression] RTEMS CPP specs not merged from 3.2/3.2 branches

[pinskia at gcc dot gnu dot org]

------- Additional Comments From pinskia at gcc dot gnu dot org  2005-01-21 21:31 -------
Removing target milestone per: <http://gcc.gnu.org/ml/gcc/2005-01/msg01255.html>.  This does 
not effect any of the primary or secondary targets.

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|3.4.4                       |---


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4/4.0 regression] RTEMS CPP specs not merged from 3.2/3.2 branches

[cvs-commit at gcc dot gnu dot org]

------- Additional Comments From cvs-commit at gcc dot gnu dot org  2005-01-22 02:26 -------
Subject: Bug 19548

CVSROOT:	/cvs/gcc
Module name:	gcc
Changes by:	corsepiu@gcc.gnu.org	2005-01-22 02:26:13

Modified files:
	gcc            : ChangeLog 
	gcc/config/rs6000: rtems.h 

Log message:
	2005-01-22  Ralf Corsepius  <ralf.corsepius@rtems.org>
	
	PR target/19548
	* config/rs6000/rtems.h: Resurrect cpp_os_rtems_spec from gcc < 3.4.
	(CPP_OS_RTEMS_SPEC): New (From gcc-3.3's config/rs6000/sys4.h).
	(SUBSUBTARGET_EXTRA_SPECS): Use CPP_OS_RTEMS_SPEC.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.diff?cvsroot=gcc&r1=2.7223&r2=2.7224
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/config/rs6000/rtems.h.diff?cvsroot=gcc&r1=1.20&r2=1.21



-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4/4.0 regression] RTEMS CPP specs not merged from 3.2/3.2 branches

[cvs-commit at gcc dot gnu dot org]

------- Additional Comments From cvs-commit at gcc dot gnu dot org  2005-01-22 03:04 -------
Subject: Bug 19548

CVSROOT:	/cvs/gcc
Module name:	gcc
Branch: 	gcc-3_4-branch
Changes by:	corsepiu@gcc.gnu.org	2005-01-22 03:04:19

Modified files:
	gcc            : ChangeLog 
	gcc/config/rs6000: rtems.h 

Log message:
	2005-01-22  Ralf Corsepius  <ralf.corsepius@rtems.org>
	
	PR target/19548
	* config/rs6000/rtems.h: Resurrect cpp_os_rtems_spec from gcc < 3.4.
	(CPP_OS_RTEMS_SPEC): New (From gcc-3.3's config/rs6000/sys4.h).
	(SUBSUBTARGET_EXTRA_SPECS): Use CPP_OS_RTEMS_SPEC.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.diff?cvsroot=gcc&only_with_tag=gcc-3_4-branch&r1=2.2326.2.779&r2=2.2326.2.780
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/config/rs6000/rtems.h.diff?cvsroot=gcc&only_with_tag=gcc-3_4-branch&r1=1.18.14.1&r2=1.18.14.2



-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4/4.0 regression] RTEMS CPP specs not merged from 3.2/3.2 branches

[corsepiu at gcc dot gnu dot org]

------- Additional Comments From corsepiu at gcc dot gnu dot org  2005-01-22 03:13 -------
Patch shown in comment #3 commited to gcc-trunk and gcc-3_4-branch.

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548

[Bug target/19548] [3.4/4.0 regression] RTEMS CPP specs not merged from 3.2/3.2 branches

[pinskia at gcc dot gnu dot org]

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |3.4.4


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19548