On Thursday 31 July 2008 16:27:58 James Keenan via RT wrote: > I tried again today to apply this patch and I still cannot get it to > apply cleanly. I got this *.rej file: > > $ cat config/gen/makefiles/root.in.rej > *************** > *** 379,384 **** > \ > $(OPS_DIR)/core_ops$(O) \ > $(OPS_DIR)/core_ops_switch$(O) \ > $(SRC_DIR)/builtin$(O) \ > $(SRC_DIR)/byteorder$(O) \ > $(SRC_DIR)/charset$(O) \ > --- 379,385 ---- > \ > $(OPS_DIR)/core_ops$(O) \ > $(OPS_DIR)/core_ops_switch$(O) \ > + $(SRC_DIR)/atomic/gcc_pcc$(O) \ > $(SRC_DIR)/builtin$(O) \ > $(SRC_DIR)/byteorder$(O) \ > $(SRC_DIR)/charset$(O) \ > > Since this is a part of root.in where I have no expertise, I don't feel > comfortable in proceeding with the edit that pcc suggested several > months ago. > > Does anyone else want to take a stab at it? (Otherwise I will mark the > patch rejected.)
I believe you can safely modify the file and add the line after: #CONDITIONED_LINE(i386_has_gcc_cmpxchg): $(SRC_DIR)/atomic/gcc_x86$(O) \ (That's on line 372 for me). -- c
