Skip to contentSkip to conversation

CVS [email protected]: linux

DISCUSSION Harald Koerfgen 3 participants 7 messages May 24, 2000 – May 25, 2000 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20000524012413.A5507@spock

#1 lore raw

On 23-May-00 Klaus Naumann wrote:
[offset.h problems with my recent CVS changes snipped]

Quoted 4 lines

Well, unfortunately this doesn't fix the problem. At least not for me. I get the same error I stated a mail ago - offset.h is generated after the use in main.c .

Ok, trying to fix that I added a fastdep rule to arch/mips/tools/Makefile only to find myself in a catch 22 situation. offset.c includes asm/ptrace.h which, in turn, includes asm/offset.h, i.e. you have to have offset.h to create offset.h :-o

Without heavily messing around with several header files, which may have an impact on non-MIPS platforms as well, I see no easy solution for that. Adding an empty offset.h, on the other hand, and leaving the .cvsignore in place should at least partially do what I want. Any objections?

And now for something completly different. Why the hell did I mess around with that?

Well, if something in the kernel is changed which affects offset.h then generating a diff against a fresh CVS copy will contain those differences. That annoyed me because, personally, I find this disturbing when reviewing those diffs. Nobody really needs that anyway, at least that's what I thought, because offset.h is generated automatically.

The suggestion I made above would not solve that but at least avoids that those changes creep into the CVS.

Signature · 2 lines
Regards,
Harald
#2 lore raw
Quoted 12 lines · Harald Koerfgen

Ok, trying to fix that I added a fastdep rule to arch/mips/tools/Makefile only to find myself in a catch 22 situation. offset.c includes asm/ptrace.h which, in turn, includes asm/offset.h, i.e. you have to have offset.h to create offset.h :-o

Without heavily messing around with several header files, which may have an impact on non-MIPS platforms as well, I see no easy solution for that. Adding an empty offset.h, on the other hand, and leaving the .cvsignore in place should at least partially do what I want. Any objections?

And now for something completly different. Why the hell did I mess around with that?

Quoted 8 lines

Well, if something in the kernel is changed which affects offset.h then generating a diff against a fresh CVS copy will contain those differences. That annoyed me because, personally, I find this disturbing when reviewing those diffs. Nobody really needs that anyway, at least that's what I thought, because offset.h is generated automatically.

The suggestion I made above would not solve that but at least avoids that those changes creep into the CVS.

A good solution is important now that we have SMP. Toggling CONFIG_SMP affects offset.h and not for all variations of make invocations we actually have the guarantee that offset.h is being rebuilt before using it.

Ralf

#3 lore raw

On 24-May-00 Ralf Baechle wrote:
[offset.h]

Quoted 4 lines

A good solution is important now that we have SMP. Toggling CONFIG_SMP affects offset.h and not for all variations of make invocations we actually have the guarantee that offset.h is being rebuilt before using it.

What about making offset.h to depend on $(TOPDIR)/.config?

This may cause unneccessary rebuilds of objects depending on offset.h after configuration changes but it forces offset.h to be rebuilt when CONFIG_SMP is toggled.

For example:

Makefile Thu May 25 19:08:48 2000 renamed from Makefile.old Thu May 25 19:05:08 2000 +1 -1
@@ -18,7 +18,7 @@
 offset.h: offset.s
        sed -n '/^@@@/s///p' $^ >$@
 
-offset.s: offset.c
+offset.s: offset.c $(TOPDIR)/.config
 
 clean:
        rm -f offset.[hs] $(TARGET).new                                         
Signature · 2 lines
Regards,
Harald
#4 lore raw
Quoted 9 lines · Harald Koerfgen

On 24-May-00 Ralf Baechle wrote:
[offset.h]

Quoted 4 lines

A good solution is important now that we have SMP. Toggling CONFIG_SMP affects offset.h and not for all variations of make invocations we actually have the guarantee that offset.h is being rebuilt before using it.

Quoted 5 lines

What about making offset.h to depend on $(TOPDIR)/.config?

This may cause unneccessary rebuilds of objects depending on offset.h after configuration changes but it forces offset.h to be rebuilt when CONFIG_SMP is toggled.

Would you mind removing the include/asm-$(ARCH)/offset.h from the CVS repository, I get conflicts and stuff when I update. I don't see why we need to have a dummy file there.

Ulf

#5 lore raw
Quoted 10 lines · Ulf Carlsson
Quoted 10 lines · On 24-May-00 Ralf Baechle wrote:

[offset.h]

Quoted 4 lines

A good solution is important now that we have SMP. Toggling CONFIG_SMP affects offset.h and not for all variations of make invocations we actually have the guarantee that offset.h is being rebuilt before using it.

What about making offset.h to depend on $(TOPDIR)/.config?

Quoted 7 lines
Quoted 3 lines

This may cause unneccessary rebuilds of objects depending on offset.h after configuration changes but it forces offset.h to be rebuilt when CONFIG_SMP is toggled.

Would you mind removing the include/asm-$(ARCH)/offset.h from the CVS repository, I get conflicts and stuff when I update. I don't see why we need to have a dummy file there.

Conceptually I don't like that either.

Ralf

#6 lore raw
Quoted 5 lines
Quoted 3 lines

Would you mind removing the include/asm-$(ARCH)/offset.h from the CVS repository, I get conflicts and stuff when I update. I don't see why we need to have a dummy file there.

Conceptually I don't like that either.

I think my solution that I submitted yesterday was pretty good. If add a rule that removes include/asm-$(ARCH)/offset.h when you make clean we will be just fine. You'll have to make clean when you toggle between SMP and UP, but I think we can live with that.

Ulf

#7 lore raw
Quoted 10 lines · Ulf Carlsson
Quoted 5 lines
Quoted 3 lines

Would you mind removing the include/asm-$(ARCH)/offset.h from the CVS repository, I get conflicts and stuff when I update. I don't see why we need to have a dummy file there.

Conceptually I don't like that either.

I think my solution that I submitted yesterday was pretty good. If add a rule that removes include/asm-$(ARCH)/offset.h when you make clean we will be just fine. You'll have to make clean when you toggle between SMP and UP, but I think we can live with that.

The recent change of __SMP__ to CONFIG_SMP almost everywhere in the kernel was intended to avoid just that.

Ralf